sb118: merged in DEV300_m69

1 files changed, 21 insertions, 15 deletions

diff --git a/slideshow/source/engine/transitions/snakewipe.cxx b/slideshow/source/engine/transitions/snakewipe.cxx
index 496eaa559a6a..a8050a1b0e9a 100644
--- a/slideshow/source/engine/transitions/snakewipe.cxx
+++ b/slideshow/source/engine/transitions/snakewipe.cxx
@@ -35,6 +35,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include "snakewipe.hxx"
 #include "transitiontools.hxx"
 
@@ -121,16 +122,20 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis )
         poly.append( ::basegfx::B2DPoint( len + a, 0.0 ) );
         poly.setClosed(true);
         ::basegfx::B2DHomMatrix aTransform;
-        if ((static_cast<sal_Int32>(sqrtArea2) & 1) == 1) {
+
+        if ((static_cast<sal_Int32>(sqrtArea2) & 1) == 1)
+        {
             // odd line
-            aTransform.rotate( M_PI_2 + M_PI_4 );
-            aTransform.translate( edge + m_elementEdge, 0.0 );
+            aTransform = basegfx::tools::createRotateB2DHomMatrix(M_PI_2 + M_PI_4);
+            aTransform.translate(edge + m_elementEdge, 0.0);
         }
-        else {
-            aTransform.translate( -a, 0.0 );
+        else
+        {
+            aTransform = basegfx::tools::createTranslateB2DHomMatrix(-a, 0.0);
             aTransform.rotate( -M_PI_4 );
             aTransform.translate( 0.0, edge );
         }
+
         poly.transform( aTransform );
         res.append(poly);
     }
@@ -161,14 +166,17 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis )
         poly.append( ::basegfx::B2DPoint( len + a, 0.0 ) );
         poly.setClosed(true);
         ::basegfx::B2DHomMatrix aTransform;
-        if ((static_cast<sal_Int32>(sqrtArea2) & 1) == 1) {
+
+        if ((static_cast<sal_Int32>(sqrtArea2) & 1) == 1)
+        {
             // odd line
-            aTransform.translate( 0.0, -height );
+            aTransform = basegfx::tools::createTranslateB2DHomMatrix(0.0, -height);
             aTransform.rotate( M_PI_2 + M_PI_4 );
             aTransform.translate( 1.0, edge );
         }
-        else {
-            aTransform.rotate( -M_PI_4 );
+        else
+        {
+            aTransform = basegfx::tools::createRotateB2DHomMatrix(-M_PI_4);
             aTransform.translate( edge, 1.0 );
         }
         poly.transform( aTransform );
@@ -205,17 +213,16 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis )
         ::basegfx::B2DPolyPolygon half(
             calcHalfDiagonalSnake( t, false /* out */ ) );
         // flip on x axis and rotate 90 degrees:
-        ::basegfx::B2DHomMatrix aTransform;
-        aTransform.scale( 1.0, -1.0 );
+        basegfx::B2DHomMatrix aTransform(basegfx::tools::createScaleB2DHomMatrix(1.0, -1.0));
         aTransform.translate( -0.5, 0.5 );
         aTransform.rotate( M_PI_2 );
         aTransform.translate( 0.5, 0.5 );
         half.transform( aTransform );
         half.flip();
         res.append( half );
+
         // rotate 180 degrees:
-        aTransform.identity();
-        aTransform.translate( -0.5, -0.5 );
+        aTransform = basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5);
         aTransform.rotate( M_PI );
         aTransform.translate( 0.5, 0.5 );
         half.transform( aTransform );
@@ -225,8 +232,7 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis )
     {
         ::basegfx::B2DPolyPolygon half( calcSnake( t / 2.0 ) );
         // rotate 90 degrees:
-        ::basegfx::B2DHomMatrix aTransform;
-        aTransform.translate( -0.5, -0.5 );
+        basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix(-0.5, -0.5));
         aTransform.rotate( M_PI_2 );
         aTransform.translate( 0.5, 0.5 );
         half.transform( aTransform );