debuglevels: pulled and merged DEV300.m102

5 files changed, 10 insertions, 11 deletions

diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx
index eb722d6fd..12d7e4789 100644
--- a/slideshow/source/engine/animationnodes/basenode.hxx
+++ b/slideshow/source/engine/animationnodes/basenode.hxx
@@ -89,7 +89,7 @@ class BaseContainerNode;
     file-private accessor methods.
 */
 class BaseNode : public AnimationNode,
-                 protected ::osl::DebugBase<BaseNode>,
+                 public  ::osl::DebugBase<BaseNode>,
                  private ::boost::noncopyable
 {
 public:
diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx
index e6c5e6961..bccd54401 100644
--- a/slideshow/source/engine/shapes/drawshape.hxx
+++ b/slideshow/source/engine/shapes/drawshape.hxx
@@ -65,7 +65,7 @@ namespace slideshow
         class DrawShape : public AttributableShape,
                           public DocTreeNodeSupplier,
                           public HyperlinkArea,
-                          protected ::osl::DebugBase<DrawShape>
+                          public ::osl::DebugBase<DrawShape>
         {
         public:
             /** Create a shape for the given XShape
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index 85b4bcf5d..a40b40600 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -491,9 +491,10 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames&   o_rFrames,
             nWaitTime100thSeconds = 100 * 60 * 60 * 24;
         }
         
-        // There are animated GIFs with no WaitTime set. Take 1 sec, then.
+        // There are animated GIFs with no WaitTime set. Take 0.1 sec, the
+        // same duration that is used by the edit view.
         if( nWaitTime100thSeconds == 0 )
-            nWaitTime100thSeconds = 100;
+            nWaitTime100thSeconds = 10;
 
         o_rFrames.push_back( MtfAnimationFrame( pMtf, 
                                                 nWaitTime100thSeconds / 100.0 ) );
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index 56cfb2a70..f5bdf7c8b 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -94,7 +94,7 @@ namespace
 class SlideImpl : public Slide,
                   public CursorManager,
                   public ViewEventHandler,
-                  protected ::osl::DebugBase<SlideImpl>
+                  public ::osl::DebugBase<SlideImpl>
 {
 public:
     SlideImpl( const uno::Reference<drawing::XDrawPage>& 		 xDrawPage,
diff --git a/slideshow/source/engine/transitions/randomwipe.cxx b/slideshow/source/engine/transitions/randomwipe.cxx
index af0698d9e..66fd5bf30 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]);
     }
 }