summaryrefslogtreecommitdiffstats
path: root/src/file.cpp
diff options
context:
space:
mode:
authorMenTaLguY <mental@rydia.net>2007-03-20 22:54:29 +0000
committermental <mental@users.sourceforge.net>2007-03-20 22:54:29 +0000
commit5063f31f609ad9c89e7b6d0667c39bc4fad35c27 (patch)
tree70d2c4b365d2cf1d2272fb015297816b92f604f3 /src/file.cpp
parentImplementing feature request #1673807: snapping of gradient handles (diff)
downloadinkscape-5063f31f609ad9c89e7b6d0667c39bc4fad35c27.tar.gz
inkscape-5063f31f609ad9c89e7b6d0667c39bc4fad35c27.zip
plumb XML::Document parameter into duplication, courtesy of bryce
(bzr r2723)
Diffstat (limited to 'src/file.cpp')
-rw-r--r--src/file.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/file.cpp b/src/file.cpp
index c5347a66e..639ba3913 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -757,13 +757,14 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri,
SPObject *defs = SP_DOCUMENT_DEFS(doc);
Inkscape::IO::fixupHrefs(doc, in_doc->base, true);
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
Inkscape::XML::Node *last_def = SP_OBJECT_REPR(in_defs)->lastChild();
for (SPObject *child = sp_object_first_child(defs);
child != NULL; child = SP_OBJECT_NEXT(child))
{
// FIXME: in case of id conflict, newly added thing will be re-ided and thus likely break a reference to it from imported stuff
- SP_OBJECT_REPR(in_defs)->addChild(SP_OBJECT_REPR(child)->duplicate(), last_def);
+ SP_OBJECT_REPR(in_defs)->addChild(SP_OBJECT_REPR(child)->duplicate(xml_doc), last_def);
}
guint items_count = 0;
@@ -784,7 +785,7 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri,
for (SPObject *child = sp_object_first_child(SP_DOCUMENT_ROOT(doc)); child != NULL; child = SP_OBJECT_NEXT(child) ) {
if (SP_IS_ITEM(child)) {
- Inkscape::XML::Node *newchild = SP_OBJECT_REPR(child)->duplicate();
+ Inkscape::XML::Node *newchild = SP_OBJECT_REPR(child)->duplicate(xml_doc);
// convert layers to groups; FIXME: add "preserve layers" mode where each layer
// from impot is copied to the same-named layer in host
@@ -808,7 +809,7 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri,
// just add one item
for (SPObject *child = sp_object_first_child(SP_DOCUMENT_ROOT(doc)); child != NULL; child = SP_OBJECT_NEXT(child) ) {
if (SP_IS_ITEM(child)) {
- Inkscape::XML::Node *newitem = SP_OBJECT_REPR(child)->duplicate();
+ Inkscape::XML::Node *newitem = SP_OBJECT_REPR(child)->duplicate(xml_doc);
newitem->setAttribute("inkscape:groupmode", NULL);
if (desktop) {