From 53933f5fea9d07d1ba6304b88439fba257ee8c34 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Wed, 2 Feb 2011 22:24:36 +0100 Subject: update to latest 2geom ! (bzr r10025) --- src/file.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/file.cpp') diff --git a/src/file.cpp b/src/file.cpp index bde985ea5..c041cb262 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -1039,7 +1039,7 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri, // preserve parent and viewBox transformations // c2p is identity matrix at this point unless ensureUpToDate is called doc->ensureUpToDate(); - Geom::Matrix affine = SP_ROOT(doc->getRoot())->c2p * SP_ITEM(place_to_insert)->i2doc_affine().inverse(); + Geom::Affine affine = SP_ROOT(doc->getRoot())->c2p * SP_ITEM(place_to_insert)->i2doc_affine().inverse(); sp_selection_apply_affine(selection, desktop->dt2doc() * affine * desktop->doc2dt(), true, false); // move to mouse pointer -- cgit v1.2.3 From 0e0ce7571944e0a9d60294b6efdc855e6df52db8 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Tue, 22 Feb 2011 01:17:44 -0800 Subject: Finished cleanup of outdated SP_OBJECT_REPR C macro. (bzr r10067) --- src/file.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/file.cpp') diff --git a/src/file.cpp b/src/file.cpp index c041cb262..2816b0434 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -964,7 +964,7 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri, prevent_id_clashes(doc, in_doc); SPObject *in_defs = SP_DOCUMENT_DEFS(in_doc); - Inkscape::XML::Node *last_def = SP_OBJECT_REPR(in_defs)->lastChild(); + Inkscape::XML::Node *last_def = in_defs->getRepr()->lastChild(); SPCSSAttr *style = sp_css_attr_from_object(doc->getRoot()); @@ -1000,7 +1000,7 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri, SPObject *new_obj = NULL; for ( SPObject *child = doc->getRoot()->firstChild(); child; child = child->getNext() ) { if (SP_IS_ITEM(child)) { - Inkscape::XML::Node *newitem = SP_OBJECT_REPR(child)->duplicate(xml_in_doc); + Inkscape::XML::Node *newitem = child->getRepr()->duplicate(xml_in_doc); // convert layers to groups, and make sure they are unlocked // FIXME: add "preserve layers" mode where each layer from @@ -1013,15 +1013,15 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri, } // don't lose top-level defs or style elements - else if (SP_OBJECT_REPR(child)->type() == Inkscape::XML::ELEMENT_NODE) { - const gchar *tag = SP_OBJECT_REPR(child)->name(); + else if (child->getRepr()->type() == Inkscape::XML::ELEMENT_NODE) { + const gchar *tag = child->getRepr()->name(); if (!strcmp(tag, "svg:defs")) { for ( SPObject *x = child->firstChild(); x; x = x->getNext() ) { - SP_OBJECT_REPR(in_defs)->addChild(SP_OBJECT_REPR(x)->duplicate(xml_in_doc), last_def); + in_defs->getRepr()->addChild(x->getRepr()->duplicate(xml_in_doc), last_def); } } else if (!strcmp(tag, "svg:style")) { - in_doc->getRoot()->appendChildRepr(SP_OBJECT_REPR(child)->duplicate(xml_in_doc)); + in_doc->getRoot()->appendChildRepr(child->getRepr()->duplicate(xml_in_doc)); } } } -- cgit v1.2.3 From 861f06b2338b396878a679471d63a890febfc73b Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Mon, 14 Mar 2011 20:50:25 +0100 Subject: Import. Patch for Bug #716362 (Invalid result when drag and drop svg file), by Johannes Lipp. Fixed bugs: - https://launchpad.net/bugs/716362 (bzr r10104) --- src/file.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/file.cpp') diff --git a/src/file.cpp b/src/file.cpp index 2816b0434..c93188358 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -978,7 +978,7 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri, // Create a new group if necessary. Inkscape::XML::Node *newgroup = NULL; - if ((style && style->firstChild()) || items_count > 1) { + if ((style && style->attributeList()) || items_count > 1) { newgroup = xml_in_doc->createElement("svg:g"); sp_repr_css_set(newgroup, style, "style"); } -- cgit v1.2.3