update to trunk

(bzr r13645.1.85)

5 files changed, 9 insertions, 25 deletions

diff --git a/src/live_effects/parameter/originalpath.cpp b/src/live_effects/parameter/originalpath.cpp
index 0884c4c9c..2741461be 100644
--- a/src/live_effects/parameter/originalpath.cpp
+++ b/src/live_effects/parameter/originalpath.cpp
@@ -8,10 +8,6 @@
 # include "config.h"
 #endif
 
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
 #include <gtkmm/box.h>
 #include "live_effects/parameter/originalpath.h"
 
diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp
index 7706dbdf8..78e061e66 100644
--- a/src/live_effects/parameter/originalpatharray.cpp
+++ b/src/live_effects/parameter/originalpatharray.cpp
@@ -8,10 +8,6 @@
 # include "config.h"
 #endif
 
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
 #include "live_effects/parameter/originalpatharray.h"
 
 #include <gtkmm/widget.h>
diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp
index ba95affd9..32e82ff8c 100644
--- a/src/live_effects/parameter/path.cpp
+++ b/src/live_effects/parameter/path.cpp
@@ -427,7 +427,13 @@ PathParam::paste_param_path(const char *svgd)
     if (svgd && *svgd) {
         // remove possible link to path
         remove_link();
-
+        SPItem * item = SP_ACTIVE_DESKTOP->getSelection()->singleItem();
+        if (item != NULL) {
+            Geom::PathVector path_clipboard =  sp_svg_read_pathv(svgd);
+            path_clipboard *= item->i2doc_affine().inverse();
+            svgd = sp_svg_write_path( path_clipboard );
+        }
+        
         param_write_to_repr(svgd);
         signal_path_pasted.emit();
     }
diff --git a/src/live_effects/parameter/satellitearray.cpp b/src/live_effects/parameter/satellitearray.cpp
index 0e42c23c5..b0b036962 100644
--- a/src/live_effects/parameter/satellitearray.cpp
+++ b/src/live_effects/parameter/satellitearray.cpp
@@ -58,21 +58,11 @@ void SatelliteArrayParam::setPointwise(Geom::Pointwise *pointwise)
     param_set_and_write_new_value(_last_pointwise->getSatellites());
 }
 
-void SatelliteArrayParam::setDocumentUnit(Glib::ustring value_document_unit)
-{
-    _documentUnit = value_document_unit;
-}
-
 void SatelliteArrayParam::setUseDistance(bool use_knot_distance)
 {
     _use_distance = use_knot_distance;
 }
 
-void SatelliteArrayParam::setUnit(const gchar *abbr)
-{
-    _unit = abbr;
-}
-
 void SatelliteArrayParam::setEffectType(EffectType et)
 {
     _effectType = et;
@@ -460,8 +450,8 @@ void FilletChamferKnotHolderEntity::knot_click(guint state)
                     : false;
         }
         Inkscape::UI::Dialogs::FilletChamferPropertiesDialog::showDialog(
-            this->desktop, amount, this, _pparam->_unit, _pparam->_use_distance,
-            aprox, _pparam->_documentUnit, _pparam->_vector.at(index));
+            this->desktop, amount, this, _pparam->_use_distance,
+            aprox, _pparam->_vector.at(index));
 
     }
 }
diff --git a/src/live_effects/parameter/satellitearray.h b/src/live_effects/parameter/satellitearray.h
index bb53af12b..2845e3969 100644
--- a/src/live_effects/parameter/satellitearray.h
+++ b/src/live_effects/parameter/satellitearray.h
@@ -55,9 +55,7 @@ public:
         return true;
     }
     void param_transform_multiply(Geom::Affine const &postmul, bool /*set*/);
-    void setDocumentUnit(Glib::ustring value_document__unit);
     void setUseDistance(bool use_knot_distance);
-    void setUnit(const gchar *abbr);
     void setEffectType(EffectType et);
     void setPointwise(Geom::Pointwise *pointwise);
     void set_oncanvas_looks(SPKnotShapeType shape, SPKnotModeType mode,
@@ -79,8 +77,6 @@ private:
     Geom::PathVector _hp;
     int _helper_size;
     bool _use_distance;
-    const gchar *_unit;
-    Glib::ustring _documentUnit;
     EffectType _effectType;
     Geom::Pointwise *_last_pointwise;