Remove unused transform functions related to LPE and improvements to fill-betreen-* LPEs

4 files changed, 1 insertions, 39 deletions

diff --git a/src/object/box3d.cpp b/src/object/box3d.cpp
index 4416a0474..2de71f686 100644
--- a/src/object/box3d.cpp
+++ b/src/object/box3d.cpp
@@ -281,9 +281,6 @@ Geom::Affine SPBox3D::set_transform(Geom::Affine const &xform) {
 
             // Adjust gradient fill
             childitem->adjust_gradient(xform);
-
-            // Adjust LPE
-            childitem->adjust_livepatheffect(xform);
         }
     }
 
diff --git a/src/object/sp-item.cpp b/src/object/sp-item.cpp
index edf216481..cbfd126f9 100644
--- a/src/object/sp-item.cpp
+++ b/src/object/sp-item.cpp
@@ -1411,26 +1411,6 @@ void SPItem::adjust_paint_recursive (Geom::Affine advertized_transform, Geom::Af
     }
 }
 
-void SPItem::adjust_livepatheffect (Geom::Affine const &postmul, bool set)
-{
-    SPLPEItem *lpeitem = dynamic_cast<SPLPEItem *>(this);
-    if ( lpeitem && lpeitem->hasPathEffect() ) {
-        lpeitem->forkPathEffectsIfNecessary();
-        // now that all LPEs are forked_if_necessary, we can apply the transform
-        PathEffectList effect_list =  lpeitem->getEffectList();
-        for (PathEffectList::iterator it = effect_list.begin(); it != effect_list.end(); ++it)
-        {
-            LivePathEffectObject *lpeobj = (*it)->lpeobject;
-            if (lpeobj) {
-                Inkscape::LivePathEffect::Effect * lpe = lpeobj->get_lpe();
-                if (lpe && lpe->isReady()) {
-                    lpe->transform_multiply(postmul, set);
-                }
-            }
-        }
-    }
-}
-
 // CPPIFY:: make pure virtual?
 // Not all SPItems must necessarily have a set transform method!
 Geom::Affine SPItem::set_transform(Geom::Affine const &transform) {
diff --git a/src/object/sp-item.h b/src/object/sp-item.h
index 9b225a4bd..20d423692 100644
--- a/src/object/sp-item.h
+++ b/src/object/sp-item.h
@@ -335,8 +335,6 @@ public:
      */
     void adjust_paint_recursive(Geom::Affine advertized_transform, Geom::Affine t_ancestors, bool is_pattern);
 
-    void adjust_livepatheffect(Geom::Affine const &postmul, bool set = false);
-
     /**
      * Set a new transform on an object.
      *
diff --git a/src/object/sp-path.cpp b/src/object/sp-path.cpp
index d3394c9b5..6456b52c5 100644
--- a/src/object/sp-path.cpp
+++ b/src/object/sp-path.cpp
@@ -347,20 +347,7 @@ Geom::Affine SPPath::set_transform(Geom::Affine const &transform) {
         return transform;
     }
 
-    // TODO: try to remove CLONE_ORIGINAL from here
-    // Transform the original-d path if this is a valid LPE this, other else the (ordinary) path
-    if (_curve_before_lpe && hasPathEffectRecursive()) {
-        if (this->hasPathEffectOfType(Inkscape::LivePathEffect::CLONE_ORIGINAL)) 
-        {
-            // if path has this LPE applied, don't write the transform to the pathdata, but write it 'unoptimized'
-            // also if the effect is type BEND PATH to fix bug #179842
-            return transform;
-        } else {
-            _curve_before_lpe->transform(transform);
-        }
-    } else {
-        _curve->transform(transform);
-    }
+    _curve->transform(transform);
 
     // Adjust stroke
     this->adjust_stroke(transform.descrim());