mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need to blacklist this loplugin:unnecessaryoverride

Browse Source 
...a using declaration should fix it just fine

Change-Id: I0279994c155775e9a58e93aef8da4522d4fd93fd
Reviewed-on: https://gerrit.libreoffice.org/44590
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2017-11-10 13:25:24 +01:00
parent aac0b97574
commit 3d2dbf45eb
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
comphelper/source/property/propertycontainer.cxx
View File

@ -58,13 +58,6 @@ Sequence< Type > OPropertyContainer::getBaseTypes()
return aTypes.getTypes(); return aTypes.getTypes();
} }
void SAL_CALL OPropertyContainer::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue )
{
OPropertySetHelper::setFastPropertyValue( nHandle, rValue );
}
sal_Bool OPropertyContainer::convertFastPropertyValue( sal_Bool OPropertyContainer::convertFastPropertyValue(
Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue )
{ {

3
compilerplugins/clang/unnecessaryoverride.cxx
View File

@ -258,9 +258,6 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
return true; 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 // not sure what is happening here
if (loplugin::isSamePathname(aFileName, SRCDIR "/extensions/source/bibliography/datman.cxx")) if (loplugin::isSamePathname(aFileName, SRCDIR "/extensions/source/bibliography/datman.cxx"))
return true; return true;

2
include/comphelper/propertycontainer.hxx
View File

@ -72,7 +72,7 @@ protected:
) const override; ) const override;
// disambiguate a base class method (XFastPropertySet) // disambiguate a base class method (XFastPropertySet)
virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) override; using OPropertySetHelper::setFastPropertyValue;
}; };