summaryrefslogtreecommitdiff
path: root/slideshow/source
diff options
context:
space:
mode:
Diffstat (limited to 'slideshow/source')
-rw-r--r--slideshow/source/engine/transitions/snakewipe.cxx13
-rw-r--r--slideshow/source/engine/transitions/spiralwipe.cxx8
2 files changed, 16 insertions, 5 deletions
diff --git a/slideshow/source/engine/transitions/snakewipe.cxx b/slideshow/source/engine/transitions/snakewipe.cxx
index ceaa1d00192b..7196989abd39 100644
--- a/slideshow/source/engine/transitions/snakewipe.cxx
+++ b/slideshow/source/engine/transitions/snakewipe.cxx
@@ -191,7 +191,9 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis )
else
res = calcSnake(t);
- return m_flipOnYAxis ? flipOnYAxis(res) : res;
+ if (m_flipOnYAxis)
+ return flipOnYAxis(res);
+ return res;
}
::basegfx::B2DPolyPolygon ParallelSnakesWipe::operator () ( double t )
@@ -227,10 +229,15 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis )
aTransform.translate( 0.5, 0.5 );
half.transform( aTransform );
res.append( flipOnYAxis(half) );
- res.append( m_opposite ? flipOnXAxis(half) : half );
+ if (m_opposite)
+ res.append(flipOnXAxis(half));
+ else
+ res.append(half);
}
- return m_flipOnYAxis ? flipOnYAxis(res) : res;
+ if (m_flipOnYAxis)
+ return flipOnYAxis(res);
+ return res;
}
}
diff --git a/slideshow/source/engine/transitions/spiralwipe.cxx b/slideshow/source/engine/transitions/spiralwipe.cxx
index 3d1dc0282ea1..8f6aed92a2bd 100644
--- a/slideshow/source/engine/transitions/spiralwipe.cxx
+++ b/slideshow/source/engine/transitions/spiralwipe.cxx
@@ -85,7 +85,9 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis )
::basegfx::B2DPolyPolygon innerSpiral( calcNegSpiral( 1.0 - t ) );
innerSpiral.flip();
res.append(innerSpiral);
- return m_flipOnYAxis ? flipOnYAxis(res) : res;
+ if (m_flipOnYAxis)
+ return flipOnYAxis(res);
+ return res;
}
::basegfx::B2DPolyPolygon BoxSnakesWipe::operator () ( double t )
@@ -112,7 +114,9 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis )
res.append( flipOnXAxis(innerSpiral) );
}
- return m_flipOnYAxis ? flipOnYAxis(res) : res;
+ if (m_flipOnYAxis)
+ return flipOnYAxis(res);
+ return res;
}
}