Merge commit 'ooo/DEV300_m103'

Conflicts:
sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
slideshow/source/engine/debug.cxx
slideshow/source/engine/transitions/randomwipe.cxx

5 files changed, 7 insertions, 6 deletions

diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx
index 6f4a6d9c47b3..ad2d09a59e78 100644
--- a/slideshow/source/engine/animationnodes/basenode.hxx
+++ b/slideshow/source/engine/animationnodes/basenode.hxx
@@ -90,7 +90,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/debug.cxx b/slideshow/source/engine/debug.cxx
index a0dbe58cb7ec..bc5f24f95509 100644
--- a/slideshow/source/engine/debug.cxx
+++ b/slideshow/source/engine/debug.cxx
@@ -308,7 +308,7 @@ DebugTraceScope::DebugTraceScope (const sal_Char* sFormat, ...)
     va_start(args, sFormat);
 
     msMessage[mnBufferSize-1] = 0;
-    snprintf(msMessage, mnBufferSize-1, sFormat, args);
+    vsnprintf(msMessage, mnBufferSize-1, sFormat, args);
     TRACE_BEGIN("[ %s", msMessage);
     va_end(args);
 }
diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx
index a657d337064e..1800ab3a5fe8 100644
--- a/slideshow/source/engine/shapes/drawshape.hxx
+++ b/slideshow/source/engine/shapes/drawshape.hxx
@@ -66,7 +66,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 dec32a95262d..9e914c41c088 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 82f0792abd36..eb2ee6c1bc57 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -97,7 +97,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,