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

Stephan Bergmann sbergman at redhat.com
Wed Nov 11 02:00:45 PST 2015


 sd/source/ui/animations/SlideTransitionPane.cxx |   34 ++++++++++++------------
 sd/source/ui/animations/SlideTransitionPane.hxx |    1 
 2 files changed, 17 insertions(+), 18 deletions(-)

New commits:
commit 3503873c7b54c013e7cfe8f73ce8485862348592
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 11 11:00:23 2015 +0100

    loplugin:staticmethods
    
    Change-Id: I04b15122e73c527fbc695687079f6093ebcb5a5f

diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 536df31..dc16de9 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -356,6 +356,23 @@ void lcl_FillSoundListBox(
                      lcl_AppendSoundToListBox( rOutListBox ));
 }
 
+/// Returns an offset into the list of transition presets
+size_t getPresetOffset( const sd::impl::TransitionEffect &rEffect )
+{
+    const sd::TransitionPresetList& rPresetList =
+        sd::TransitionPreset::getTransitionPresetList();
+    sd::TransitionPresetPtr pFound;
+
+    size_t nIdx = 0;
+    for( auto aIt: rPresetList )
+    {
+        if( rEffect.operator==( *aIt ))
+            break;
+        nIdx++;
+    }
+    return nIdx;
+}
+
 } // anonymous namespace
 
 namespace sd
@@ -997,23 +1014,6 @@ IMPL_LINK_NOARG_TYPED(SlideTransitionPane, TransitionSelected, ValueSet *, void)
     applyToSelectedPages();
 }
 
-/// Returns an offset into the list of transition presets
-size_t SlideTransitionPane::getPresetOffset( const impl::TransitionEffect &rEffect )
-{
-    const sd::TransitionPresetList& rPresetList =
-        sd::TransitionPreset::getTransitionPresetList();
-    sd::TransitionPresetPtr pFound;
-
-    size_t nIdx = 0;
-    for( auto aIt: rPresetList )
-    {
-        if( rEffect.operator==( *aIt ))
-            break;
-        nIdx++;
-    }
-    return nIdx;
-}
-
 /// we use an integer offset into the list of transition presets
 void SlideTransitionPane::updateVariants( size_t nPresetOffset )
 {
diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx
index c523447..6a45746 100644
--- a/sd/source/ui/animations/SlideTransitionPane.hxx
+++ b/sd/source/ui/animations/SlideTransitionPane.hxx
@@ -71,7 +71,6 @@ private:
     void updateControls();
     void updateControlState();
     void updateVariants(size_t nPresetOffset);
-    size_t getPresetOffset(const impl::TransitionEffect &rEffect);
 
     void updateSoundList();
     void openSoundFileDialog();


More information about the Libreoffice-commits mailing list