[Libreoffice-commits] core.git: compilerplugins/clang slideshow/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Fri Sep 27 17:36:38 UTC 2019


 compilerplugins/clang/virtualdead.results   |    3 ---
 slideshow/source/engine/slide/slideimpl.cxx |    5 -----
 slideshow/source/engine/slideshowimpl.cxx   |    2 --
 slideshow/source/inc/slide.hxx              |    1 -
 4 files changed, 11 deletions(-)

New commits:
commit 5e1b57b8e6482616a415f995c2fa261d5a189973
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Sep 26 11:23:34 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Sep 27 19:35:05 2019 +0200

    loplugin:virtualdead in slideshow
    
    Change-Id: Ie158b76e6d552b1189173e30fbea5a43a774180b
    Reviewed-on: https://gerrit.libreoffice.org/79640
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/virtualdead.results b/compilerplugins/clang/virtualdead.results
index bd25262008c9..e5a3dfcd5c59 100644
--- a/compilerplugins/clang/virtualdead.results
+++ b/compilerplugins/clang/virtualdead.results
@@ -128,9 +128,6 @@ sd/source/ui/inc/smarttag.hxx:171
 slideshow/source/engine/animationfactory.cxx:443
     void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch(const class std::shared_ptr<class slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class slideshow::internal::ShapeAttributeLayer> &,)
     empty
-slideshow/source/inc/slide.hxx:118
-    void slideshow::internal::Slide::disablePaintOverlay()
-    empty
 vcl/inc/salframe.hxx:145
     void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
     empty
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index b23ad397093e..fecbe82df2d1 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -119,7 +119,6 @@ public:
     virtual void drawPolygons() const override;
     virtual bool isPaintOverlayActive() const override;
     virtual void enablePaintOverlay() override;
-    virtual void disablePaintOverlay() override;
     virtual void update_settings( bool bUserPaintEnabled, RGBColor const& aUserPaintColor, double dUserPaintStrokeWidth ) override;
 
 
@@ -795,10 +794,6 @@ void SlideImpl::enablePaintOverlay()
     }
 }
 
-void SlideImpl::disablePaintOverlay()
-{
-}
-
 void SlideImpl::activatePaintOverlay()
 {
     if( mbUserPaintOverlayEnabled || !maPolygons.empty() )
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index e5bfcc5146be..13d03bf484e4 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -1543,8 +1543,6 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
             // disable user paint
             maUserPaintColor.reset();
             maEventMultiplexer.notifyUserPaintDisabled();
-            if( mpCurrentSlide )
-                mpCurrentSlide->disablePaintOverlay();
         }
 
         resetCursor();
diff --git a/slideshow/source/inc/slide.hxx b/slideshow/source/inc/slide.hxx
index 0f1e2dc205e9..c269b9f4164d 100644
--- a/slideshow/source/inc/slide.hxx
+++ b/slideshow/source/inc/slide.hxx
@@ -115,7 +115,6 @@ namespace slideshow
             virtual bool isPaintOverlayActive() const = 0;
 
             virtual void enablePaintOverlay() = 0;
-            virtual void disablePaintOverlay() = 0;
 
             virtual void update_settings( bool bUserPaintEnabled, RGBColor const& aUserPaintColor, double dUserPaintStrokeWidth ) = 0;
 


More information about the Libreoffice-commits mailing list