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

[Stephan Bergmann]

 comphelper/source/property/propertycontainer.cxx |    7 -------
 compilerplugins/clang/unnecessaryoverride.cxx    |    3 ---
 include/comphelper/propertycontainer.hxx         |    2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 3d2dbf45ebe78faab6da09ad2efe841e21a5bdd2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Nov 10 13:25:24 2017 +0100

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

diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx
index c168ec5fa466..6768075320de 100644
--- a/comphelper/source/property/propertycontainer.cxx
+++ b/comphelper/source/property/propertycontainer.cxx
@@ -58,13 +58,6 @@ Sequence< Type > OPropertyContainer::getBaseTypes()
     return aTypes.getTypes();
 }
 
-
-void SAL_CALL OPropertyContainer::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue )
-{
-    OPropertySetHelper::setFastPropertyValue( nHandle, rValue );
-}
-
-
 sal_Bool OPropertyContainer::convertFastPropertyValue(
     Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue )
 {
diff --git a/compilerplugins/clang/unnecessaryoverride.cxx b/compilerplugins/clang/unnecessaryoverride.cxx
index 7a0431a2bf44..8e8110ef10c1 100644
--- a/compilerplugins/clang/unnecessaryoverride.cxx
+++ b/compilerplugins/clang/unnecessaryoverride.cxx
@@ -258,9 +258,6 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
             return true;
         }
     }
-    // sometimes the disambiguation happens in a base class
-    if (loplugin::isSamePathname(aFileName, SRCDIR "/comphelper/source/property/propertycontainer.cxx"))
-        return true;
     // not sure what is happening here
     if (loplugin::isSamePathname(aFileName, SRCDIR "/extensions/source/bibliography/datman.cxx"))
         return true;
diff --git a/include/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx
index 75f259238089..78d4eda7c403 100644
--- a/include/comphelper/propertycontainer.hxx
+++ b/include/comphelper/propertycontainer.hxx
@@ -72,7 +72,7 @@ protected:
                                      ) const override;
 
     // disambiguate a base class method (XFastPropertySet)
-    virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
+    using OPropertySetHelper::setFastPropertyValue;
 };