loplugin:unnecessaryvirtual

update the plugin with lessons learned from the mergeclasses plugin and
re-run it

Change-Id: I9d622eb3d05fceaf8fa764c533c8fa5dfb4c7711
Reviewed-on: https://gerrit.libreoffice.org/20015
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

4 files changed, 0 insertions, 48 deletions

diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 95eb58d5e25c..ef9a95945f4f 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -177,7 +177,6 @@ struct EventMultiplexerImpl
         maViewRepaintHandlers(),
         maShapeListenerHandlers(),
         maUserPaintEventHandlers(),
-        maShapeCursorHandlers(),
         maMouseClickHandlers(),
         maMouseDoubleClickHandlers(),
         maMouseMoveHandlers(),
@@ -235,9 +234,6 @@ struct EventMultiplexerImpl
         UserPaintEventHandlerSharedPtr,
         std::vector<UserPaintEventHandlerSharedPtr> >     ImplUserPaintEventHandlers;
     typedef ThreadUnsafeListenerContainer<
-        ShapeCursorEventHandlerSharedPtr,
-        std::vector<ShapeCursorEventHandlerSharedPtr> >   ImplShapeCursorHandlers;
-    typedef ThreadUnsafeListenerContainer<
         PrioritizedHandlerEntry<HyperlinkHandler>,
         std::vector<PrioritizedHandlerEntry<HyperlinkHandler> > > ImplHyperLinkHandlers;
 
@@ -292,7 +288,6 @@ struct EventMultiplexerImpl
     ImplRepaintHandlers                 maViewRepaintHandlers;
     ImplShapeListenerHandlers           maShapeListenerHandlers;
     ImplUserPaintEventHandlers          maUserPaintEventHandlers;
-    ImplShapeCursorHandlers             maShapeCursorHandlers;
     ImplMouseHandlers                   maMouseClickHandlers;
     ImplMouseHandlers                   maMouseDoubleClickHandlers;
     ImplMouseHandlers                   maMouseMoveHandlers;
@@ -1004,15 +999,6 @@ bool EventMultiplexer::notifyShapeListenerRemoved(
         { return pHandler->listenerRemoved( xListener, xShape ); } );
 }
 
-bool EventMultiplexer::notifyShapeCursorChange(
-    const uno::Reference<drawing::XShape>&  xShape,
-    sal_Int16                               nPointerShape )
-{
-    return mpImpl->maShapeCursorHandlers.applyAll(
-        [&xShape, &nPointerShape]( const ShapeCursorEventHandlerSharedPtr& pHandler )
-        { return pHandler->cursorChanged( xShape, nPointerShape ); } );
-}
-
 bool EventMultiplexer::notifyUserPaintColor( RGBColor const& rUserColor )
 {
     return mpImpl->maUserPaintEventHandlers.applyAll(
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx
index ea95070b748f..5fbe14f11e56 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.hxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx
@@ -149,9 +149,6 @@ private:
     virtual bool listenerRemoved( const css::uno::Reference< css::presentation::XShapeEventListener>& xListener,
                                   const css::uno::Reference< css::drawing::XShape>&                   xShape ) override;
 
-    // ShapeCursorEventHandler interface
-
-
     bool cursorChanged( const css::uno::Reference< css::drawing::XShape>&   xShape,
                               sal_Int16                                     nCursor );
 
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 0fb582fbc4ef..943c5400d17c 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -1932,9 +1932,6 @@ void SlideShowImpl::setShapeCursor(
         // existing entry found, update with new cursor ID
         aIter->second = nPointerShape;
     }
-
-    maEventMultiplexer.notifyShapeCursorChange(xShape,
-                                               nPointerShape);
 }
 
 bool SlideShowImpl::requestCursor( sal_Int16 nCursorShape )
diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx
index b92cd442ec18..3691425a90e4 100644
--- a/slideshow/source/inc/eventmultiplexer.hxx
+++ b/slideshow/source/inc/eventmultiplexer.hxx
@@ -124,23 +124,6 @@ public:
 
 typedef ::boost::shared_ptr< UserPaintEventHandler > UserPaintEventHandlerSharedPtr;
 
-/** Interface for handling view events.
-
-    Classes implementing this interface can be added to an
-    EventMultiplexer object, and are called from there to
-    handle view events.
-*/
-class ShapeCursorEventHandler
-{
-public:
-    virtual ~ShapeCursorEventHandler() {}
-
-    virtual bool cursorChanged( const css::uno::Reference< css::drawing::XShape>&   xShape,
-                                      sal_Int16                                nCursor ) = 0;
-};
-
-typedef ::boost::shared_ptr< ShapeCursorEventHandler > ShapeCursorEventHandlerSharedPtr;
-
 /** This class multiplexes user-activated and
     slide-show global events.
 
@@ -532,17 +515,6 @@ public:
     bool notifyShapeListenerRemoved( const css::uno::Reference<css::presentation::XShapeEventListener>& xListener,
                                      const css::uno::Reference<css::drawing::XShape>&                   xShape );
 
-    /** A new shape cursor was set
-
-        This method announces that the given cursor was set for the
-        specified shape.
-
-        @return true, if at least one handler successfully processed
-        the notification.
-     */
-    bool notifyShapeCursorChange( const css::uno::Reference<css::drawing::XShape>&  xShape,
-                                  sal_Int16                               nPointerShape );
-
     /** Notify a new user paint color
 
         Sending this notification also implies that user paint is