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

[Stephan Bergmann]

 compilerplugins/clang/unnecessaryoverride.cxx |    3 ---
 extensions/source/bibliography/datman.cxx     |    6 ------
 extensions/source/bibliography/datman.hxx     |    2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 2b88ea29a183aa049b2e4d10414f4d43649874a9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Nov 10 13:30:18 2017 +0100

    No need to blacklist this loplugin:unnecessaryoverride
    
    ...a using declaration should fix it just fine
    
    Change-Id: I05cf76672bcceb7a94afa602e215a0b5a32de82b
    Reviewed-on: https://gerrit.libreoffice.org/44591
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/compilerplugins/clang/unnecessaryoverride.cxx b/compilerplugins/clang/unnecessaryoverride.cxx
index 8e8110ef10c1..94713eb597df 100644
--- a/compilerplugins/clang/unnecessaryoverride.cxx
+++ b/compilerplugins/clang/unnecessaryoverride.cxx
@@ -258,9 +258,6 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
             return true;
         }
     }
-    // not sure what is happening here
-    if (loplugin::isSamePathname(aFileName, SRCDIR "/extensions/source/bibliography/datman.cxx"))
-        return true;
     // some very creative method hiding going on here
     if (loplugin::isSamePathname(aFileName, SRCDIR "/svx/source/dialog/checklbx.cxx"))
         return true;
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index fbff6cbe5d69..a49f854013f2 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -1394,12 +1394,6 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel(
     return xModel;
 }
 
-void SAL_CALL BibDataManager::disposing()
-{
-    BibDataManager_Base::WeakComponentImplHelperBase::disposing();
-}
-
-
 void BibDataManager::disposing( const EventObject& /*Source*/ )
 {
     // not interested in
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index 3fd40140397f..e405fd355842 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -117,7 +117,7 @@ private:
         virtual void SAL_CALL addLoadListener( const css::uno::Reference< css::form::XLoadListener >& aListener ) override;
         virtual void SAL_CALL removeLoadListener( const css::uno::Reference< css::form::XLoadListener >& aListener ) override;
 
-        virtual void SAL_CALL disposing() override;
+        using WeakComponentImplHelperBase::disposing;
 
 public: