Merge from trunk

(bzr r9508.1.73)

1 files changed, 5 insertions, 2 deletions

diff --git a/src/sp-line.cpp b/src/sp-line.cpp
index 67a88e17a..b21122566 100644
--- a/src/sp-line.cpp
+++ b/src/sp-line.cpp
@@ -179,7 +179,7 @@ void SPLine::convertToGuides(SPItem *item)
     SPLine *line = SP_LINE(item);
     Geom::Point points[2];
 
-    Geom::Matrix const i2d(item->i2d_affine());
+    Geom::Affine const i2d(item->i2d_affine());
 
     points[0] = Geom::Point(line->x1.computed, line->y1.computed)*i2d;
     points[1] = Geom::Point(line->x2.computed, line->y2.computed)*i2d;
@@ -187,7 +187,7 @@ void SPLine::convertToGuides(SPItem *item)
     SPGuide::createSPGuide(inkscape_active_desktop(), points[0], points[1]);
 }
 
-Geom::Matrix SPLine::setTransform(SPItem *item, Geom::Matrix const &xform)
+Geom::Affine SPLine::setTransform(SPItem *item, Geom::Affine const &xform)
 {
     SPLine *line = SP_LINE(item);
     Geom::Point points[2];
@@ -220,6 +220,9 @@ void SPLine::setShape(SPShape *shape)
     c->lineto(line->x2.computed, line->y2.computed);
 
     shape->setCurveInsync(c, TRUE); // *_insync does not call update, avoiding infinite recursion when set_shape is called by update
+    shape->setCurveBeforeLPE(c);
+
+    // LPE's cannot be applied to lines. (the result can (generally) not be represented as SPLine)
 
     c->unref();
 }