Fix shift of transformation center on pasting

Fixed bugs:
  - https://launchpad.net/bugs/1247799

(bzr r13521)

3 files changed, 12 insertions, 10 deletions

diff --git a/src/file.cpp b/src/file.cpp
index 51e629c7d..580c93c9e 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -1087,9 +1087,9 @@ void sp_import_document(SPDesktop *desktop, SPDocument *clipdoc, bool in_place)
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
     selection->setReprList(pasted_objects);
 
-    // invers apply parent transform
+    // Apply inverse of parent transform
     Geom::Affine doc2parent = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
-    sp_selection_apply_affine(selection, desktop->dt2doc() * doc2parent * desktop->doc2dt(), true, false);
+    sp_selection_apply_affine(selection, desktop->dt2doc() * doc2parent * desktop->doc2dt(), true, false, false);
 
     // Update (among other things) all curves in paths, for bounds() to work
     target_document->ensureUpToDate();
@@ -1226,7 +1226,7 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri,
             // c2p is identity matrix at this point unless ensureUpToDate is called
             doc->ensureUpToDate();
             Geom::Affine affine = doc->getRoot()->c2p * SP_ITEM(place_to_insert)->i2doc_affine().inverse();
-            sp_selection_apply_affine(selection, desktop->dt2doc() * affine * desktop->doc2dt(), true, false);
+            sp_selection_apply_affine(selection, desktop->dt2doc() * affine * desktop->doc2dt(), true, false, false);
 
             // move to mouse pointer
             {
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index 868a9d743..01ce20509 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -1466,7 +1466,7 @@ value of set_i2d==false is only used by seltrans when it's dragging objects live
 that case, items are already in the new position, but the repr is in the old, and this function
 then simply updates the repr from item->transform.
  */
-void sp_selection_apply_affine(Inkscape::Selection *selection, Geom::Affine const &affine, bool set_i2d, bool compensate)
+void sp_selection_apply_affine(Inkscape::Selection *selection, Geom::Affine const &affine, bool set_i2d, bool compensate, bool adjust_transf_center)
 {
     if (selection->isEmpty())
         return;
@@ -1621,11 +1621,13 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, Geom::Affine cons
             item->doWriteTransform(item->getRepr(), item->transform, NULL, compensate);
         }
 
-        // if we're moving the actual object, not just updating the repr, we can transform the
-        // center by the same matrix (only necessary for non-translations)
-        if (set_i2d && item->isCenterSet() && !(affine.isTranslation() || affine.isIdentity())) {
-            item->setCenter(old_center * affine);
-            item->updateRepr();
+        if (adjust_transf_center) { // The transformation center should not be touched in case of pasting or importing, which is allowed by this if clause
+            // if we're moving the actual object, not just updating the repr, we can transform the
+            // center by the same matrix (only necessary for non-translations)
+            if (set_i2d && item->isCenterSet() && !(affine.isTranslation() || affine.isIdentity())) {
+                item->setCenter(old_center * affine);
+                item->updateRepr();
+            }
         }
     }
 }
diff --git a/src/selection-chemistry.h b/src/selection-chemistry.h
index d76a67a9d..01c35d65a 100644
--- a/src/selection-chemistry.h
+++ b/src/selection-chemistry.h
@@ -104,7 +104,7 @@ void sp_selection_to_next_layer( SPDesktop *desktop, bool suppressDone = false )
 void sp_selection_to_prev_layer( SPDesktop *desktop, bool suppressDone = false );
 void sp_selection_to_layer( SPDesktop *desktop, SPObject *layer, bool suppressDone = false );
 
-void sp_selection_apply_affine(Inkscape::Selection *selection, Geom::Affine const &affine, bool set_i2d = true, bool compensate = true);
+void sp_selection_apply_affine(Inkscape::Selection *selection, Geom::Affine const &affine, bool set_i2d = true, bool compensate = true, bool adjust_transf_center = true);
 void sp_selection_remove_transform (SPDesktop *desktop);
 void sp_selection_scale_absolute (Inkscape::Selection *selection, double x0, double x1, double y0, double y1);
 void sp_selection_scale_relative(Inkscape::Selection *selection, Geom::Point const &align, Geom::Scale const &scale);