Mark overriding DisambiguationHelper class template mem funs as SAL_OVERRIDE

...which reveals that some uses are not derived from XEventListener, so re-
introduce BaseMutexHelper as an alternative (which originally got superseded by
DisambiguationHelper in 09b546cf9c1d0d9f78066e70a0348c7678cdcb14 "Fix
overloaded-virtual warning in canvas").

Change-Id: I1418370733b72526ec481b70fa69f03e7c28b7ce

1 files changed, 10 insertions, 11 deletions

diff --git a/include/canvas/base/disambiguationhelper.hxx b/include/canvas/base/disambiguationhelper.hxx
index 2a19db1a9053..9b07498cb754 100644
--- a/include/canvas/base/disambiguationhelper.hxx
+++ b/include/canvas/base/disambiguationhelper.hxx
@@ -44,9 +44,7 @@ namespace canvas
      */
     template< class Base > class DisambiguationHelper : public Base
     {
-    public:
-        typedef Base BaseType;
-
+    protected:
         /** Construct DisambiguationHelper
 
             This method is the whole purpose of this template:
@@ -56,23 +54,24 @@ namespace canvas
             theirs).
          */
         DisambiguationHelper() :
-            BaseType( m_aMutex )
+            Base( m_aMutex )
         {
         }
 
-        virtual void SAL_CALL disposing()
-        { disposeThis(); }
-
-        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException)
-        { disposeEventSource(Source); }
-
         virtual void disposeThis()
         {}
         virtual void disposeEventSource( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
         {}
 
-protected:
         mutable ::osl::Mutex m_aMutex;
+
+    private:
+        virtual void SAL_CALL disposing() SAL_OVERRIDE
+        { disposeThis(); }
+
+        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
+        { disposeEventSource(Source); }
+
     };
 }