compilerplugins/clang/unnecessaryoverride.cxx | 3 ---
sc/source/ui/vba/vbaformatcondition.cxx | 6 ------
sc/source/ui/vba/vbaformatcondition.hxx | 1 -
3 files changed, 10 deletions(-)
New commits:
commit 9fbe22e1d9b30c5c0087e84809c80b936c5c142f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 9 07:52:32 2017 +0100
No need to blacklist this loplugin:unnecessaryoverride
This now hides one of the ScVbaFormatCondition_BASE::Operator overloads, but
that doesn't get called directly at ScVbaFormatCondition anyway. (And if it
were, we could add an appropriate using declaration to
ScVbaFormatCondition.)
Change-Id: I8440b76a5745c6874f7a3bfcbb4bc4ce5618a4c4
diff --git a/compilerplugins/clang/unnecessaryoverride.cxx
b/compilerplugins/clang/unnecessaryoverride.cxx
index b71cf2003f3e..eb3dabb26f60 100644
--- a/compilerplugins/clang/unnecessaryoverride.cxx
+++ b/compilerplugins/clang/unnecessaryoverride.cxx
@@ -267,9 +267,6 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const
CXXMethodDecl* methodDecl)
// some very creative method hiding going on here
if (loplugin::isSamePathname(aFileName, SRCDIR
"/svx/source/dialog/checklbx.cxx"))
return true;
- // entertaining template magic
- if (loplugin::isSamePathname(aFileName, SRCDIR
"/sc/source/ui/vba/vbaformatcondition.cxx"))
- return true;
const CXXMethodDecl* overriddenMethodDecl =
findOverriddenOrSimilarMethodInSuperclasses(methodDecl);
if (!overriddenMethodDecl) {
diff --git a/sc/source/ui/vba/vbaformatcondition.cxx
b/sc/source/ui/vba/vbaformatcondition.cxx
index f5f3aff26e7a..55d81e888030 100644
--- a/sc/source/ui/vba/vbaformatcondition.cxx
+++ b/sc/source/ui/vba/vbaformatcondition.cxx
@@ -128,12 +128,6 @@ ScVbaFormatCondition::Type( )
return nReturnType;
}
-::sal_Int32
-ScVbaFormatCondition::Operator( bool bVal )
-{
- return ScVbaFormatCondition_BASE::Operator( bVal );
-}
-
::sal_Int32 SAL_CALL
ScVbaFormatCondition::Operator( )
{
diff --git a/sc/source/ui/vba/vbaformatcondition.hxx
b/sc/source/ui/vba/vbaformatcondition.hxx
index 8ffb1f700b96..85b102310762 100644
--- a/sc/source/ui/vba/vbaformatcondition.hxx
+++ b/sc/source/ui/vba/vbaformatcondition.hxx
@@ -56,7 +56,6 @@ public:
virtual void SAL_CALL Delete( ) override;
virtual void SAL_CALL Modify( ::sal_Int32 Type, const css::uno::Any&
Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 )
override;
virtual ::sal_Int32 SAL_CALL Type( ) override;
- virtual ::sal_Int32 Operator( bool ) override;
virtual ::sal_Int32 SAL_CALL Operator( ) override;
virtual void setFormula1( const css::uno::Any& _aFormula1) override;
virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL
Interior( ) override;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
