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/document.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/document.cpp')
| -rw-r--r-- | src/document.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/document.cpp b/src/document.cpp index 634462001..470d0cc5a 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -381,16 +381,6 @@ SPDocument *SPDocument::createDoc(Inkscape::XML::Document *rdoc, rroot->setAttribute("inkscape:version", Inkscape::version_string); /* fixme: Again, I moved these here to allow version determining in ::build (Lauris) */ - /* Quick hack 2 - get default image size into document */ - if (!rroot->attribute("width")) rroot->setAttribute("width", "100%"); - if (!rroot->attribute("height")) rroot->setAttribute("height", "100%"); - /* End of quick hack 2 */ - - /* Quick hack 3 - Set uri attributes */ -// if (uri) { // this is done in do_change_uri() -// rroot->setAttribute("sodipodi:docname", uri); -// } - /* End of quick hack 3 */ /* Eliminate obsolete sodipodi:docbase, for privacy reasons */ rroot->setAttribute("sodipodi:docbase", NULL); @@ -483,7 +473,7 @@ SPDocument *SPDocument::createChildDoc(std::string const &uri) SPDocument *parent = this; SPDocument *document = NULL; - while(parent != NULL && document == NULL) { + while(parent != NULL && parent->getURI() != NULL && document == NULL) { // Check myself and any parents int he chain if(uri == parent->getURI()) { document = parent; |