From 41ea741cd843776cd600d33b28a7f0e35345e0d0 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 7 Nov 2016 10:42:33 +0200
Subject: loplugin:unnecessaryvirtual in sfx2..svtools

Change-Id: Ib34e14806f7cc9a97ecfd68687ab17ee5c1f022b
Reviewed-on: https://gerrit.libreoffice.org/30652
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 slideshow/source/engine/animationfactory.cxx       |  5 ++---
 slideshow/source/engine/shapes/viewappletshape.hxx |  4 ++--
 slideshow/source/engine/shapes/viewmediashape.hxx  |  4 ++--
 slideshow/source/inc/shapeattributelayer.hxx       | 17 ++---------------
 4 files changed, 8 insertions(+), 22 deletions(-)

(limited to 'slideshow')

diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index 17714ffe0783..adfedb51215a 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -436,7 +436,7 @@ namespace slideshow
 
                 ~GenericAnimation()
                 {
-                    end_();
+                    end();
                 }
 
                 // Animation interface
@@ -472,8 +472,7 @@ namespace slideshow
                     }
                 }
 
-                virtual void end() { end_(); }
-                void end_()
+                void end()
                 {
                     // TODO(Q2): Factor out common code (most
                     // prominently start() and end()) into base class
diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx b/slideshow/source/engine/shapes/viewappletshape.hxx
index 26d8b6ce004a..adc66cb6b41d 100644
--- a/slideshow/source/engine/shapes/viewappletshape.hxx
+++ b/slideshow/source/engine/shapes/viewappletshape.hxx
@@ -49,7 +49,7 @@ namespace slideshow
             The class is able to render the associated applet on View
             implementations.
          */
-        class ViewAppletShape
+        class ViewAppletShape final
         {
         public:
             /** Create a ViewAppletShape for the given View
@@ -80,7 +80,7 @@ namespace slideshow
 
             /** destroy the object
              */
-            virtual ~ViewAppletShape();
+            ~ViewAppletShape();
 
             /// Forbid copy construction
             ViewAppletShape(const ViewAppletShape&) = delete;
diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx
index c04b3e9e42ad..5c0394ff8810 100644
--- a/slideshow/source/engine/shapes/viewmediashape.hxx
+++ b/slideshow/source/engine/shapes/viewmediashape.hxx
@@ -55,7 +55,7 @@ namespace slideshow
             The class is able to render the associated media shape on
             View implementations.
          */
-        class ViewMediaShape
+        class ViewMediaShape final
         {
         public:
             /** Create a ViewMediaShape for the given View
@@ -69,7 +69,7 @@ namespace slideshow
 
             /** destroy the object
              */
-            virtual ~ViewMediaShape();
+            ~ViewMediaShape();
 
             /// Forbid copy construction
             ViewMediaShape(const ViewMediaShape&) = delete;
diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx
index d52e8a9123a3..e8648b58ac3e 100644
--- a/slideshow/source/inc/shapeattributelayer.hxx
+++ b/slideshow/source/inc/shapeattributelayer.hxx
@@ -47,28 +47,15 @@ namespace slideshow
             changes, clients can assume that the object's state has
             changed.
          */
-        class State
+        class State final
         {
         public:
-            virtual ~State() {}
+            ~State() {}
 
             /// Abstract, numerically encoded state ID
             typedef ::std::size_t StateId;
-
-            /** This method returns a numerical state identifier.
-
-                The state ID returned by this method abstractly
-                encodes the object's state. When this ID changes,
-                clients can assume that the object's state has
-                changed.
-
-                @return an abstract, numerical state ID.
-             */
-            ;
         };
 
-        typedef ::std::shared_ptr< State > StateSharedPtr;
-
         class ShapeAttributeLayer;
 
         typedef ::std::shared_ptr< ShapeAttributeLayer > ShapeAttributeLayerSharedPtr;
-- 
cgit