fix lpe-PathPAram when deleting the path that it links to

fix ClipboardManager to construct the svgd from pathvector instead of obtaining the string from PathParam which can be a href instead of svgd

diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index be26006c7e726f3e3295389c571425091ecbfaea..d7237e54bd2565e5da37a9a5c46440c405ff598f 100644 (file)
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -205,6 +205,7 @@ PathParam::param_editOncanvas(SPItem * item, SPDesktop * dt)
         shape_editor->set_item_lpe_path_parameter(item, SP_OBJECT(param_effect->getLPEObj()), param_key.c_str());
     } else {
         // set referred item for editing
+        shape_editor->set_item(ref.getObject());
     }
 }
 
@@ -241,6 +242,18 @@ PathParam::param_set_and_write_new_value (Geom::Piecewise<Geom::D2<Geom::SBasis>
     must_recalculate_pwd2 = false;
 }
 
+void
+PathParam::param_set_and_write_new_value (std::vector<Geom::Path> const & newpath)
+{
+    remove_link();
+    _pathvector = newpath;
+    must_recalculate_pwd2 = true;
+
+    gchar * svgd = SVGD_from_2GeomPath( _pathvector );
+    param_write_to_repr(svgd);
+    g_free(svgd);
+}
+
 void
 PathParam::ensure_pwd2()
 {
@@ -294,8 +307,9 @@ PathParam::remove_link()
 void
 PathParam::linked_delete(SPObject */*deleted*/)
 {
-// don't know what to do yet. not acting probably crashes inkscape.
-    g_message("PathParam::linked_delete");
+    quit_listening();
+    remove_link();
+    param_set_and_write_new_value (_pathvector);
 }
 
 void

diff --git a/src/live_effects/parameter/path.h b/src/live_effects/parameter/path.h
index 1f2be32c8a605e569bf9ac12828d12d309522cd0..d72b4b7fea30321bc4f6b3db05a2c4a8a838a3ff 100644 (file)
--- a/src/live_effects/parameter/path.h
+++ b/src/live_effects/parameter/path.h
@@ -43,6 +43,7 @@ public:
     void param_set_default();
     void param_set_and_write_default();
     void param_set_and_write_new_value (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & newpath);
+    void param_set_and_write_new_value (std::vector<Geom::Path> const & newpath);
 
     virtual void param_editOncanvas(SPItem * item, SPDesktop * dt);
     virtual void param_setup_nodepath(Inkscape::NodePath::Path *np);

diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 842f10d521db01666d5a00f4b879c2da511ddce1..4ee838708dc7e75440c591e1c32de814d8a0eed5 100644 (file)
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -73,6 +73,7 @@
 #include "text-context.h"
 #include "text-editing.h"
 #include "tools-switch.h"
+#include "live_effects/n-art-bpath-2geom.h"
 
 /// @brief Made up mimetype to represent Gdk::Pixbuf clipboard contents
 #define CLIPBOARD_GDK_PIXBUF_TARGET "image/x-gdk-pixbuf"
@@ -223,7 +224,7 @@ void ClipboardManagerImpl::copy()
 void ClipboardManagerImpl::copyPathParameter(Inkscape::LivePathEffect::PathParam *pp)
 {
     if ( pp == NULL ) return;
-    gchar *svgd = pp->param_writeSVGValue();
+    gchar *svgd = SVGD_from_2GeomPath( pp->get_pathvector() );
     if ( svgd == NULL || *svgd == '\0' ) return;
     
     _discardInternalClipboard();