diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-02-08 19:12:21 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-02-08 19:12:21 +0000 |
| commit | 0912ab9a77d4b3f26975f3ca94e14ee72b63d6b6 (patch) | |
| tree | c9342a4d89751b8157c9fe8f9cdd9404114aaae0 /src/uri-references.cpp | |
| parent | update to trunk (diff) | |
| parent | Fix for Bug #879058 (Spray Single Path Mode includes original object). (diff) | |
| download | inkscape-0912ab9a77d4b3f26975f3ca94e14ee72b63d6b6.tar.gz inkscape-0912ab9a77d4b3f26975f3ca94e14ee72b63d6b6.zip | |
update to trunk
(bzr r11950.1.250)
Diffstat (limited to 'src/uri-references.cpp')
| -rw-r--r-- | src/uri-references.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/uri-references.cpp b/src/uri-references.cpp index abe16ec9d..ea8078b28 100644 --- a/src/uri-references.cpp +++ b/src/uri-references.cpp @@ -58,7 +58,7 @@ void URIReference::attach(const URI &uri) throw(BadURIException) // The path contains references to seperate document files to load. if(document && uri.getPath()) { - std::string base = std::string(document->getBase()); + std::string base = document->getBase() ? document->getBase() : ""; std::string path = uri.getFullPath(base); if(!path.empty()) document = document->createChildDoc(path); @@ -184,3 +184,14 @@ sp_uri_reference_resolve (SPDocument *document, const gchar *uri) return ref; } + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : |