From 62223f9a8a4d069b34e37ad0c1bf5b73916a646e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 5 Oct 2016 09:34:05 +0200 Subject: loplugin:unnecessaryoverride Change-Id: I08c55a3023ec2e8990098eeb60e91cd18556e7ae Reviewed-on: https://gerrit.libreoffice.org/29656 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- compilerplugins/clang/unnecessaryoverride.cxx | 124 +++++++++++++-------- connectivity/source/sdbcx/VCatalog.cxx | 5 - .../source/primitive3d/sdrcubeprimitive3d.cxx | 5 - .../source/accessibility/AccessibleImageBullet.cxx | 6 - idl/inc/types.hxx | 2 - idl/source/objects/types.cxx | 6 - include/connectivity/sdbcx/VCatalog.hxx | 1 - .../primitive3d/sdrcubeprimitive3d.hxx | 3 - include/editeng/AccessibleImageBullet.hxx | 3 - include/oox/ppt/pptshape.hxx | 2 - include/test/screenshot_test.hxx | 1 - include/toolkit/awt/vclxwindows.hxx | 2 - include/vbahelper/vbashapes.hxx | 2 - include/xmloff/xmlnumfi.hxx | 1 - oox/source/ppt/pptshape.cxx | 5 - sax/qa/cppunit/parser.cxx | 6 - sax/qa/cppunit/xmlimport.cxx | 6 - svgio/qa/cppunit/SvgImportTest.cxx | 7 -- test/source/screenshot_test.cxx | 5 - toolkit/source/awt/vclxwindows.cxx | 12 -- ucb/source/ucp/cmis/cmis_repo_content.cxx | 5 - ucb/source/ucp/cmis/cmis_repo_content.hxx | 2 - vbahelper/source/vbahelper/vbashapes.cxx | 17 --- xmloff/source/style/xmlnumfi.cxx | 5 - 24 files changed, 79 insertions(+), 154 deletions(-) diff --git a/compilerplugins/clang/unnecessaryoverride.cxx b/compilerplugins/clang/unnecessaryoverride.cxx index d77b84f6037c..b031c50b7b87 100644 --- a/compilerplugins/clang/unnecessaryoverride.cxx +++ b/compilerplugins/clang/unnecessaryoverride.cxx @@ -39,6 +39,19 @@ public: return; if (fn == SRCDIR "/forms/source/component/Time.cxx") return; + if (fn == SRCDIR "/svx/source/dialog/hyperdlg.cxx") + return; + if (fn == SRCDIR "/svx/source/dialog/rubydialog.cxx") + return; + if (fn.startswith(SRCDIR "/canvas")) + return; + if (fn == SRCDIR "/sc/source/ui/view/spelldialog.cxx") + return; + if (fn == SRCDIR "/sd/source/ui/dlg/SpellDialogChildWindow.cxx") + return; + // HAVE_ODBC_ADMINISTRATION + if (fn == SRCDIR "/dbaccess/source/ui/dlg/dsselect.cxx") + return; TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } @@ -72,6 +85,10 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl) // entertaining template magic if (aFileName == SRCDIR "/sc/source/ui/vba/vbaformatcondition.cxx") return true; + // not sure what is going on here, but removing the override causes a crash + if (methodDecl->getQualifiedNameAsString() == "SwXTextDocument::queryAdapter") + return true; + const CXXMethodDecl* overriddenMethodDecl = *methodDecl->begin_overridden_methods(); @@ -80,62 +97,78 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl) { return true; } + if (methodDecl->getAccess() == AS_public && overriddenMethodDecl->getAccess() == AS_protected) + return true; + //TODO: check for identical exception specifications const CompoundStmt* compoundStmt = dyn_cast(methodDecl->getBody()); if (!compoundStmt || compoundStmt->size() != 1) return true; - auto returnStmt = dyn_cast(*compoundStmt->body_begin()); - if (returnStmt == nullptr) { - return true; - } - auto returnExpr = returnStmt->getRetValue(); - if (returnExpr == nullptr) { - return true; + + const CXXMemberCallExpr* callExpr; + if (compat::getReturnType(*methodDecl).getCanonicalType()->isVoidType()) + { + callExpr = dyn_cast(*compoundStmt->body_begin()); } - returnExpr = returnExpr->IgnoreImplicit(); - - // In something like - // - // Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( - // const rtl::OUString& sql) - // throw(SQLException, RuntimeException, std::exception) - // { - // return OCommonStatement::executeQuery( sql ); - // } - // - // look down through all the - // - // ReturnStmt - // `-ExprWithCleanups - // `-CXXConstructExpr - // `-MaterializeTemporaryExpr - // `-ImplicitCastExpr - // `-CXXBindTemporaryExpr - // `-CXXMemberCallExpr - // - // where the fact that the overriding and overridden function have identical - // return types makes us confident that all we need to check here is whether - // there's an (arbitrary, one-argument) CXXConstructorExpr and - // CXXBindTemporaryExpr in between: - if (auto ctorExpr = dyn_cast(returnExpr)) { - if (ctorExpr->getNumArgs() == 1) { - if (auto tempExpr = dyn_cast( - ctorExpr->getArg(0)->IgnoreImplicit())) - { - returnExpr = tempExpr->getSubExpr(); + else + { + auto returnStmt = dyn_cast(*compoundStmt->body_begin()); + if (returnStmt == nullptr) { + return true; + } + auto returnExpr = returnStmt->getRetValue(); + if (returnExpr == nullptr) { + return true; + } + returnExpr = returnExpr->IgnoreImplicit(); + + // In something like + // + // Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( + // const rtl::OUString& sql) + // throw(SQLException, RuntimeException, std::exception) + // { + // return OCommonStatement::executeQuery( sql ); + // } + // + // look down through all the + // + // ReturnStmt + // `-ExprWithCleanups + // `-CXXConstructExpr + // `-MaterializeTemporaryExpr + // `-ImplicitCastExpr + // `-CXXBindTemporaryExpr + // `-CXXMemberCallExpr + // + // where the fact that the overriding and overridden function have identical + // return types makes us confident that all we need to check here is whether + // there's an (arbitrary, one-argument) CXXConstructorExpr and + // CXXBindTemporaryExpr in between: + if (auto ctorExpr = dyn_cast(returnExpr)) { + if (ctorExpr->getNumArgs() == 1) { + auto tempExpr1 = ctorExpr->getArg(0)->IgnoreImplicit(); + if (auto tempExpr2 = dyn_cast(tempExpr1)) + { + returnExpr = tempExpr2->getSubExpr(); + } + else if (auto tempExpr2 = dyn_cast(tempExpr1)) + { + returnExpr = tempExpr2; + } } } + + callExpr = dyn_cast(returnExpr->IgnoreParenImpCasts()); } - const CXXMemberCallExpr* callExpr = dyn_cast( - returnExpr->IgnoreParenImpCasts()); if (!callExpr || callExpr->getMethodDecl() != overriddenMethodDecl) return true; - const ImplicitCastExpr* expr1 = dyn_cast_or_null(callExpr->getImplicitObjectArgument()); + const Expr* expr1 = callExpr->getImplicitObjectArgument()->IgnoreImpCasts(); if (!expr1) return true; - const CXXThisExpr* expr2 = dyn_cast_or_null(expr1->getSubExpr()); + const CXXThisExpr* expr2 = dyn_cast_or_null(expr1); if (!expr2) return true; for (unsigned i = 0; igetNumArgs(); ++i) { @@ -146,9 +179,10 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl) } report( - DiagnosticsEngine::Warning, "%0 virtual function just calls %1 parent", - methodDecl->getSourceRange().getBegin()) - << methodDecl->getAccess() << overriddenMethodDecl->getAccess() + DiagnosticsEngine::Warning, "%0 virtual function just calls %1 parent", + methodDecl->getSourceRange().getBegin()) + << methodDecl->getAccess() + << overriddenMethodDecl->getAccess() << methodDecl->getSourceRange(); if (methodDecl->getCanonicalDecl()->getLocation() != methodDecl->getLocation()) { const CXXMethodDecl* pOther = methodDecl->getCanonicalDecl(); diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx index 87ec5f13c672..c05a50a09a72 100644 --- a/connectivity/source/sdbcx/VCatalog.cxx +++ b/connectivity/source/sdbcx/VCatalog.cxx @@ -61,11 +61,6 @@ OCatalog::~OCatalog() delete m_pUsers; } -void SAL_CALL OCatalog::acquire() throw() -{ - OCatalog_BASE::acquire(); -} - void SAL_CALL OCatalog::release() throw() { release_ChildImpl(); diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx index 474cae57e507..4de490ac1e89 100644 --- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx @@ -183,11 +183,6 @@ namespace drawinglayer { } - bool SdrCubePrimitive3D::operator==(const BasePrimitive3D& rPrimitive) const - { - return SdrPrimitive3D::operator==(rPrimitive); - } - basegfx::B3DRange SdrCubePrimitive3D::getB3DRange(const geometry::ViewInformation3D& /*rViewInformation*/) const { // use default from sdrPrimitive3D which uses transformation expanded by line width/2. diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 709a6cd9e5a2..f595104963d7 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -99,12 +99,6 @@ namespace accessibility } } - uno::Any SAL_CALL AccessibleImageBullet::queryInterface (const uno::Type & rType) throw (uno::RuntimeException, std::exception) - { - - return AccessibleImageBulletInterfaceBase::queryInterface(rType); - } - uno::Reference< XAccessibleContext > SAL_CALL AccessibleImageBullet::getAccessibleContext( ) throw (uno::RuntimeException, std::exception) { diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index fb051699339a..9768f8f284e8 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -31,8 +31,6 @@ typedef SvRefMemberList< SvMetaSlot* > SvSlotElementList; class SvMetaAttribute : public SvMetaReference { public: - virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase, - SvTokenStream & rInStm ) override; tools::SvRef aType; SvIdentifier aSlotId; SvMetaAttribute(); diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index ca5bb4d01844..6a38caa8b032 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -97,12 +97,6 @@ bool SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase, return bOk; } -void SvMetaAttribute::ReadAttributesSvIdl( SvIdlDataBase & rBase, - SvTokenStream & rInStm ) -{ - SvMetaReference::ReadAttributesSvIdl( rBase, rInStm ); -} - sal_uLong SvMetaAttribute::MakeSfx( OStringBuffer& rAttrArray ) { SvMetaType * pType = GetType(); diff --git a/include/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx index f7eee9ea6a26..36b25ae65b16 100644 --- a/include/connectivity/sdbcx/VCatalog.hxx +++ b/include/connectivity/sdbcx/VCatalog.hxx @@ -105,7 +105,6 @@ namespace connectivity // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; // XInterface - void SAL_CALL acquire() throw() override; void SAL_CALL release() throw() override; // XTablesSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx index 4b54b42879a9..3d4ee0be1808 100644 --- a/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx @@ -49,9 +49,6 @@ namespace drawinglayer const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute); - /// compare operator - virtual bool operator==(const BasePrimitive3D& rPrimitive) const override; - /// get range virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const override; diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx index 997a4ccb09e4..1b33069ebf9c 100644 --- a/include/editeng/AccessibleImageBullet.hxx +++ b/include/editeng/AccessibleImageBullet.hxx @@ -53,9 +53,6 @@ namespace accessibility virtual ~AccessibleImageBullet () override; - // XInterface - virtual css::uno::Any SAL_CALL queryInterface (const css::uno::Type & rType) throw (css::uno::RuntimeException, std::exception) override; - // XAccessible virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx index 5256a6679464..ffd1cf9fda48 100644 --- a/include/oox/ppt/pptshape.hxx +++ b/include/oox/ppt/pptshape.hxx @@ -67,8 +67,6 @@ public: basegfx::B2DHomMatrix& aTransformation, ::oox::drawingml::ShapeIdMap* pShapeMap = nullptr ); - virtual void applyShapeReference( const oox::drawingml::Shape& rReferencedShape, bool bUseText = true ) override; - ShapeLocation getShapeLocation() const { return meShapeLocation; }; void setReferenced( bool bReferenced ){ mbReferenced = bReferenced; }; void setPlaceholder( oox::drawingml::ShapePtr pPlaceholder ) { mpPlaceholder = pPlaceholder; } diff --git a/include/test/screenshot_test.hxx b/include/test/screenshot_test.hxx index 6e6ce4a9fd5f..ab6adedc1f7c 100644 --- a/include/test/screenshot_test.hxx +++ b/include/test/screenshot_test.hxx @@ -49,7 +49,6 @@ public: virtual ~ScreenshotTest() override; virtual void setUp() override; - virtual void tearDown() override; /// Dialog creation for known dialogs by Name (path and UIXMLDescription, *.ui file). /// This uses maKnownDialogs to check if known, and if so, calls createDialogByID diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index 62a8bc2afd05..996a0baaefc2 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -378,7 +378,6 @@ public: virtual ~VCLXFrame() override; // css::uno::XInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } @@ -452,7 +451,6 @@ public: virtual ~VCLXTabPage() override; // css::uno::XInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } void SAL_CALL release() throw() override { OWeakObject::release(); } diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx index 7f48993fd3a3..5699cb73c19d 100644 --- a/include/vbahelper/vbashapes.hxx +++ b/include/vbahelper/vbashapes.hxx @@ -88,8 +88,6 @@ public: virtual css::uno::Reference< ov::msforms::XShapeRange > SAL_CALL Range( const css::uno::Any& shapes ) throw (css::uno::RuntimeException, std::exception) override; // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) throw (css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2) - throw (css::lang::IndexOutOfBoundsException, css::script::BasicErrorException, css::uno::RuntimeException) override; }; #endif // INCLUDED_VBAHELPER_VBASHAPES_HXX diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx index 10283e64c117..0c9defc22865 100644 --- a/include/xmloff/xmlnumfi.hxx +++ b/include/xmloff/xmlnumfi.hxx @@ -174,7 +174,6 @@ public: const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void CreateAndInsert(bool bOverwrite) override; - virtual void Finish(bool bOverwrite) override; SvXMLNumImpData* GetData() const { return pData; } sal_Int32 GetKey(); diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index 71f6428ff596..9a673b73a8b5 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -376,11 +376,6 @@ void PPTShape::addShape( } } -void PPTShape::applyShapeReference( const oox::drawingml::Shape& rReferencedShape, bool bUseText ) -{ - Shape::applyShapeReference( rReferencedShape, bUseText ); -} - namespace { bool ShapeLocationIsMaster(oox::drawingml::Shape *pInShape) diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx index 287b712686d3..03b2499b5c4f 100644 --- a/sax/qa/cppunit/parser.cxx +++ b/sax/qa/cppunit/parser.cxx @@ -50,7 +50,6 @@ class ParserTest: public test::BootstrapFixture public: virtual void setUp() override; - virtual void tearDown() override; void parse(); @@ -70,11 +69,6 @@ void ParserTest::setUp() mxParser->setTokenHandler( mxTokenHandler.get() ); } -void ParserTest::tearDown() -{ - test::BootstrapFixture::tearDown(); -} - uno::Reference< io::XInputStream > ParserTest::createStream(const OString& sInput) { uno::Reference< io::XOutputStream > xPipe( io::Pipe::create(m_xContext) ); diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx index 915f26ee4e1d..f824e51db5c5 100644 --- a/sax/qa/cppunit/xmlimport.cxx +++ b/sax/qa/cppunit/xmlimport.cxx @@ -343,7 +343,6 @@ private: public: virtual void setUp() override; - virtual void tearDown() override; XMLImportTest() : BootstrapFixture(true, false) {} void parse(); @@ -390,11 +389,6 @@ void XMLImportTest::setUp() m_sDirPath = m_directories.getPathFromSrc( "/sax/qa/data/" ); } -void XMLImportTest::tearDown() -{ - test::BootstrapFixture::tearDown(); -} - void XMLImportTest::parse() { OUString fileNames[] = {"simple.xml", "defaultns.xml", "inlinens.xml", diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx index 01391b81465d..9a612f427114 100644 --- a/svgio/qa/cppunit/SvgImportTest.cxx +++ b/svgio/qa/cppunit/SvgImportTest.cxx @@ -66,8 +66,6 @@ class Test : public test::BootstrapFixture, public XmlTestTools Primitive2DSequence parseSvg(const char* aSource); public: - virtual void tearDown() override; - CPPUNIT_TEST_SUITE(Test); CPPUNIT_TEST(testStyles); CPPUNIT_TEST(testTdf87309); @@ -115,11 +113,6 @@ Primitive2DSequence Test::parseSvg(const char* aSource) return xSvgParser->getDecomposition(aInputStream, aPath); } -void Test::tearDown() -{ - BootstrapFixture::tearDown(); -} - void Test::checkRectPrimitive(Primitive2DSequence& rPrimitive) { Primitive2dXmlDump dumper; diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx index be65c0f66faf..6c22d9fa56c9 100644 --- a/test/source/screenshot_test.cxx +++ b/test/source/screenshot_test.cxx @@ -59,11 +59,6 @@ void ScreenshotTest::setUp() } } -void ScreenshotTest::tearDown() -{ - test::BootstrapFixture::tearDown(); -} - void ScreenshotTest::implSaveScreenshot(const Bitmap& rScreenshot, const OString& rScreenshotId) { OUString aDirname, aBasename; diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index d3b655616d6f..f59e197ec3fd 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2727,12 +2727,6 @@ VCLXTabPage::~VCLXTabPage() { } -css::uno::Any SAL_CALL VCLXTabPage::queryInterface(const css::uno::Type & rType ) -throw(css::uno::RuntimeException, std::exception) -{ - return VCLXContainer::queryInterface( rType ); -} - // css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXTabPage ) VCLXContainer::getTypes() @@ -6537,12 +6531,6 @@ VCLXFrame::~VCLXFrame() { } -css::uno::Any SAL_CALL VCLXFrame::queryInterface(const css::uno::Type & rType ) -throw(css::uno::RuntimeException, std::exception) -{ - return VCLXContainer::queryInterface( rType ); -} - // css::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXFrame ) VCLXContainer::getTypes() diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index e76105815a9f..b0726898cae7 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -320,11 +320,6 @@ namespace cmis XTYPEPROVIDER_COMMON_IMPL( RepoContent ); - uno::Any SAL_CALL RepoContent::queryInterface( const uno::Type & rType ) throw ( uno::RuntimeException, std::exception ) - { - return ContentImplHelper::queryInterface(rType); - } - OUString SAL_CALL RepoContent::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.CmisRepoContent"); diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx index 82200e96b876..adb2ad624a3b 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.hxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx @@ -89,8 +89,6 @@ public: virtual OUString getParentURL() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx index 91f9b37ae13d..bb5c620f8742 100644 --- a/vbahelper/source/vbahelper/vbashapes.cxx +++ b/vbahelper/source/vbahelper/vbashapes.cxx @@ -173,23 +173,6 @@ ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index ) throw (uno::Runti return xIndexAccess; } -uno::Any SAL_CALL -ScVbaShapes::Item(const uno::Any& Index, const uno::Any& Index2) - throw (lang::IndexOutOfBoundsException, script::BasicErrorException, uno::RuntimeException) -{ - // I don't think we need to support Array of indices for shapes -/* - if ( Index.getValueTypeClass() == uno::TypeClass_SEQUENCE ) - { - uno::Reference< container::XIndexAccess > xIndexAccess( getShapesByArrayIndices( Index ) ); - // return new collection instance - uno::Reference< XCollection > xShapesCollection( new ScVbaShapes( this->getParent(), mxContext, xIndexAccess ) ); - return uno::makeAny( xShapesCollection ); - } -*/ - return ScVbaShapes_BASE::Item( Index, Index2 ); -} - uno::Reference< msforms::XShapeRange > SAL_CALL ScVbaShapes::Range( const uno::Any& shapes ) throw (css::uno::RuntimeException, std::exception) { diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 7d1db52a5eb0..ccd8158ead14 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -1829,11 +1829,6 @@ sal_Int32 SvXMLNumFormatContext::CreateAndInsert(SvNumberFormatter* pFormatter) return nKey; } -void SvXMLNumFormatContext::Finish( bool bOverwrite ) -{ - SvXMLStyleContext::Finish( bOverwrite ); -} - const LocaleDataWrapper& SvXMLNumFormatContext::GetLocaleData() const { return pData->GetLocaleData( nFormatLang ); -- cgit