Tentative fix for LPEs and undo

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

(bzr r13341.1.5)

2 files changed, 21 insertions, 2 deletions

diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index cdbbef1db..44d414942 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -118,6 +118,11 @@ PathParam::param_readSVGValue(const gchar * strvalue)
             // Now do the attaching, which emits the changed signal.
             try {
                 ref.attach(Inkscape::URI(href));
+                //lp:1299948
+                SPItem* i = ref.getObject();
+                if (i) {
+                    linked_modified_callback(i, SP_OBJECT_MODIFIED_FLAG);
+                } // else: document still processing new events. Repr of the linked object not created yet.
             } catch (Inkscape::BadURIException &e) {
                 g_warning("%s", e.what());
                 ref.detach();
diff --git a/src/sp-path.cpp b/src/sp-path.cpp
index cbb61b0f6..d1fb850e1 100644
--- a/src/sp-path.cpp
+++ b/src/sp-path.cpp
@@ -140,7 +140,22 @@ void SPPath::build(SPDocument *document, Inkscape::XML::Node *repr) {
 
     SPShape::build(document, repr);
 
-    this->readAttr( "inkscape:original-d" );
+    //this->readAttr( "inkscape:original-d" ); //lp1299948
+    if (gchar const* s = this->getRepr()->attribute("inkscape:original-d"))
+    {
+        //write it to XML, and to my curve, but don't update patheffects
+        Geom::PathVector pv = sp_svg_read_pathv(s);
+        SPCurve *curve = new SPCurve(pv);
+        
+        if (_curve_before_lpe) {
+            _curve_before_lpe = _curve_before_lpe->unref();
+        }
+
+        if (curve) {
+            _curve_before_lpe = curve->ref();
+        }
+        //this->getRepr()->setAttribute("inkscape:original-d", s);
+    }
     this->readAttr( "d" );
 
     /* d is a required attribute */
@@ -314,7 +329,6 @@ g_message("sp_path_update_patheffect");
 #ifdef PATH_VERBOSE
 g_message("sp_path_update_patheffect writes 'd' attribute");
 #endif
-
             if (_curve) {
                 gchar *str = sp_svg_write_path(this->_curve->get_pathvector());
                 repr->setAttribute("d", str);