[Libreoffice-commits] core.git: 2 commits - sd/source svx/source

[Julien Nabet]

 sd/source/ui/inc/slideshow.hxx           |    1 -
 sd/source/ui/slideshow/slideshowimpl.cxx |    2 +-
 svx/source/svdraw/svdotxln.cxx           |    3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 037754fa9ecea1792e1a8f73b8b4cad4dac75ee0
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Apr 27 12:31:37 2014 +0200

    cppcheck: reduce scope
    
    Change-Id: I18d7500dcc4b29e2d0face22649f6f96382eabe8

diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index d978094..b4e386f 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -166,7 +166,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad)
     if( pData )
     {
         DateTime                    aFileDT( DateTime::EMPTY );
-        bool                        bExists = true, bLoad = false;
+        bool                        bExists = true;
 
         try
         {
@@ -187,6 +187,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad)
 
         if( bExists )
         {
+            bool bLoad = false;
             if( bForceLoad )
                 bLoad = true;
             else
commit 916cbd94d1c848bc69166915b96ff89ac380c913
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Apr 27 12:23:48 2014 +0200

    ANIMATIONMODE_VIEW can be removed
    
    See http://nabble.documentfoundation.org/About-ANIMATIONMODE-VIEW-in-slideshow-module-td4106488.html
    
    Change-Id: I0405e8ef41105a53ac056382aa6b32d2a573c170

diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 0b87eba..20324f5 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -72,7 +72,6 @@ class FrameView;
 enum AnimationMode
 {
     ANIMATIONMODE_SHOW,
-    ANIMATIONMODE_VIEW,
     ANIMATIONMODE_PREVIEW
 };
 
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 1c3556f..ce7c550 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2659,7 +2659,7 @@ void SlideshowImpl::resize( const Size& rSize )
 {
     maPresSize = rSize;
 
-    if( mpShowWindow && (ANIMATIONMODE_VIEW != meAnimationMode) )
+    if(mpShowWindow)
     {
         mpShowWindow->SetSizePixel( maPresSize );
         mpShowWindow->Show();