1 files changed, 12 insertions, 22 deletions
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index a8d588e73fe5..826e87520ce3 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -84,6 +84,7 @@
 #include <svx/svdovirt.hxx>
 #include <svx/svdouno.hxx>
 #include <svx/sdr/primitive2d/sdrprimitivetools.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -608,9 +609,8 @@ void SdrDragMethod::applyCurrentTransformationToSdrObject(SdrObject& rTarget)
         const double fScaleY(fabs(aScale.getY()) / (basegfx::fTools::equalZero(aPolyRange.getHeight()) ? 1.0 : aPolyRange.getHeight()));
 
         // prepare transform matrix for polygon
-        basegfx::B2DHomMatrix aPolyTransform;
-
-        aPolyTransform.translate(-aPolyRange.getMinX(), -aPolyRange.getMinY());
+        basegfx::B2DHomMatrix aPolyTransform(basegfx::tools::createTranslateB2DHomMatrix(
+            -aPolyRange.getMinX(), -aPolyRange.getMinY()));
         aPolyTransform.scale(fScaleX, fScaleY);
 
         // normally the poly should be moved back, but the translation is in the object
@@ -1449,11 +1449,7 @@ bool SdrDragMove::BeginSdrDrag()
 
 basegfx::B2DHomMatrix SdrDragMove::getCurrentTransformation()
 {
-    basegfx::B2DHomMatrix aRetval;
-
-    aRetval.translate(DragStat().GetDX(), DragStat().GetDY());
-
-    return aRetval;
+    return basegfx::tools::createTranslateB2DHomMatrix(DragStat().GetDX(), DragStat().GetDY());
 }
 
 void SdrDragMove::ImpCheckSnap(const Point& rPt)
@@ -1778,9 +1774,8 @@ bool SdrDragResize::BeginSdrDrag()
 
 basegfx::B2DHomMatrix SdrDragResize::getCurrentTransformation()
 {
-    basegfx::B2DHomMatrix aRetval;
-
-    aRetval.translate(-DragStat().Ref1().X(), -DragStat().Ref1().Y());
+    basegfx::B2DHomMatrix aRetval(basegfx::tools::createTranslateB2DHomMatrix(
+        -DragStat().Ref1().X(), -DragStat().Ref1().Y()));
     aRetval.scale(aXFact, aYFact);
     aRetval.translate(DragStat().Ref1().X(), DragStat().Ref1().Y());
 
@@ -2064,13 +2059,9 @@ bool SdrDragRotate::BeginSdrDrag()
 
 basegfx::B2DHomMatrix SdrDragRotate::getCurrentTransformation()
 {
-    basegfx::B2DHomMatrix aRetval;
-
-    aRetval.translate(-DragStat().GetRef1().X(), -DragStat().GetRef1().Y());
-    aRetval.rotate(-atan2(nSin, nCos));
-    aRetval.translate(DragStat().GetRef1().X(), DragStat().GetRef1().Y());
-
-    return aRetval;
+    return basegfx::tools::createRotateAroundPoint(
+        DragStat().GetRef1().X(), DragStat().GetRef1().Y(),
+        -atan2(nSin, nCos));
 }
 
 void SdrDragRotate::MoveSdrDrag(const Point& rPnt_)
@@ -2220,9 +2211,8 @@ bool SdrDragShear::BeginSdrDrag()
 
 basegfx::B2DHomMatrix SdrDragShear::getCurrentTransformation()
 {
-    basegfx::B2DHomMatrix aRetval;
-
-    aRetval.translate(-DragStat().GetRef1().X(), -DragStat().GetRef1().Y());
+    basegfx::B2DHomMatrix aRetval(basegfx::tools::createTranslateB2DHomMatrix(
+        -DragStat().GetRef1().X(), -DragStat().GetRef1().Y()));
 
     if (bResize)
     {
@@ -2520,7 +2510,7 @@ basegfx::B2DHomMatrix SdrDragMirror::getCurrentTransformation()
         const double fDeltaY(DragStat().GetRef2().Y() - DragStat().GetRef1().Y());
         const double fRotation(atan2(fDeltaY, fDeltaX));
 
-        aRetval.translate(-DragStat().GetRef1().X(), -DragStat().GetRef1().Y());
+        aRetval = basegfx::tools::createTranslateB2DHomMatrix(-DragStat().GetRef1().X(), -DragStat().GetRef1().Y());
         aRetval.rotate(-fRotation);
         aRetval.scale(1.0, -1.0);
         aRetval.rotate(fRotation);