From d2f35280c987837671322c977138fcc2402287c0 Mon Sep 17 00:00:00 2001
From: Andre Fischer
 <andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com>
Date: Thu, 14 Oct 2010 14:03:13 +0200
Subject: impress195: #i80637# Changed the algorithm for mixing of elements.

---
 slideshow/source/engine/transitions/randomwipe.cxx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'slideshow')

diff --git a/slideshow/source/engine/transitions/randomwipe.cxx b/slideshow/source/engine/transitions/randomwipe.cxx
index 22c51e38852e..d8ac4a3da687 100644
--- a/slideshow/source/engine/transitions/randomwipe.cxx
+++ b/slideshow/source/engine/transitions/randomwipe.cxx
@@ -68,13 +68,11 @@ RandomWipe::RandomWipe( sal_Int32 nElements, bool randomBars )
     m_rect.transform( aTransform );
 
     // mix up:
-    for ( sal_Int32 i = (nElements / 2); i--; )
+    for (sal_Int32 nIndex=0; nIndex<nElements; ++nIndex)
     {
-        const sal_Int32 pos1 = getRandomOrdinal(nElements);
-        const sal_Int32 pos2 = getRandomOrdinal(nElements);
-        const ::basegfx::B2DPoint point( m_positions[ pos1 ] );
-        m_positions[ pos1 ] = m_positions[ pos2 ];
-        m_positions[ pos2 ] = point;
+        const sal_Int32 nOtherIndex (getRandomOrdinal(nElements));
+        OSL_ASSERT(nOtherIndex>=0 && nOtherIndex<nElements);
+        ::std::swap(m_positions[nIndex], m_positions[nOtherIndex]);
     }
 }
 
-- 
cgit