Remove obsolete 'sodipodi:docbase' attribute when opening old Sodipodi/Inkscape files.

[inkscape.git] / src / object-edit.cpp

diff --git a/src/object-edit.cpp b/src/object-edit.cpp
index de7fbccec296adbf4f77a4d20396234ac6b8a230..9245166ca79de6116c044ef44fd2ac7cb6afd8c7 100644 (file)
--- a/src/object-edit.cpp
+++ b/src/object-edit.cpp
@@ -56,7 +56,7 @@ static KnotHolder *sp_lpe_knot_holder(SPItem *item, SPDesktop *desktop)
     KnotHolder *knot_holder = new KnotHolder(desktop, item, NULL);
 
     Inkscape::LivePathEffect::Effect *effect = sp_lpe_item_get_current_lpe(SP_LPE_ITEM(item));
-//    effect->addPointParamHandles(knot_holder, desktop, item);
+    effect->addPointParamHandles(knot_holder, desktop, item);
     effect->addHandles(knot_holder, desktop, item);
 
     return knot_holder;
@@ -88,6 +88,7 @@ sp_item_knot_holder(SPItem *item, SPDesktop *desktop)
         knotholder = new FlowtextKnotHolder(desktop, SP_FLOWTEXT(item)->get_frame(NULL), NULL);
     } else if ((SP_OBJECT(item)->style->fill.isPaintserver())
                && SP_IS_PATTERN(SP_STYLE_FILL_SERVER(SP_OBJECT(item)->style))) {
+        knotholder = new KnotHolder(desktop, item, NULL);
         knotholder->add_pattern_knotholder();
     }
 
@@ -129,7 +130,7 @@ public:
 static NR::Point snap_knot_position(SPItem *item, NR::Point const &p)
 {
     SPDesktop const *desktop = inkscape_active_desktop();
-    NR::Matrix const i2d (sp_item_i2d_affine (item));
+    NR::Matrix const i2d (from_2geom(sp_item_i2d_affine (item)));
     NR::Point s = p * i2d;
     SnapManager &m = desktop->namedview->snap_manager;
     m.setup(desktop, item);
@@ -464,7 +465,7 @@ Box3DKnotHolderEntity::knot_set_generic(SPItem *item, unsigned int knot_id, NR::
 
     g_assert(item != NULL);
     SPBox3D *box = SP_BOX3D(item);
-    NR::Matrix const i2d (sp_item_i2d_affine (item));
+    NR::Matrix const i2d (from_2geom(sp_item_i2d_affine (item)));
 
     Box3D::Axis movement;
     if ((knot_id < 4) != (state & GDK_SHIFT_MASK)) {
@@ -640,7 +641,7 @@ Box3DKnotHolderEntityCenter::knot_set(NR::Point const &new_pos, NR::Point const
     NR::Point const s = snap_knot_position(item, new_pos);
 
     SPBox3D *box = SP_BOX3D(item);
-    NR::Matrix const i2d (sp_item_i2d_affine (item));
+    NR::Matrix const i2d (from_2geom(sp_item_i2d_affine (item)));
 
     box3d_set_center (SP_BOX3D(item), s * i2d, origin * i2d, !(state & GDK_SHIFT_MASK) ? Box3D::XY : Box3D::Z,
                       state & GDK_CONTROL_MASK);