loplugin:expandablemethodds in sfx2..starmath

Change-Id: Ia4c411f5a9a68c2f344188ce6b6bc1815c89f993
Reviewed-on: https://gerrit.libreoffice.org/30055
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 5 insertions, 22 deletions

diff --git a/slideshow/source/engine/animationnodes/animationsetnode.cxx b/slideshow/source/engine/animationnodes/animationsetnode.cxx
index 0e19b7fb8778..3770790c193e 100644
--- a/slideshow/source/engine/animationnodes/animationsetnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationsetnode.cxx
@@ -30,11 +30,6 @@ using namespace com::sun::star;
 namespace slideshow {
 namespace internal {
 
-void AnimationSetNode::implScheduleDeactivationEvent()
-{
-    scheduleDeactivationEvent();
-}
-
 AnimationActivitySharedPtr AnimationSetNode::createActivity() const
 {
     ActivitiesFactory::CommonParameters aParms( fillCommonParameters() );
@@ -61,8 +56,8 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const
         ENSURE_OR_THROW(
             pSelf, "cannot cast getSelf() to my type!" );
         aParms.mpEndEvent = makeEvent(
-            [pSelf] () { pSelf->implScheduleDeactivationEvent(); },
-            "AnimationSetNode::implScheduleDeactivationEvent");
+            [pSelf] () { pSelf->scheduleDeactivationEvent(); },
+            "AnimationSetNode::scheduleDeactivationEvent");
     }
 
     switch (AnimationFactory::classifyAttributeName( attrName )) {
diff --git a/slideshow/source/engine/animationnodes/animationsetnode.hxx b/slideshow/source/engine/animationnodes/animationsetnode.hxx
index ee63b42d9132..9c39377470b1 100644
--- a/slideshow/source/engine/animationnodes/animationsetnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationsetnode.hxx
@@ -39,7 +39,6 @@ public:
 
 private:
     virtual AnimationActivitySharedPtr createActivity() const override;
-    void implScheduleDeactivationEvent();
 };
 
 } // namespace internal
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 41e30972212b..63d1787474cb 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -156,10 +156,6 @@ private:
     void updateShapeAttributes( double fTime,
                                 basegfx::B2DRectangle const& parentBounds );
 
-    // Access to VisibleWhenSTarted flags
-    bool IsVisibleWhenStarted() const { return mbVisibleWhenStarted; }
-    bool IsVisibleWhenStopped() const { return mbVisibleWhenStopped; }
-
     // scroll horizontal? if sal_False, scroll is vertical.
     bool ScrollHorizontal() const {
         return (drawing::TextAnimationDirection_LEFT == meDirection ||
@@ -418,7 +414,7 @@ void ActivityImpl::ImpForceScrollTextAnimNodes()
             fOneRelative = 1.0;
         }
 
-        if(IsVisibleWhenStarted())
+        if(mbVisibleWhenStarted)
         {
             double fRelativeStartValue, fRelativeEndValue,fRelativeDistance;
 
@@ -496,7 +492,7 @@ void ActivityImpl::ImpForceScrollTextAnimNodes()
             }
         }
 
-        if(IsVisibleWhenStopped())
+        if(mbVisibleWhenStopped)
         {
             double fRelativeStartValue, fRelativeEndValue, fRelativeDistance;
 
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index 2acc75f0b835..7ea7bcc5e98a 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -838,7 +838,7 @@ namespace slideshow
             ENSURE_OR_RETURN_FALSE( mpViewLayer->getCanvas(), "ViewShape::update(): Invalid layer canvas" );
 
             // Shall we render to a sprite, or to a plain canvas?
-            if( isBackgroundDetached() )
+            if( mbAnimationMode )
                 return renderSprite( mpViewLayer,
                                      rMtf,
                                      rArgs.maOrigBounds,
diff --git a/slideshow/source/engine/shapes/viewshape.hxx b/slideshow/source/engine/shapes/viewshape.hxx
index 9f6d46c89fe0..4eb2f7c1e7c5 100644
--- a/slideshow/source/engine/shapes/viewshape.hxx
+++ b/slideshow/source/engine/shapes/viewshape.hxx
@@ -95,13 +95,6 @@ namespace slideshow
              */
             void leaveAnimationMode();
 
-            /** Query whether the ViewShape is currently animated
-
-                This method checks whether the ViewShape is currently in
-                animation mode.
-             */
-            bool isBackgroundDetached() const { return mbAnimationMode; }
-
 
             // render methods