From f38f101c22e8afeceacc49bcd09b43bac47347e7 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Sat, 16 Sep 2017 16:00:54 +0200
Subject: Fix a bug on uninicialitated variable, that perform diferent results
 in debug and in release mode. Thanks Michael for help me finfing this bug.
 Also sused to remove some unnneded code in path chemistry and to better
 naming the variable uninicilitated

---
 src/live_effects/lpe-clone-original.cpp     |  2 +-
 src/live_effects/parameter/originalitem.cpp |  3 ++-
 src/live_effects/parameter/originalitem.h   |  4 ++--
 src/selection-chemistry.cpp                 | 12 ------------
 4 files changed, 5 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/live_effects/lpe-clone-original.cpp b/src/live_effects/lpe-clone-original.cpp
index 31bf0e270..e72735370 100644
--- a/src/live_effects/lpe-clone-original.cpp
+++ b/src/live_effects/lpe-clone-original.cpp
@@ -221,7 +221,7 @@ LPECloneOriginal::cloneAttrbutes(SPObject *origin, SPObject *dest, bool live, co
 void
 LPECloneOriginal::doBeforeEffect (SPLPEItem const* lpeitem){
     if (linkeditem.linksToItem()) {
-        linkeditem.setInverse(inverse);
+        linkeditem.setInsensitive(inverse);
         if ( preserve_position_changed != preserve_position ) {
             if (!preserve_position) {
                 sp_svg_transform_read(SP_ITEM(sp_lpe_item)->getAttribute("transform"), &preserve_affine);
diff --git a/src/live_effects/parameter/originalitem.cpp b/src/live_effects/parameter/originalitem.cpp
index 81ab41c56..6de70be17 100644
--- a/src/live_effects/parameter/originalitem.cpp
+++ b/src/live_effects/parameter/originalitem.cpp
@@ -35,6 +35,7 @@ OriginalItemParam::OriginalItemParam( const Glib::ustring& label, const Glib::us
                       Effect* effect)
     : ItemParam(label, tip, key, wr, effect, "")
 {
+    _insensitive = false;
 }
 
 OriginalItemParam::~OriginalItemParam()
@@ -87,7 +88,7 @@ OriginalItemParam::param_newWidget()
 void
 OriginalItemParam::linked_modified_callback(SPObject *linked_obj, guint /*flags*/)
 {
-    if (!inverse) {
+    if (!_insensitive) {
         emit_changed();
         SP_OBJECT(param_effect->getLPEObj())->requestModified(SP_OBJECT_MODIFIED_FLAG);
     }
diff --git a/src/live_effects/parameter/originalitem.h b/src/live_effects/parameter/originalitem.h
index 58d04e05a..9b692c503 100644
--- a/src/live_effects/parameter/originalitem.h
+++ b/src/live_effects/parameter/originalitem.h
@@ -23,7 +23,7 @@ public:
                 Inkscape::UI::Widget::Registry* wr,
                 Effect* effect);
     virtual ~OriginalItemParam();
-    void setInverse(bool inversed) { inverse = inversed; }
+    void setInsensitive(bool insensitive) { insensitive = _insensitive; }
     bool linksToItem() const { return (href != NULL); }
     SPItem * getObject() const { return ref.getObject(); }
 
@@ -36,7 +36,7 @@ protected:
     void on_select_original_button_click();
 
 private:
-    bool inverse;
+    bool _insensitive;
     OriginalItemParam(const OriginalItemParam&);
     OriginalItemParam& operator=(const OriginalItemParam&);
 };
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index 9764563f1..9e0298f6a 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -2849,18 +2849,6 @@ void ObjectSet::cloneOriginal()
                 SPFlowtext *flowtext = dynamic_cast<SPFlowtext *>(item);
                 if (flowtext) {
                     original = flowtext->get_frame(NULL); // first frame only
-                } else {
-                    SPLPEItem *lpeItem = dynamic_cast<SPLPEItem *>(item);
-                    if (lpeItem) {
-                        // check if the applied LPE is Clone original, if so, go to the refered path
-                        Inkscape::LivePathEffect::Effect* lpe = lpeItem->getPathEffectOfType(Inkscape::LivePathEffect::CLONE_ORIGINAL);
-                        if (lpe) {
-                            Inkscape::LivePathEffect::Parameter *lpeparam = lpe->getParameter("linkedpath");
-                            if (Inkscape::LivePathEffect::OriginalPathParam *pathparam = dynamic_cast<Inkscape::LivePathEffect::OriginalPathParam *>(lpeparam)) {
-                                original = pathparam->getObject();
-                            }
-                        }
-                    }
                 }
             }
         }
-- 
cgit v1.2.3