diff options
| author | Noel Grandin <noel@peralex.com> | 2016-07-12 08:21:27 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-07-15 14:05:41 +0000 |
| commit | 6e72f0251bb8767942edf74f612547c12ca0cdf1 (patch) | |
| tree | 0785de1a2f8995d1d4ede7889541bda9b59f893f | |
| parent | 7da80de2c75e048a08ea6e923a9f433a638a9f12 (diff) | |
new loplugin unnecessary override
Change-Id: I88d3e33823d68745b98625050a8a274f9ef04bcb
Reviewed-on: https://gerrit.libreoffice.org/27135
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
279 files changed, 178 insertions, 1629 deletions
diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx index 1943f1e2ce21..8936202b94fe 100644 --- a/accessibility/inc/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/standard/vclxaccessiblebox.hxx @@ -112,13 +112,6 @@ public: throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - // XComponent - - /** This method is called from the implementation helper during an - XComponent::dispose() call. - */ - virtual void SAL_CALL disposing() override; - // XAccessibleValue virtual css::uno::Any SAL_CALL getCurrentValue( ) diff --git a/accessibility/inc/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/standard/vclxaccessiblecombobox.hxx index 4fd6bf829055..0aaf6e67df5a 100644 --- a/accessibility/inc/standard/vclxaccessiblecombobox.hxx +++ b/accessibility/inc/standard/vclxaccessiblecombobox.hxx @@ -49,7 +49,6 @@ protected: virtual ~VCLXAccessibleComboBox(); virtual bool IsValid() const override; - virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLECOMBOBOX_HXX diff --git a/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx index f18945d3bdc3..1d5a311244e7 100644 --- a/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx +++ b/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx @@ -47,7 +47,6 @@ protected: virtual ~VCLXAccessibleDropDownListBox(); virtual bool IsValid() const override; - virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override; }; diff --git a/accessibility/inc/standard/vclxaccessiblelistbox.hxx b/accessibility/inc/standard/vclxaccessiblelistbox.hxx index 22d24eec687f..caf3dbbcf57b 100644 --- a/accessibility/inc/standard/vclxaccessiblelistbox.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistbox.hxx @@ -48,7 +48,6 @@ protected: virtual ~VCLXAccessibleListBox(); virtual bool IsValid() const override; - virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLELISTBOX_HXX diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx index 3d21be9f2e4a..1fa807490752 100644 --- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx @@ -106,8 +106,6 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire( ) throw() override; - virtual void SAL_CALL release( ) throw() override; // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index bee3e6d5ccad..ddc12ec2e4ca 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -449,13 +449,6 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleBox::getAccessibleActionKeyBind return xRet; } -//===== XComponent ========================================================== - -void SAL_CALL VCLXAccessibleBox::disposing() -{ - VCLXAccessibleComponent::disposing(); -} - // ===== XAccessibleValue =============================================== Any VCLXAccessibleBox::getCurrentValue( ) throw( RuntimeException, std::exception ) diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx index 3ff31db6c0c6..1e4288e6815e 100644 --- a/accessibility/source/standard/vclxaccessiblecombobox.cxx +++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx @@ -46,12 +46,6 @@ bool VCLXAccessibleComboBox::IsValid() const return GetWindow().get() != nullptr; } -void VCLXAccessibleComboBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) -{ - VCLXAccessibleBox::ProcessWindowEvent( rVclWindowEvent ); -} - - // XServiceInfo OUString VCLXAccessibleComboBox::getImplementationName() diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx index 8e54c51f11d6..67358b1b14eb 100644 --- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx @@ -59,11 +59,6 @@ bool VCLXAccessibleDropDownListBox::IsValid() const return GetWindow().get() != nullptr; } -void VCLXAccessibleDropDownListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) -{ - VCLXAccessibleBox::ProcessWindowEvent (rVclWindowEvent); -} - // XServiceInfo diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx index 5c9c34e1a1c3..446b140ab981 100644 --- a/accessibility/source/standard/vclxaccessiblelistbox.cxx +++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx @@ -57,11 +57,6 @@ bool VCLXAccessibleListBox::IsValid() const return GetWindow().get() != nullptr; } -void VCLXAccessibleListBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) -{ - VCLXAccessibleBox::ProcessWindowEvent( rVclWindowEvent ); -} - // XServiceInfo OUString VCLXAccessibleListBox::getImplementationName() diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index c950953babe1..1cc7b37dbcd4 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -151,16 +151,6 @@ Any SAL_CALL VCLXAccessibleListItem::queryInterface( Type const & rType ) throw return VCLXAccessibleListItem_BASE::queryInterface( rType ); } -void SAL_CALL VCLXAccessibleListItem::acquire() throw () -{ - VCLXAccessibleListItem_BASE::acquire(); -} - -void SAL_CALL VCLXAccessibleListItem::release() throw () -{ - VCLXAccessibleListItem_BASE::release(); -} - // XTypeProvider Sequence< Type > SAL_CALL VCLXAccessibleListItem::getTypes( ) throw (RuntimeException, std::exception) diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 73e5559e694b..f24951371df6 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -366,12 +366,6 @@ void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /* } } -// lang::XComponent::dispose() -void SAL_CALL AccessibleChartView::disposing() -{ - AccessibleBase::disposing(); -} - // XEventListener void SAL_CALL AccessibleChartView::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index 7e2e942bebe6..203296e85221 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -63,7 +63,7 @@ public: AccessibleChartView() = delete; // ____ WeakComponentHelper (called from XComponent::dispose()) ____ - virtual void SAL_CALL disposing() override; + using AccessibleBase::disposing; // ____ lang::XInitialization ____ // 0: view::XSelectionSupplier offers notifications for selection changes and access to the selection itself diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 4ae7d1ba34be..41b0f8993147 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -79,11 +79,6 @@ DrawCommandDispatch::~DrawCommandDispatch() { } -void DrawCommandDispatch::initialize() -{ - FeatureCommandDispatchBase::initialize(); -} - bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL ) { sal_uInt16 nFeatureId = 0; diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx index a6ce34cc6fd7..dd1c379e2abb 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hxx +++ b/chart2/source/controller/main/DrawCommandDispatch.hxx @@ -37,9 +37,6 @@ public: DrawCommandDispatch( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ChartController* pController ); virtual ~DrawCommandDispatch(); - // late initialisation, especially for adding as listener - virtual void initialize() override; - virtual bool isFeatureSupported( const OUString& rCommandURL ) override; void setAttributes( SdrObject* pObj ); diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 310950a93778..d7ed6b72b0bf 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -293,10 +293,6 @@ void SAL_CALL ElementSelectorToolbarController::release() throw () { ToolboxController::release(); } -void SAL_CALL ElementSelectorToolbarController::initialize( const Sequence< Any >& rArguments ) throw (Exception, RuntimeException, std::exception) -{ - ToolboxController::initialize(rArguments); -} void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException, std::exception ) { if( m_apSelectorListBox.get() ) diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index a5e51cd3586e..6826b22c7d05 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -88,8 +88,6 @@ public: virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; - // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // XStatusListener virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XToolbarController diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 6e71b3066dea..24b1717963ca 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -64,11 +64,6 @@ ShapeController::~ShapeController() { } -void ShapeController::initialize() -{ - FeatureCommandDispatchBase::initialize(); -} - // WeakComponentImplHelperBase void ShapeController::disposing() { diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index 139f499159c3..73b7db1172b0 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -40,9 +40,6 @@ public: ShapeController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ChartController* pController ); virtual ~ShapeController(); - // late initialisation, especially for adding as listener - virtual void initialize() override; - protected: // WeakComponentImplHelperBase virtual void SAL_CALL disposing() override; diff --git a/compilerplugins/clang/unnecessaryoverride.cxx b/compilerplugins/clang/unnecessaryoverride.cxx new file mode 100644 index 000000000000..8a882af9c362 --- /dev/null +++ b/compilerplugins/clang/unnecessaryoverride.cxx @@ -0,0 +1,114 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <cassert> +#include <string> +#include <iostream> +#include <fstream> +#include <set> +#include "plugin.hxx" + +/** +look for methods where all they do is call their superclass method +*/ + +namespace { + +class UnnecessaryOverride: + public RecursiveASTVisitor<UnnecessaryOverride>, public loplugin::Plugin +{ +public: + explicit UnnecessaryOverride(InstantiationData const & data): Plugin(data) {} + + virtual void run() override + { + // ignore some files with problematic macros + StringRef fn( compiler.getSourceManager().getFileEntryForID( + compiler.getSourceManager().getMainFileID())->getName() ); + if (fn == SRCDIR "/sd/source/ui/framework/factories/ChildWindowPane.cxx") + return; + if (fn == SRCDIR "/forms/source/component/Date.cxx") + return; + if (fn == SRCDIR "/forms/source/component/Time.cxx") + return; + + TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); + } + + bool VisitCXXMethodDecl(const CXXMethodDecl *); +}; + +bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl) +{ + if (ignoreLocation(methodDecl->getCanonicalDecl()) || !methodDecl->doesThisDeclarationHaveABody()) { + return true; + } + // if we are overriding more than one method, then this is a disambiguating override + if (!methodDecl->isVirtual() || methodDecl->size_overridden_methods() != 1 + || (*methodDecl->begin_overridden_methods())->isPure()) { + return true; + } + if (dyn_cast<CXXDestructorDecl>(methodDecl)) { + return true; + } + // sometimes the disambiguation happens in a base class + StringRef aFileName = compiler.getSourceManager().getFilename(compiler.getSourceManager().getSpellingLoc(methodDecl->getLocStart())); + if (aFileName == SRCDIR "/comphelper/source/property/propertycontainer.cxx") + return true; + // not sure what is happening here + if (aFileName == SRCDIR "/extensions/source/bibliography/datman.cxx") + return true; + + const CXXMethodDecl* overriddenMethodDecl = *methodDecl->begin_overridden_methods(); + + const CompoundStmt* compoundStmt = dyn_cast<CompoundStmt>(methodDecl->getBody()); + if (!compoundStmt || compoundStmt->size() != 1) + return true; + const Stmt* firstStmt = compoundStmt->body_front(); + if (const ReturnStmt* returnStmt = dyn_cast<ReturnStmt>(firstStmt)) { + firstStmt = returnStmt->getRetValue(); + } + if (!firstStmt) + return true; + const CXXMemberCallExpr* callExpr = dyn_cast<CXXMemberCallExpr>(firstStmt); + if (!callExpr || callExpr->getMethodDecl() != overriddenMethodDecl) + return true; + const ImplicitCastExpr* expr1 = dyn_cast_or_null<ImplicitCastExpr>(callExpr->getImplicitObjectArgument()); + if (!expr1) + return true; + const CXXThisExpr* expr2 = dyn_cast_or_null<CXXThisExpr>(expr1->getSubExpr()); + if (!expr2) + return true; + for (unsigned i = 0; i<callExpr->getNumArgs(); ++i) { + const DeclRefExpr * declRefExpr = dyn_cast<DeclRefExpr>(callExpr->getArg(i)); + if (!declRefExpr || declRefExpr->getDecl() != methodDecl->getParamDecl(i)) + return true; + } + + report( + DiagnosticsEngine::Warning, "method just calls parent method", + methodDecl->getSourceRange().getBegin()) + << methodDecl->getSourceRange(); + if (methodDecl->getCanonicalDecl()->getLocation() != methodDecl->getLocation()) { + const CXXMethodDecl* pOther = methodDecl->getCanonicalDecl(); + report( + DiagnosticsEngine::Note, + "method declaration here", + pOther->getLocStart()) + << pOther->getSourceRange(); + } + return true; +} + + +loplugin::Plugin::Registration< UnnecessaryOverride > X("unnecessaryoverride", true); + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index 6359f904b28b..28e7b1e2ae74 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -567,16 +567,6 @@ OUString SAL_CALL OTableHelper::getName() throw(RuntimeException, std::exception return sComposedName; } -void SAL_CALL OTableHelper::acquire() throw() -{ - OTable_TYPEDEF::acquire(); -} - -void SAL_CALL OTableHelper::release() throw() -{ - OTable_TYPEDEF::release(); -} - std::shared_ptr<sdbcx::KeyProperties> OTableHelper::getKeyProperties(const OUString& _sName) const { std::shared_ptr<sdbcx::KeyProperties> pKeyProps; diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index cb8d8a0831f5..f384a89b1da7 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -632,15 +632,4 @@ bool ODbaseIndex::CreateImpl() } -void SAL_CALL ODbaseIndex::acquire() throw() -{ - ODbaseIndex_BASE::acquire(); -} - -void SAL_CALL ODbaseIndex::release() throw() -{ - ODbaseIndex_BASE::release(); -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx index 2720c1fdf2a8..88ffe4fe7e84 100644 --- a/connectivity/source/drivers/file/FTable.cxx +++ b/connectivity/source/drivers/file/FTable.cxx @@ -165,16 +165,6 @@ void OFileTable::FileClose() } } -void SAL_CALL OFileTable::acquire() throw() -{ - OTable_TYPEDEF::acquire(); -} - -void SAL_CALL OFileTable::release() throw() -{ - OTable_TYPEDEF::release(); -} - bool OFileTable::InsertRow(OValueRefVector& /*rRow*/, const css::uno::Reference< css::container::XIndexAccess>& /*_xCols*/) { return false; diff --git a/connectivity/source/drivers/firebird/Statement.cxx b/connectivity/source/drivers/firebird/Statement.cxx index 4144ab3bc039..29c195cd67b4 100644 --- a/connectivity/source/drivers/firebird/Statement.cxx +++ b/connectivity/source/drivers/firebird/Statement.cxx @@ -182,11 +182,6 @@ uno::Sequence< Type > SAL_CALL OStatement::getTypes() OStatementCommonBase::getTypes()); } -void SAL_CALL OStatement::close() throw(SQLException, RuntimeException, std::exception) -{ - OStatementCommonBase::close(); -} - void SAL_CALL OStatement::disposing() { disposeResultSet(); diff --git a/connectivity/source/drivers/firebird/Statement.hxx b/connectivity/source/drivers/firebird/Statement.hxx index d08566579163..ade5a8de5d3a 100644 --- a/connectivity/source/drivers/firebird/Statement.hxx +++ b/connectivity/source/drivers/firebird/Statement.hxx @@ -83,10 +83,6 @@ namespace connectivity virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; - // XCloseable - virtual void SAL_CALL close() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; // OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx b/connectivity/source/drivers/postgresql/pq_xtables.cxx index 9ec5c02a0598..ce3a17ec2d5c 100644 --- a/connectivity/source/drivers/postgresql/pq_xtables.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx @@ -375,11 +375,6 @@ Reference< css::container::XNameAccess > Tables::create( return ret; } -void Tables::disposing() -{ - Container::disposing(); -} - }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/postgresql/pq_xtables.hxx b/connectivity/source/drivers/postgresql/pq_xtables.hxx index 17bb5fac374a..9e542abe0f6a 100644 --- a/connectivity/source/drivers/postgresql/pq_xtables.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtables.hxx @@ -85,8 +85,7 @@ public: // XDataDescriptorFactory throw (css::uno::RuntimeException, std::exception) override; protected: - virtual void SAL_CALL disposing() override; - + using Container::disposing; }; } diff --git a/connectivity/source/drivers/postgresql/pq_xviews.cxx b/connectivity/source/drivers/postgresql/pq_xviews.cxx index 2e97f17afd5d..0e471bcc989c 100644 --- a/connectivity/source/drivers/postgresql/pq_xviews.cxx +++ b/connectivity/source/drivers/postgresql/pq_xviews.cxx @@ -230,12 +230,6 @@ Reference< css::container::XNameAccess > Views::create( return ret; } -void Views::disposing() -{ - Container::disposing(); -} - - }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/postgresql/pq_xviews.hxx b/connectivity/source/drivers/postgresql/pq_xviews.hxx index 751f2018d8f2..d4263203e802 100644 --- a/connectivity/source/drivers/postgresql/pq_xviews.hxx +++ b/connectivity/source/drivers/postgresql/pq_xviews.hxx @@ -85,8 +85,7 @@ public: // XDataDescriptorFactory throw (css::uno::RuntimeException, std::exception) override; protected: - virtual void SAL_CALL disposing() override; - + using Container::disposing; }; } diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx index b7f40ffcbc05..5396e6475d48 100644 --- a/connectivity/source/inc/dbase/DIndex.hxx +++ b/connectivity/source/inc/dbase/DIndex.hxx @@ -100,9 +100,6 @@ namespace connectivity virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); - virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() override; - const ODbaseTable* getTable() const { return m_pTable; } const NDXHeader& getHeader() const { return m_aHeader; } OIndexIterator* createIterator(); diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx index d74ff25640be..3c460ff91710 100644 --- a/connectivity/source/inc/file/FTable.hxx +++ b/connectivity/source/inc/file/FTable.hxx @@ -65,8 +65,6 @@ namespace connectivity //XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() override; // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/cppcanvas/CppunitTest_cppcanvas_test.mk b/cppcanvas/CppunitTest_cppcanvas_test.mk index 2e3784263b2e..ffb22675e36f 100644 --- a/cppcanvas/CppunitTest_cppcanvas_test.mk +++ b/cppcanvas/CppunitTest_cppcanvas_test.mk @@ -29,6 +29,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppcanvas_test, \ svt \ test \ tl \ + unotest \ vcl \ $(gb_UWINAPI) \ )) diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index a16aec2a535d..7e117bb43743 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -97,22 +97,10 @@ sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } -void SvxHyperURLBox::Select() -{ - SvtURLBox::Select(); -} void SvxHyperURLBox::Modify() { SvtURLBox::Modify(); } -bool SvxHyperURLBox::Notify( NotifyEvent& rNEvt ) -{ - return SvtURLBox::Notify( rNEvt ); -} -bool SvxHyperURLBox::PreNotify( NotifyEvent& rNEvt ) -{ - return SvtURLBox::PreNotify( rNEvt ); -} //# Hyperlink-Dialog: Tabpages-Baseclass # @@ -156,16 +144,6 @@ void SvxHyperlinkTabPageBase::dispose() IconChoicePage::dispose(); } -void SvxHyperlinkTabPageBase::ActivatePage() -{ - TabPage::ActivatePage(); -} - -void SvxHyperlinkTabPageBase::DeactivatePage() -{ - TabPage::DeactivatePage(); -} - bool SvxHyperlinkTabPageBase::QueryClose() { return !mbIsCloseDisabled; diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index 1a9a932494ac..f869cd3f2fe6 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -153,12 +153,6 @@ PasswordToOpenModifyDialog::~PasswordToOpenModifyDialog() disposeOnce(); } -void PasswordToOpenModifyDialog::dispose() -{ - SfxModalDialog::dispose(); -} - - OUString PasswordToOpenModifyDialog::GetPasswordToOpen() const { const bool bPasswdOk = diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 942f97f4e9f2..9ccd26809688 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -53,10 +53,7 @@ protected: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; - virtual void Select() override; virtual void Modify() override; - virtual bool PreNotify( NotifyEvent& rNEvt ) override; public: SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart = INetProtocol::File ); @@ -136,8 +133,8 @@ public: Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); } bool MoveToExtraWnd ( Point aNewPos, bool bDisConnectDlg = false ); - virtual void ActivatePage() override; - virtual void DeactivatePage() override; + using TabPage::ActivatePage; + using TabPage::DeactivatePage; virtual bool QueryClose() override; protected: diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index b592f7f54042..4c2b1d5fbca7 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -62,9 +62,6 @@ struct IconChoicePageData class IconChoicePage : public TabPage { - using TabPage::ActivatePage; - using TabPage::DeactivatePage; - private: const SfxItemSet* pSet; OUString aUserString; @@ -74,6 +71,9 @@ private: void ImplInitSettings(); protected: + using TabPage::ActivatePage; + using TabPage::DeactivatePage; + IconChoicePage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet ); public: diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 87363297f0fe..d35d9f3dc11f 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -39,7 +39,6 @@ public: sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */, bool bIsPasswordToModify ); virtual ~PasswordToOpenModifyDialog(); - virtual void dispose() override; // AbstractPasswordToOpenModifyDialog OUString GetPasswordToOpen() const; diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx index e93dc7b0b2a8..b9af0af621a0 100644 --- a/cui/source/inc/radiobtnbox.hxx +++ b/cui/source/inc/radiobtnbox.hxx @@ -33,7 +33,6 @@ private: Point m_aCurMousePoint; protected: - virtual void SetTabs() override; virtual void MouseButtonUp( const MouseEvent& _rMEvt ) override; virtual void KeyInput( const KeyEvent& rKEvt ) override; diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx index 02a5c043d92b..4e304a96a932 100644 --- a/cui/source/options/radiobtnbox.cxx +++ b/cui/source/options/radiobtnbox.cxx @@ -33,11 +33,6 @@ SvxRadioButtonListBox::SvxRadioButtonListBox(SvSimpleTableContainer& rParent, Wi EnableCheckButton( new SvLBoxButtonData( this, true ) ); } -void SvxRadioButtonListBox::SetTabs() -{ - SvSimpleTable::SetTabs(); -} - void SvxRadioButtonListBox::MouseButtonUp( const MouseEvent& _rMEvt ) { m_aCurMousePoint = _rMEvt.GetPosPixel(); diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index 3b21c42e9bb2..f98103a566ed 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -139,7 +139,7 @@ public: virtual css::uno::Reference< css::beans::XPropertySet > createColumnDescriptor() override; virtual void columnAppended( const css::uno::Reference< css::beans::XPropertySet >& _rxSourceDescriptor ) override; virtual void columnDropped(const OUString& _sName) override; - virtual void notifyDataSourceModified() override { OContentHelper::notifyDataSourceModified(); } + using OContentHelper::notifyDataSourceModified; protected: // OPropertyArrayUsageHelper diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx index f460adc9fbea..06f6a1f6481c 100644 --- a/dbaccess/source/core/misc/apitools.cxx +++ b/dbaccess/source/core/misc/apitools.cxx @@ -55,10 +55,6 @@ Sequence< Type > OSubComponent::getTypes() throw (RuntimeException, std::excepti } // XInterface -void OSubComponent::acquire() throw ( ) -{ - OComponentHelper::acquire(); -} void OSubComponent::release() throw ( ) { diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx index 78b51f5b8e8e..fa5176b5cb0e 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx @@ -87,7 +87,6 @@ namespace dbmm protected: virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) override; - virtual void destroyDialog() override; private: Reference<XComponentContext> m_aContext; @@ -124,11 +123,6 @@ namespace dbmm return VclPtr<MacroMigrationDialog>::Create( _pParent, m_aContext, m_xDocument ); } - void MacroMigrationDialogService::destroyDialog() - { - MacroMigrationDialogService_Base::destroyDialog(); - } - Sequence< sal_Int8 > SAL_CALL MacroMigrationDialogService::getImplementationId() throw(RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index 4c43f959d9c4..b6dfd1086f4f 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -50,7 +50,6 @@ public: // css::uno::XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; inline operator css::uno::Reference< css::uno::XInterface > () const diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index b6d7c7541af2..ed47cffb5fe4 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -2281,16 +2281,6 @@ void OApplicationController::onDeleteEntry() executeChecked(nId,Sequence<PropertyValue>()); } -void OApplicationController::executeUnChecked(const URL& _rCommand, const Sequence< PropertyValue>& aArgs) -{ - OGenericUnoController::executeUnChecked( _rCommand, aArgs ); -} - -void OApplicationController::executeChecked(const URL& _rCommand, const Sequence< PropertyValue>& aArgs) -{ - OGenericUnoController::executeChecked( _rCommand, aArgs ); -} - void OApplicationController::executeUnChecked(sal_uInt16 _nCommandId, const Sequence< PropertyValue>& aArgs) { OGenericUnoController::executeUnChecked( _nCommandId, aArgs ); @@ -2311,26 +2301,11 @@ bool OApplicationController::isCommandEnabled( const OUString& _rCompleteCommand return OGenericUnoController::isCommandEnabled( _rCompleteCommandURL ); } -sal_uInt16 OApplicationController::registerCommandURL( const OUString& _rCompleteCommandURL ) -{ - return OGenericUnoController::registerCommandURL( _rCompleteCommandURL ); -} - -void OApplicationController::notifyHiContrastChanged() -{ - OGenericUnoController::notifyHiContrastChanged(); -} - Reference< XController > OApplicationController::getXController() throw( RuntimeException ) { return OGenericUnoController::getXController(); } -bool OApplicationController::interceptUserInput( const NotifyEvent& _rEvent ) -{ - return OGenericUnoController::interceptUserInput( _rEvent ); -} - VclPtr<PopupMenu> OApplicationController::getContextMenu( Control& /*_rControl*/ ) const { return VclPtr<PopupMenu>::Create( ModuleRes( RID_MENU_APP_EDIT ) ); diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index afde26c43aa7..f882e3ca89ae 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -512,18 +512,15 @@ namespace dbaui void containerFound( const css::uno::Reference< css::container::XContainer >& _xContainer); // IController - virtual void executeUnChecked(const css::util::URL& _rCommand, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; - virtual void executeChecked(const css::util::URL& _rCommand, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; + using OGenericUnoController::executeUnChecked; virtual void executeUnChecked(sal_uInt16 _nCommandId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; + using OGenericUnoController::executeChecked; virtual void executeChecked(sal_uInt16 _nCommandId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) override; virtual bool isCommandEnabled(sal_uInt16 _nCommandId) const override; virtual bool isCommandEnabled( const OUString& _rCompleteCommandURL ) const override; - virtual sal_uInt16 registerCommandURL( const OUString& _rCompleteCommandURL ) override; - virtual void notifyHiContrastChanged() override; virtual bool isDataSourceReadOnly() const override; virtual css::uno::Reference< css::frame::XController > getXController() throw( css::uno::RuntimeException ) override; - virtual bool interceptUserInput( const NotifyEvent& _rEvent ) override; // IControlActionListener overridables virtual bool requestQuickHelp( const SvTreeListEntry* _pEntry, OUString& _rText ) const override; diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 4e26e022164f..879dcd545e88 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -601,11 +601,6 @@ void OApplicationDetailView::DataChanged( const DataChangedEvent& rDCEvt ) } } -void OApplicationDetailView::GetFocus() -{ - OSplitterView::GetFocus(); -} - void OApplicationDetailView::setTaskExternalMnemonics( MnemonicGenerator& _rMnemonics ) { m_aExternalMnemonics = _rMnemonics; diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 5c092036b431..1a2f430eeb93 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -163,7 +163,6 @@ namespace dbaui virtual ~OApplicationDetailView(); // Window overrides virtual void dispose() override; - virtual void GetFocus() override; /** creates the tables page @param _xConnection diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index fdd1299f0902..64c68b11b8b6 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -1135,11 +1135,6 @@ void SbaGridControl::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) FmGridControl::StartDrag(_nAction, _rPosPixel); } -void SbaGridControl::Command(const CommandEvent& rEvt) -{ - FmGridControl::Command(rEvt); -} - void SbaGridControl::DoColumnDrag(sal_uInt16 nColumnPos) { Reference< XPropertySet > xDataSource(getDataSource(), UNO_QUERY); @@ -1501,9 +1496,4 @@ OUString SbaGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowse return sRet; } -void SbaGridControl::DeleteSelectedRows() -{ - FmGridControl::DeleteSelectedRows(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 3ebaef041568..1a588f4c2e49 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -109,7 +109,7 @@ namespace dbaui virtual bool IsTabAllowed(bool bForward) const override; void Init(const TTableConnectionData::value_type& _pConnData); - virtual void Init() override { ORelationControl_Base::Init(); } + using ORelationControl_Base::Init; virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) override; virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) override; virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const override; diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 15d4b944243d..f696857f512b 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -144,11 +144,6 @@ void OTableGrantControl::Init() SetMode(nMode); } -void OTableGrantControl::Resize() -{ - EditBrowseBox::Resize(); -} - bool OTableGrantControl::PreNotify(NotifyEvent& rNEvt) { if (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS) diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index 2756ec2a56ff..797770c09df7 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -116,7 +116,7 @@ namespace dbaui // UNO interface overridables // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; + using OJoinController_BASE::disposing; // css::lang::XComponent virtual void SAL_CALL disposing() override; diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index 4b27fa3b80e5..03a8c030901b 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -34,7 +34,6 @@ namespace dbaui { protected: virtual void ConnDoubleClicked(VclPtr<OTableConnection>& rConnection) override; - virtual void KeyInput(const KeyEvent& rEvt) override; virtual VclPtr<OTableWindow> createWindow(const TTableWindowData::value_type& _pData) override; diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index ec7d5891e4fc..244eb61aedcb 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -81,8 +81,6 @@ public: CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ) override; protected: - virtual void Resize() override; - virtual bool PreNotify(NotifyEvent& rNEvt ) override; virtual bool IsTabAllowed(bool bForward) const override; diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 54af4da747dd..123cee3dda73 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -227,7 +227,6 @@ namespace dbaui virtual ~SbaGridControl(); virtual void dispose() override; - virtual void Command( const CommandEvent& rCEvt ) override; virtual void Select() override; void SetMasterListener(SbaGridListener* pListener) { m_pMasterListener = pListener; } @@ -250,7 +249,7 @@ namespace dbaui */ virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override; - virtual void DeleteSelectedRows() override; + using FmGridControl::DeleteSelectedRows; /** copies the currently selected rows to the clipboard @precond at least one row is selected diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 31dfbee43ba5..bdb72d6905a6 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -155,11 +155,6 @@ OJoinController::~OJoinController() { } -void SAL_CALL OJoinController::disposing( const EventObject& _rSource ) throw(RuntimeException, std::exception) -{ - OJoinController_BASE::disposing( _rSource ); -} - OJoinDesignView* OJoinController::getJoinView() { return static_cast< OJoinDesignView* >( getView() ); diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 67bd063ec99d..a2af2d85ed98 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -689,11 +689,6 @@ bool OQueryTableView::RemoveConnection(VclPtr<OTableConnection>& rConnection, bo return bRet; } -void OQueryTableView::KeyInput( const KeyEvent& rEvt ) -{ - OJoinTableView::KeyInput( rEvt ); -} - OQueryTableWindow* OQueryTableView::FindTable(const OUString& rAliasName) { OSL_ENSURE(!rAliasName.isEmpty(), "OQueryTableView::FindTable : the AliasName should not be empty !"); diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index dd348e594e4f..9787efdcb435 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1166,7 +1166,7 @@ void SAL_CALL OQueryController::disposing( const EventObject& Source ) throw(Run } } - OJoinController::disposing(Source); + OJoinController_BASE::disposing(Source); } void OQueryController::reconnect(bool _bUI) diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 80d6e063d0e7..1036ab00846c 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -128,8 +128,6 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend void componentLiveRemoval(ComponentBackendDb::Data const & data); - virtual void SAL_CALL disposing() override; - // Package virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, @@ -184,8 +182,6 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend const bool m_jarFile; - virtual void SAL_CALL disposing() override; - // Package virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, @@ -389,18 +385,6 @@ BackendImpl * BackendImpl::ComponentPackageImpl::getMyBackend() const } -void BackendImpl::ComponentPackageImpl::disposing() -{ - Package::disposing(); -} - - -void BackendImpl::TypelibraryPackageImpl::disposing() -{ - Package::disposing(); -} - - void BackendImpl::disposing() { try { diff --git a/drawinglayer/CppunitTest_drawinglayer_border.mk b/drawinglayer/CppunitTest_drawinglayer_border.mk index ea72b8cee602..db8703292861 100644 --- a/drawinglayer/CppunitTest_drawinglayer_border.mk +++ b/drawinglayer/CppunitTest_drawinglayer_border.mk @@ -24,6 +24,7 @@ $(eval $(call gb_CppunitTest_use_libraries,drawinglayer_border, \ vcl \ test \ tl \ + unotest \ $(gb_UWINAPI) \ )) diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk index 36fb35be49ff..00d2b80527aa 100644 --- a/editeng/CppunitTest_editeng_core.mk +++ b/editeng/CppunitTest_editeng_core.mk @@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,editeng_core, \ tk \ tl \ ucbhelper \ + unotest \ utl \ vcl \ xo \ diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 16071bd045ff..627ead706c26 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -110,12 +110,6 @@ void EditSpellWrapper::SpellContinue() SetLast( pEditView->GetImpEditEngine()->ImpSpell( pEditView ) ); } -void EditSpellWrapper::SpellEnd() -{ - // Base class will show language errors... - SvxSpellWrapper::SpellEnd(); -} - bool EditSpellWrapper::HasOtherCnt() { return false; diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx index a70881bff4f2..baf7b7721e91 100644 --- a/editeng/source/editeng/edtspell.hxx +++ b/editeng/source/editeng/edtspell.hxx @@ -47,7 +47,6 @@ protected: virtual void SpellStart( SvxSpellArea eArea ) override; virtual void SpellContinue() override; // Check area virtual void ReplaceAll( const OUString &rNewText, sal_Int16 nLanguage ) override; - virtual void SpellEnd() override; virtual bool SpellMore() override; virtual bool HasOtherCnt() override; diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 0cf844f73b5a..a81713f09e7c 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -580,16 +580,6 @@ void SvxRTFParser::ReadFontTable() SetDefault( RTF_DEFF, nDfltFont ); } -void SvxRTFParser::ReadBitmapData() -{ - SvRTFParser::ReadBitmapData(); -} - -void SvxRTFParser::ReadOLEData() -{ - SvRTFParser::ReadOLEData(); -} - OUString& SvxRTFParser::GetTextToEndGroup( OUString& rStr ) { rStr.clear(); diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx index 91115e62879b..d135a19bb7c8 100644 --- a/extensions/source/abpilot/fieldmappingpage.cxx +++ b/extensions/source/abpilot/fieldmappingpage.cxx @@ -55,12 +55,6 @@ namespace abp } - void FieldMappingPage::DeactivatePage() - { - AddressBookSourcePage::DeactivatePage(); - } - - void FieldMappingPage::initializePage() { AddressBookSourcePage::initializePage(); diff --git a/extensions/source/abpilot/fieldmappingpage.hxx b/extensions/source/abpilot/fieldmappingpage.hxx index 1d6c63755f45..146ece80f2f6 100644 --- a/extensions/source/abpilot/fieldmappingpage.hxx +++ b/extensions/source/abpilot/fieldmappingpage.hxx @@ -43,7 +43,6 @@ namespace abp // TabDialog overridables virtual void ActivatePage() override; - virtual void DeactivatePage() override; private: DECL_LINK_TYPED( OnInvokeDialog, Button*, void ); diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx index 21fcf27f17dc..95286851a87a 100644 --- a/extensions/source/abpilot/tableselectionpage.cxx +++ b/extensions/source/abpilot/tableselectionpage.cxx @@ -55,12 +55,6 @@ namespace abp } - void TableSelectionPage::DeactivatePage() - { - AddressBookSourcePage::DeactivatePage(); - } - - void TableSelectionPage::initializePage() { AddressBookSourcePage::initializePage(); diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx index 6f811267a7f2..dac8e5f33c7e 100644 --- a/extensions/source/abpilot/tableselectionpage.hxx +++ b/extensions/source/abpilot/tableselectionpage.hxx @@ -44,7 +44,6 @@ namespace abp // TabDialog overridables virtual void ActivatePage() override; - virtual void DeactivatePage() override; // OImportPage overridables virtual bool canAdvance() const override; diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index f220adb5a75b..261918671f31 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -279,12 +279,6 @@ namespace dbp } - void OControlWizard::ActivatePage() - { - OControlWizard_Base::ActivatePage(); - } - - void OControlWizard::implDetermineShape() { Reference< XIndexAccess > xPageObjects(m_aContext.xDrawPage, UNO_QUERY); diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index b445dbf96251..ba2be4cffcaf 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -147,7 +147,7 @@ namespace dbp void implDetermineShape(); // made private. Not to be used by derived (or external) classes - virtual void ActivatePage() override; + using OControlWizard_Base::ActivatePage; }; diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index 5fde3d39b5df..398dea7129d6 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -144,10 +144,6 @@ namespace pcr virtual void SAL_CALL revokeControlObserver( const Reference< XPropertyControlObserver >& Observer ) throw (RuntimeException, std::exception) override; virtual void SAL_CALL setHelpSectionText( const OUString& HelpText ) throw (NoSupportException, RuntimeException, std::exception) override; - // UNOCompatibleNonUNOReference overridables - virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() override; - protected: virtual ~CachedInspectorUI(); @@ -209,18 +205,6 @@ namespace pcr } - void SAL_CALL CachedInspectorUI::acquire() throw() - { - CachedInspectorUI_Base::acquire(); - } - - - void SAL_CALL CachedInspectorUI::release() throw() - { - CachedInspectorUI_Base::release(); - } - - void CachedInspectorUI::checkDisposed() const { if ( isDisposed() ) diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 2410dc77ed89..7b6c7158f921 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -626,14 +626,6 @@ void OImageControlModel::doSetControlValue( const Any& _rValue ) } } -// OComponentHelper - -void SAL_CALL OImageControlModel::disposing() -{ - OBoundControlModel::disposing(); -} - - void OImageControlModel::resetNoBroadcast() { if ( hasField() ) // only reset when we are connected to a column diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx index 6c3b4326f1a1..60a9a3310bc9 100644 --- a/forms/source/component/ImageControl.hxx +++ b/forms/source/component/ImageControl.hxx @@ -81,9 +81,6 @@ public: virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override; - // OComponentHelper - virtual void SAL_CALL disposing() override; - // XPersistObject virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index 2f9c0ff25f7c..a70f2cf25e78 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.cxx @@ -170,11 +170,6 @@ namespace frm return aSupported; } - void SAL_CALL ONavigationBarModel::disposing() - { - OControlModel::disposing( ); - } - OUString SAL_CALL ONavigationBarModel::getServiceName() throw ( RuntimeException, std::exception ) { return OUString(FRM_SUN_COMPONENT_NAVTOOLBAR); diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx index 7bd2e754115f..536a1ca046db 100644 --- a/forms/source/component/navigationbar.hxx +++ b/forms/source/component/navigationbar.hxx @@ -83,9 +83,6 @@ namespace frm // XTypeProvider DECLARE_XTYPEPROVIDER() - // OComponentHelper - virtual void SAL_CALL disposing() override; - // XPersistObject virtual OUString SAL_CALL getServiceName() throw ( css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index 3b50a096fbf3..c2a02ddb24f1 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.cxx @@ -132,12 +132,6 @@ namespace frm IMPLEMENT_DEFAULT_CLONING( OScrollBarModel ) - void SAL_CALL OScrollBarModel::disposing() - { - OBoundControlModel::disposing(); - } - - void OScrollBarModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 3, OControlModel ) diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx index ee0b2b70e581..a228a41eb4ce 100644 --- a/forms/source/component/scrollbar.hxx +++ b/forms/source/component/scrollbar.hxx @@ -70,9 +70,6 @@ namespace frm virtual css::uno::Any translateExternalValueToControlValue( const css::uno::Any& _rExternalValue ) const override; virtual css::uno::Any translateControlValueToExternalValue( ) const override; - // XCoponent and related helpers - virtual void SAL_CALL disposing() override; - // prevent method hiding using OBoundControlModel::disposing; using OBoundControlModel::getFastPropertyValue; diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx index 6c71bf98e2bf..a2b551d73711 100644 --- a/forms/source/component/spinbutton.cxx +++ b/forms/source/component/spinbutton.cxx @@ -86,12 +86,6 @@ namespace frm IMPLEMENT_DEFAULT_CLONING( OSpinButtonModel ) - void SAL_CALL OSpinButtonModel::disposing() - { - OBoundControlModel::disposing(); - } - - void OSpinButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 3, OControlModel ) diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx index 886c79782cf0..a93f7326c5f4 100644 --- a/forms/source/component/spinbutton.hxx +++ b/forms/source/component/spinbutton.hxx @@ -71,9 +71,6 @@ namespace frm virtual css::uno::Any translateExternalValueToControlValue( const css::uno::Any& _rExternalValue ) const override; virtual css::uno::Any translateControlValueToExternalValue( ) const override; - // XCoponent and related helpers - virtual void SAL_CALL disposing() override; - // prevent method hiding using OBoundControlModel::disposing; using OBoundControlModel::getFastPropertyValue; diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 6ec032d2e381..205c86edf96e 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -500,20 +500,6 @@ namespace frm } - void SAL_CALL ORichTextModel::write(const Reference< XObjectOutputStream >& _rxOutStream) throw ( IOException, RuntimeException, std::exception) - { - OControlModel::write( _rxOutStream ); - // TODO: place your code here - } - - - void SAL_CALL ORichTextModel::read(const Reference< XObjectInputStream >& _rxInStream) throw ( IOException, RuntimeException, std::exception) - { - OControlModel::read( _rxInStream ); - // TODO: place your code here - } - - RichTextEngine* ORichTextModel::getEditEngine( const Reference< XControlModel >& _rxModel ) { RichTextEngine* pEngine = nullptr; diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx index f3ed47408040..efea6024df6f 100644 --- a/forms/source/richtext/richtextmodel.hxx +++ b/forms/source/richtext/richtextmodel.hxx @@ -112,7 +112,7 @@ namespace frm virtual ::css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::css::uno::RuntimeException, std::exception) override; // XPersistObject - DECLARE_XPERSISTOBJECT() + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider DECLARE_XTYPEPROVIDER() diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 2e20b304bc0b..09176d522fad 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -56,11 +56,6 @@ AddonMenu::~AddonMenu() disposeOnce(); } -void AddonMenu::dispose() -{ - PopupMenu::dispose(); -} - // Check if command URL string has the unique prefix to identify addon popup menus bool AddonPopupMenu::IsCommandURLPrefix( const OUString& aCmdURL ) { diff --git a/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx index 2ef7c973481c..98b380aa8a14 100644 --- a/i18npool/inc/transliteration_OneToOne.hxx +++ b/i18npool/inc/transliteration_OneToOne.hxx @@ -74,11 +74,33 @@ public: \ }; TRANSLITERATION_ONETOONE( fullwidthToHalfwidth ) -TRANSLITERATION_ONETOONE(halfwidthToFullwidth) TRANSLITERATION_ONETOONE( fullwidthKatakanaToHalfwidthKatakana ) -TRANSLITERATION_ONETOONE(halfwidthKatakanaToFullwidthKatakana) TRANSLITERATION_ONETOONE( fullwidthToHalfwidthLikeASC ) -TRANSLITERATION_ONETOONE( halfwidthToFullwidthLikeJIS ) + +class halfwidthToFullwidth : public transliteration_OneToOne +{ +public: + halfwidthToFullwidth(); + OUString SAL_CALL + transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) + throw(css::uno::RuntimeException, std::exception) override; +}; +class halfwidthKatakanaToFullwidthKatakana : public transliteration_OneToOne +{ +public: + halfwidthKatakanaToFullwidthKatakana(); + OUString SAL_CALL + transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) + throw(css::uno::RuntimeException, std::exception) override; +}; +class halfwidthToFullwidthLikeJIS : public transliteration_OneToOne +{ +public: + halfwidthToFullwidthLikeJIS(); + OUString SAL_CALL + transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) + throw(css::uno::RuntimeException, std::exception) override; +}; #undef TRANSLITERATION_ONETOONE diff --git a/i18npool/source/transliteration/halfwidthToFullwidth.cxx b/i18npool/source/transliteration/halfwidthToFullwidth.cxx index 4410525539b5..f422dd387f85 100644 --- a/i18npool/source/transliteration/halfwidthToFullwidth.cxx +++ b/i18npool/source/transliteration/halfwidthToFullwidth.cxx @@ -49,14 +49,6 @@ halfwidthToFullwidth::transliterate( const OUString& inStr, sal_Int32 startPos, return widthfolding::compose_ja_voiced_sound_marks ( newStr, 0, newStr.getLength(), offset, _useOffset ); } -sal_Unicode SAL_CALL -halfwidthToFullwidth::transliterateChar2Char( sal_Unicode inChar) - throw(RuntimeException, MultipleCharsOutputException, std::exception) -{ - return transliteration_OneToOne::transliterateChar2Char(inChar); -} - - halfwidthKatakanaToFullwidthKatakana::halfwidthKatakanaToFullwidthKatakana() { func = nullptr; @@ -79,14 +71,6 @@ halfwidthKatakanaToFullwidthKatakana::transliterate( const OUString& inStr, sal_ return widthfolding::compose_ja_voiced_sound_marks ( newStr, 0, newStr.getLength(), offset, _useOffset ); } -sal_Unicode SAL_CALL -halfwidthKatakanaToFullwidthKatakana::transliterateChar2Char( sal_Unicode inChar) - throw(RuntimeException, MultipleCharsOutputException, std::exception) -{ - return transliteration_OneToOne::transliterateChar2Char(inChar); -} - - halfwidthToFullwidthLikeJIS::halfwidthToFullwidthLikeJIS() { func = nullptr; @@ -109,12 +93,6 @@ halfwidthToFullwidthLikeJIS::transliterate( const OUString& inStr, sal_Int32 sta return widthfolding::compose_ja_voiced_sound_marks ( newStr, 0, newStr.getLength(), offset, _useOffset, WIDTHFOLDNIG_DONT_USE_COMBINED_VU ); } -sal_Unicode SAL_CALL -halfwidthToFullwidthLikeJIS::transliterateChar2Char( sal_Unicode inChar) - throw(RuntimeException, MultipleCharsOutputException, std::exception) -{ - return transliteration_OneToOne::transliterateChar2Char(inChar); -} } } } } diff --git a/idlc/inc/astenum.hxx b/idlc/inc/astenum.hxx index c60ff2839bfe..d7c8977fb932 100644 --- a/idlc/inc/astenum.hxx +++ b/idlc/inc/astenum.hxx @@ -38,7 +38,6 @@ public: virtual bool dump(RegistryKey& rKey) override; - virtual AstDeclaration* addDeclaration(AstDeclaration* pDecl) override; private: sal_Int32 m_enumValueCount; }; diff --git a/idlc/inc/astoperation.hxx b/idlc/inc/astoperation.hxx index 775c74fc0c43..5a5194f92605 100644 --- a/idlc/inc/astoperation.hxx +++ b/idlc/inc/astoperation.hxx @@ -47,8 +47,6 @@ public: bool dumpBlob(typereg::Writer & rBlob, sal_uInt16 index); - // scope management - virtual AstDeclaration* addDeclaration(AstDeclaration* pDecl) override; private: AstType const * m_pReturnType; DeclList m_exceptions; diff --git a/idlc/source/astenum.cxx b/idlc/source/astenum.cxx index f3a20fce50b8..f006f611a8d4 100644 --- a/idlc/source/astenum.cxx +++ b/idlc/source/astenum.cxx @@ -104,9 +104,4 @@ bool AstEnum::dump(RegistryKey& rKey) return true; } -AstDeclaration* AstEnum::addDeclaration(AstDeclaration* pDecl) -{ - return AstScope::addDeclaration(pDecl); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idlc/source/astoperation.cxx b/idlc/source/astoperation.cxx index 78c4e452a915..cd6076b1f3a8 100644 --- a/idlc/source/astoperation.cxx +++ b/idlc/source/astoperation.cxx @@ -118,9 +118,4 @@ bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index) return true; } -AstDeclaration* AstOperation::addDeclaration(AstDeclaration* pDecl) -{ - return AstScope::addDeclaration(pDecl); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx index 0953a7d150ea..0000cf974a45 100644 --- a/include/connectivity/TTableHelper.hxx +++ b/include/connectivity/TTableHelper.hxx @@ -138,9 +138,6 @@ namespace connectivity virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() const override; css::uno::Reference< css::sdbc::XConnection> getConnection() const; - virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() override; - // XRename virtual void SAL_CALL rename( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index 2a941617be17..ede52eb18f7f 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -254,9 +254,6 @@ protected: // is called for each token that is recognized in CallParser virtual void NextToken( int nToken ) override; - virtual void ReadBitmapData() override; - virtual void ReadOLEData() override; - void ReadStyleTable(); void ReadColorTable(); void ReadFontTable(); diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx index fec0de71b894..a8478ed9660a 100644 --- a/include/framework/addonmenu.hxx +++ b/include/framework/addonmenu.hxx @@ -39,7 +39,6 @@ class FWE_DLLPUBLIC AddonMenu : public PopupMenu public: AddonMenu( const css::uno::Reference< css::frame::XFrame >& rFrame ); virtual ~AddonMenu(); - virtual void dispose() override; protected: css::uno::Reference< css::frame::XFrame > m_xFrame; diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx index 2cb5e6c9e9a1..1ea28de425e6 100644 --- a/include/sfx2/sidebar/Panel.hxx +++ b/include/sfx2/sidebar/Panel.hxx @@ -56,10 +56,8 @@ public: bool HasIdPredicate (const OUString& rsId) const; const OUString& GetId() const { return msPanelId;} - virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override; virtual void Resize() override; virtual void DataChanged (const DataChangedEvent& rEvent) override; - virtual void Activate() override; virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; private: diff --git a/include/sfx2/sidebar/SidebarDockingWindow.hxx b/include/sfx2/sidebar/SidebarDockingWindow.hxx index 382b48da7f78..e725031c8aa5 100644 --- a/include/sfx2/sidebar/SidebarDockingWindow.hxx +++ b/include/sfx2/sidebar/SidebarDockingWindow.hxx @@ -37,7 +37,7 @@ public: virtual ~SidebarDockingWindow(); virtual void dispose() override; - virtual bool Close() override; + using SfxDockingWindow::Close; protected: // Window overridables diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index 8ec6cc13ae10..f4970d884cac 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -70,10 +70,10 @@ protected: virtual void SAL_CALL release() throw() override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; + using svt::StatusbarController::disposing; // XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; + using svt::StatusbarController::dispose; // XStatusListener virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx index 93ae6db0dd07..a1c799e347c1 100644 --- a/include/sfx2/styledlg.hxx +++ b/include/sfx2/styledlg.hxx @@ -33,8 +33,6 @@ private: SfxStyleSheetBase* pStyle; DECL_DLLPRIVATE_LINK_TYPED( CancelHdl, Button *, void ); sal_uInt16 m_nOrganizerId; -protected: - virtual void RefreshInputSet() override; public: SfxStyleDialog(vcl::Window* pParent, const OUString& rID, diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 6e66fb7cba40..6c0d322d2bcb 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -173,10 +173,6 @@ protected: bool hasBigImages() const; public: - // XEventListener - using ::cppu::OPropertySetHelper::disposing; - virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; - // XComponent virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/svtools/brwhead.hxx b/include/svtools/brwhead.hxx index 08fe07b1fbe3..3f07347db07e 100644 --- a/include/svtools/brwhead.hxx +++ b/include/svtools/brwhead.hxx @@ -35,7 +35,6 @@ public: virtual void dispose() override; protected: virtual void Command( const CommandEvent& rCEvt ) override; - virtual void Select() override; virtual void EndDrag() override; public: diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 497321e05989..b46c1243429b 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -542,7 +542,6 @@ namespace svt // callbacks for the data window virtual void ImplStartTracking() override; - virtual void ImplTracking() override; virtual void ImplEndTracking() override; // when changing a row: diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 686ad59e8f2a..108c8779d69f 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -54,7 +54,6 @@ friend class SvtURLBox_Impl; protected: virtual bool Notify( NotifyEvent& rNEvt ) override; virtual void Select() override; - virtual void Modify() override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; public: diff --git a/include/svtools/popupwindowcontroller.hxx b/include/svtools/popupwindowcontroller.hxx index 73475c43c5f0..0d87f1792950 100644 --- a/include/svtools/popupwindowcontroller.hxx +++ b/include/svtools/popupwindowcontroller.hxx @@ -64,8 +64,6 @@ public: // XToolbarController virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override; private: diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index 6a0b866e4d65..03b4a2a08228 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -104,7 +104,6 @@ public: sal_uLong GetEntryPos( const OUString&, sal_uInt16 nCol = 0xffff ); sal_uLong GetEntryPos( const SvTreeListEntry* pEntry ) const; - virtual void Resize() override; void SetTabJustify( sal_uInt16 nTab, SvTabJustify ); }; diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index 4289d6bca289..fd41de1d9412 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -104,7 +104,6 @@ namespace svt */ OWizardPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription); virtual ~OWizardPage(); - virtual void dispose() override; // IWizardPageController overridables virtual void initializePage() override; diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index 90167d57ebe0..d5f96cf178d4 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -75,8 +75,6 @@ class SVX_DLLPUBLIC SvxMetricField : public MetricField protected: virtual void Modify() override; - virtual void Down() override; - virtual void Up() override; // just to be sure virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual bool Notify( NotifyEvent& rNEvt ) override; diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index 555ce471b143..b41d261b2b10 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -98,7 +98,6 @@ private: protected: virtual void Resizing( Size& rSize ) override; virtual void Resize() override; - virtual bool Close() override; virtual void PopupModeEnd() override; /** This function is called when the window gets the focus. It grabs diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index 4ff71004d2bb..69cd93f7b1ec 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -188,8 +188,6 @@ public: virtual void SetModel(SdrModel* pNewModel) override; - virtual void RecalcSnapRect() override; - virtual const Rectangle& GetSnapRect() const override; virtual const Rectangle& GetCurrentBoundRect() const override; virtual const Rectangle& GetLogicRect() const override; @@ -217,7 +215,6 @@ public: virtual bool beginSpecialDrag(SdrDragStat& rDrag) const override; virtual bool applySpecialDrag(SdrDragStat& rDrag) override; - virtual bool BegCreate( SdrDragStat& rStat ) override; virtual bool MovCreate(SdrDragStat& rStat) override; // #i37448# virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override; @@ -233,7 +230,6 @@ public: virtual bool IsAutoGrowHeight() const override; virtual bool IsAutoGrowWidth() const override; virtual void SetVerticalWriting( bool bVertical ) override; - virtual bool BegTextEdit( SdrOutliner& rOutl ) override; virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const override; virtual void EndTextEdit( SdrOutliner& rOutl ) override; virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const override; diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index 24d9e0b953ca..34093992a884 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -121,9 +121,7 @@ public: virtual void NbcSetAnchorPos(const Point& rPnt) override; virtual const Point& GetAnchorPos() const override; - virtual void RecalcSnapRect() override; virtual const Rectangle& GetSnapRect() const override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; virtual const Rectangle& GetLogicRect() const override; virtual void NbcSetLogicRect(const Rectangle& rRect) override; diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 22085c95a55a..f52ef362f374 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -179,8 +179,6 @@ public: virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) override; virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override; virtual void NbcShear (const Point& rRef, long nAngle, double tn, bool bVShear) override; - virtual void NbcSetSnapRect(const Rectangle& rRect) override; - virtual void NbcSetLogicRect(const Rectangle& rRect) override; virtual SdrObjGeoData* NewGeoData() const override; virtual void SaveGeoData(SdrObjGeoData& rGeo) const override; virtual void RestGeoData(const SdrObjGeoData& rGeo) override; diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index d81d37dbbf3e..b39a9c65a76e 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -267,11 +267,6 @@ public: // with the base geometry and returns TRUE. Otherwise it returns FALSE. virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const override; - // Sets the base geometry of the object using infos contained in the homogen 3x3 matrix. - // If it's an SdrPathObj it will use the provided geometry information. The Polygon has - // to use (0,0) as upper left and will be scaled to the given size in the matrix. - virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) override; - // #103836# iterates over the paragraphs of a given SdrObject and removes all // hard set character attributes with the which ids contained in the // given vector diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index 7ee8c6f2fa47..64f5caf13778 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -62,7 +62,6 @@ public: virtual const Rectangle& GetCurrentBoundRect() const override; virtual const Rectangle& GetLastBoundRect() const override; virtual void RecalcBoundRect() override; - virtual void SetChanged() override; virtual SdrVirtObj* Clone() const override; SdrVirtObj& operator=(const SdrVirtObj& rObj); diff --git a/include/test/bootstrapfixture.hxx b/include/test/bootstrapfixture.hxx index 5e24753fe668..3930f8ac85bc 100644 --- a/include/test/bootstrapfixture.hxx +++ b/include/test/bootstrapfixture.hxx @@ -53,7 +53,6 @@ public: virtual ~BootstrapFixture(); virtual void setUp() override; - virtual void tearDown() override; static void validate(const OUString& rURL, ValidationFormat); }; diff --git a/include/test/unoapi_test.hxx b/include/test/unoapi_test.hxx index d728175eaa39..32c20997808f 100644 --- a/include/test/unoapi_test.hxx +++ b/include/test/unoapi_test.hxx @@ -26,7 +26,6 @@ public: void createFileURL(const OUString& aFileBase, OUString& rFilePath); virtual void setUp() override; - virtual void tearDown() override; protected: void closeDocument( css::uno::Reference< css::lang::XComponent > const & xDocument ); diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx index 7b6091a48d77..c4c586fbb55e 100644 --- a/include/unotools/streamhelper.hxx +++ b/include/unotools/streamhelper.hxx @@ -52,10 +52,6 @@ public: ,m_nActPos(0) ,m_nAvailable(_nAvailable){} -// css::uno::XInterface - virtual void SAL_CALL acquire() throw () override; - virtual void SAL_CALL release() throw () override; - // css::io::XInputStream virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index dede22f9d680..c72a0d334270 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -126,8 +126,6 @@ public: virtual void EnableRTL ( bool bEnable = true ) override; - virtual void GetFocus() override; - virtual void LoseFocus() override; virtual bool Notify( NotifyEvent& rNEvt ) override; virtual void StateChanged( StateChangedType nStateChange ) override; virtual void Resize() override; diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 31cceaa6439c..b6a0d2808551 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -319,9 +319,7 @@ public: virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All ) override; - void SetPosSizePixel( const Point& rNewPos, - const Size& rNewSize ) override - { Window::SetPosSizePixel( rNewPos, rNewSize ); } + using Window::SetPosSizePixel; Point GetPosPixel() const override; Size GetSizePixel() const override; void SetOutputSizePixel( const Size& rNewSize ) override; diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index f3346431ad89..17e0c82f050a 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -59,7 +59,6 @@ protected: explicit SpinField( WindowType nTyp ); virtual bool Notify( NotifyEvent& rNEvt ) override; - virtual void Command( const CommandEvent& rCEvt ) override; void EndDropDown(); diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index 8557d77ac5c0..9d92b47d43b9 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -71,8 +71,6 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void Tracking( const TrackingEvent& rTEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; - virtual void GetFocus() override; virtual void LoseFocus() override; virtual void KeyInput( const KeyEvent& rKEvt ) override; diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index e31a6944f938..e8fa7c0876d7 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -111,7 +111,6 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; - virtual void Move() override; virtual void Resize() override; virtual void RequestHelp( const HelpEvent& rHEvt ) override; virtual void StateChanged( StateChangedType nType ) override; diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index f87e8efccb27..06df8594c644 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -284,7 +284,6 @@ public: virtual void LoseFocus() override; virtual void KeyInput( const KeyEvent& rKEvt ) override; - virtual bool PrepareToggleFloatingMode() override; virtual void ToggleFloatingMode() override; virtual void StartDocking() override; virtual bool Docking( const Point& rPos, Rectangle& rRect ) override; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 923fc7744fad..bab4395c9a63 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -784,12 +784,6 @@ protected: virtual void ClipToPaintRegion( Rectangle& rDstRect ) override; virtual bool UsePolyPolygonForComplexGradient() override; - virtual void DrawGradientWallpaper(long nX, long nY, long nWidth, long nHeight, - const Wallpaper& rWallpaper) override - { - OutputDevice::DrawGradientWallpaper(nX, nY, nWidth, nHeight, rWallpaper); - } - virtual void ApplySettings(vcl::RenderContext& rRenderContext); public: bool HasMirroredGraphics() const override; @@ -812,18 +806,9 @@ public: virtual void KeyUp( const KeyEvent& rKEvt ); virtual void PrePaint(vcl::RenderContext& rRenderContext); virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect); + using OutputDevice::Erase; void Erase(vcl::RenderContext& rRenderContext); - virtual void Erase() override - { - OutputDevice::Erase(); - } - - virtual void Erase(const Rectangle& rRect) override - { - OutputDevice::Erase(rRect); - } - virtual void Draw( ::OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ); virtual void Move(); virtual void Resize(); diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx index 064d12bd1487..a9edbb177a52 100644 --- a/io/source/stm/streamhelper.hxx +++ b/io/source/stm/streamhelper.hxx @@ -80,8 +80,6 @@ public: throw( css::io::BufferSizeExceededException ); sal_Int32 getSize() const throw() { return MemRingBuffer::getSize(); } - virtual void shrink() throw() override - { MemRingBuffer::shrink(); } }; diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 747401e449f6..039067a65787 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -379,12 +379,6 @@ void SAL_CALL ConvDicXMLImport::startDocument() SvXMLImport::startDocument(); } -void SAL_CALL ConvDicXMLImport::endDocument() - throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) -{ - SvXMLImport::endDocument(); -} - SvXMLImportContext * ConvDicXMLImport::CreateContext( sal_uInt16 nPrefix, const OUString &rLocalName, diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index f20599a15ea9..44dc4e8f021a 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.hxx @@ -94,7 +94,6 @@ public: } virtual void SAL_CALL startDocument() throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL endDocument() throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override; virtual SvXMLImportContext * CreateContext( sal_uInt16 nPrefix, const OUString &rLocalName, diff --git a/postprocess/CppunitTest_services.mk b/postprocess/CppunitTest_services.mk index 23df01922460..daa98d9409a6 100644 --- a/postprocess/CppunitTest_services.mk +++ b/postprocess/CppunitTest_services.mk @@ -22,6 +22,7 @@ $(eval $(call gb_CppunitTest_use_libraries,services, \ cppuhelper \ sal \ test \ + unotest \ vcl \ $(gb_UWINAPI) \ )) diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index c865e1cace3d..b5af7b79acff 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -89,7 +89,6 @@ ExportDocumentHandler::~ExportDocumentHandler() } } IMPLEMENT_GET_IMPLEMENTATION_ID(ExportDocumentHandler) -IMPLEMENT_FORWARD_REFCOUNT( ExportDocumentHandler, ExportDocumentHandler_BASE ) OUString SAL_CALL ExportDocumentHandler::getImplementationName( ) throw(uno::RuntimeException, std::exception) { diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx index 27184d88ffd1..def0b03db243 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx @@ -57,7 +57,8 @@ private: virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; - DECLARE_XINTERFACE( ) + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + DECLARE_XTYPEPROVIDER( ) // css::xml::sax::XDocumentHandler: diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index bb2da0c9a6ed..f204ecb5cf84 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -62,7 +62,6 @@ ImportDocumentHandler::~ImportDocumentHandler() } } IMPLEMENT_GET_IMPLEMENTATION_ID(ImportDocumentHandler) -IMPLEMENT_FORWARD_REFCOUNT( ImportDocumentHandler, ImportDocumentHandler_BASE ) OUString SAL_CALL ImportDocumentHandler::getImplementationName( ) throw(uno::RuntimeException, std::exception) { diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx index f79ea4921293..123c3ab93fa9 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx @@ -55,7 +55,8 @@ private: virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; - DECLARE_XINTERFACE( ) + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + DECLARE_XTYPEPROVIDER( ) // css::xml::sax::XDocumentHandler: diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index 22f4289434d6..2d2e932e0f1a 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -72,7 +72,6 @@ namespace rptui virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; virtual void MouseMove( const MouseEvent& rMEvt ) override; virtual void Command( const CommandEvent& rCEvt ) override; - virtual void Resize() override; // OPropertyChangeListener virtual void _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException) override; diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 0430e4b0a4be..247545f00515 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -169,11 +169,6 @@ void OReportSection::Paint( vcl::RenderContext& rRenderContext, const Rectangle& } } -void OReportSection::Resize() -{ - Window::Resize(); -} - void OReportSection::fill() { if ( !m_xSection.is() ) diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx index 164e4a5186e1..e4469fb6ffe9 100644 --- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx +++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx @@ -125,11 +125,6 @@ protected: public: - virtual void SAL_CALL suspend() override - { - ::osl::Thread::suspend(); - } - virtual ~OGetThread() { if (isRunning()) diff --git a/sax/CppunitTest_sax_parser.mk b/sax/CppunitTest_sax_parser.mk index 9c7245c49684..f94d7b0ff4fa 100644 --- a/sax/CppunitTest_sax_parser.mk +++ b/sax/CppunitTest_sax_parser.mk @@ -17,6 +17,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_parser, \ comphelper \ cppu \ cppuhelper \ + unotest \ expwrap \ sal \ test \ diff --git a/sc/qa/extras/sccondformats.cxx b/sc/qa/extras/sccondformats.cxx index 135d78cd1fdc..f8f5871f99d4 100644 --- a/sc/qa/extras/sccondformats.cxx +++ b/sc/qa/extras/sccondformats.cxx @@ -34,7 +34,6 @@ class ScConditionalFormatTest : public CalcUnoApiTest public: ScConditionalFormatTest(); - virtual void setUp() override; virtual void tearDown() override; uno::Reference< uno::XInterface > init(); @@ -215,11 +214,6 @@ void ScConditionalFormatTest::testUndoAnchor() xComponent->dispose(); } -void ScConditionalFormatTest::setUp() -{ - CalcUnoApiTest::setUp(); -} - void ScConditionalFormatTest::tearDown() { if (mxComponent.is()) diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx index ecc5406aa816..e41bb4276a8d 100644 --- a/sc/qa/extras/sctablesheetobj.cxx +++ b/sc/qa/extras/sctablesheetobj.cxx @@ -26,7 +26,6 @@ class ScTableSheetObj : public CalcUnoApiTest, public apitest::XSearchable, publ public: ScTableSheetObj(); - virtual void setUp() override; virtual void tearDown() override; virtual uno::Reference< uno::XInterface > init() override; @@ -68,11 +67,6 @@ uno::Reference< uno::XInterface > ScTableSheetObj::init() return xSheet; } -void ScTableSheetObj::setUp() -{ - CalcUnoApiTest::setUp(); -} - void ScTableSheetObj::tearDown() { closeDocument(mxComponent); diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx index 213ec96db35d..62c87f21fa48 100644 --- a/sc/source/ui/app/lnktrans.cxx +++ b/sc/source/ui/app/lnktrans.cxx @@ -65,11 +65,6 @@ bool ScLinkTransferObj::GetData( return bOK; } -void ScLinkTransferObj::ObjectReleased() -{ - TransferableHelper::ObjectReleased(); -} - void ScLinkTransferObj::DragFinished( sal_Int8 nDropAction ) { ScModule* pScMod = SC_MOD(); diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx index 407a3b4a8557..7b72f7be72f8 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx @@ -52,11 +52,6 @@ DragDropMode ScPivotLayoutTreeListBase::NotifyStartDrag(TransferDataContainer& / void ScPivotLayoutTreeListBase::DragFinished(sal_Int8 /*nDropAction*/) {} -sal_Int8 ScPivotLayoutTreeListBase::AcceptDrop(const AcceptDropEvent& rEvent) -{ - return SvTreeListBox::AcceptDrop(rEvent); -} - bool ScPivotLayoutTreeListBase::NotifyAcceptDrop(SvTreeListEntry* /*pEntry*/) { return true; diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index d700e16a7d9a..84b80ac77f25 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -1715,12 +1715,6 @@ bool ScDocShell::SaveAs( SfxMedium& rMedium ) return bRet; } -bool ScDocShell::IsInformationLost() -{ - //FIXME: If we have time build a correct own way how to handle this - return SfxObjectShell::IsInformationLost(); -} - namespace { // Xcl-like column width measured in characters of standard font. @@ -2464,11 +2458,6 @@ bool ScDocShell::ConvertTo( SfxMedium &rMed ) return bRet; } -bool ScDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor ) -{ - return SfxObjectShell::SaveCompleted( xStor ); -} - bool ScDocShell::DoSaveCompleted( SfxMedium * pNewStor, bool bRegisterRecent ) { bool bRet = SfxObjectShell::DoSaveCompleted( pNewStor, bRegisterRecent ); diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx index 780af9e0ba1d..73e5c6095458 100644 --- a/sc/source/ui/drawfunc/fuconarc.cxx +++ b/sc/source/ui/drawfunc/fuconarc.cxx @@ -79,17 +79,6 @@ bool FuConstArc::MouseButtonDown( const MouseEvent& rMEvt ) /************************************************************************* |* -|* MouseMove-event -|* -\************************************************************************/ - -bool FuConstArc::MouseMove( const MouseEvent& rMEvt ) -{ - return FuConstruct::MouseMove(rMEvt); -} - -/************************************************************************* -|* |* MouseButtonUp-event |* \************************************************************************/ @@ -111,20 +100,6 @@ bool FuConstArc::MouseButtonUp( const MouseEvent& rMEvt ) /************************************************************************* |* -|* Tastaturereignisse bearbeiten -|* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls -|* FALSE. -|* -\************************************************************************/ - -bool FuConstArc::KeyInput(const KeyEvent& rKEvt) -{ - return FuConstruct::KeyInput(rKEvt); -} - -/************************************************************************* -|* |* Function aktivieren |* \************************************************************************/ diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index b53cf0f4948c..db31dfb28db6 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -101,17 +101,6 @@ bool FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt) /************************************************************************* |* -|* MouseMove-event -|* -\************************************************************************/ - -bool FuConstCustomShape::MouseMove(const MouseEvent& rMEvt) -{ - return FuConstruct::MouseMove(rMEvt); -} - -/************************************************************************* -|* |* MouseButtonUp-event |* \************************************************************************/ @@ -133,20 +122,6 @@ bool FuConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt) /************************************************************************* |* -|* Tastaturereignisse bearbeiten -|* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls -|* FALSE. -|* -\************************************************************************/ - -bool FuConstCustomShape::KeyInput(const KeyEvent& rKEvt) -{ - return FuConstruct::KeyInput(rKEvt); -} - -/************************************************************************* -|* |* Function aktivieren |* \************************************************************************/ diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx index 001f7f39732d..a3b3686d73a0 100644 --- a/sc/source/ui/drawfunc/fuconpol.cxx +++ b/sc/source/ui/drawfunc/fuconpol.cxx @@ -129,20 +129,6 @@ bool FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt) /************************************************************************* |* -|* Tastaturereignisse bearbeiten -|* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls -|* FALSE. -|* -\************************************************************************/ - -bool FuConstPolygon::KeyInput(const KeyEvent& rKEvt) -{ - return FuConstruct::KeyInput(rKEvt); -} - -/************************************************************************* -|* |* Function aktivieren |* \************************************************************************/ diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index c9ff32fd1aa8..a5b499098f2a 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -94,17 +94,6 @@ bool FuConstRectangle::MouseButtonDown(const MouseEvent& rMEvt) /************************************************************************* |* -|* MouseMove-event -|* -\************************************************************************/ - -bool FuConstRectangle::MouseMove(const MouseEvent& rMEvt) -{ - return FuConstruct::MouseMove(rMEvt); -} - -/************************************************************************* -|* |* MouseButtonUp-event |* \************************************************************************/ @@ -144,20 +133,6 @@ bool FuConstRectangle::MouseButtonUp(const MouseEvent& rMEvt) /************************************************************************* |* -|* Tastaturereignisse bearbeiten -|* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls -|* FALSE. -|* -\************************************************************************/ - -bool FuConstRectangle::KeyInput(const KeyEvent& rKEvt) -{ - return FuConstruct::KeyInput(rKEvt); -} - -/************************************************************************* -|* |* Function aktivieren |* \************************************************************************/ diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index 5318084771a1..f8920c2dd0d8 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -341,26 +341,4 @@ bool FuConstruct::KeyInput(const KeyEvent& rKEvt) return bReturn; } -/************************************************************************* -|* -|* Function aktivieren -|* -\************************************************************************/ - -void FuConstruct::Activate() -{ - FuDraw::Activate(); -} - -/************************************************************************* -|* -|* Function deaktivieren -|* -\************************************************************************/ - -void FuConstruct::Deactivate() -{ - FuDraw::Deactivate(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx index d6bb3d58d402..53fe19fe6d2d 100644 --- a/sc/source/ui/drawfunc/fuconuno.cxx +++ b/sc/source/ui/drawfunc/fuconuno.cxx @@ -84,17 +84,6 @@ bool FuConstUnoControl::MouseButtonDown(const MouseEvent& rMEvt) /************************************************************************* |* -|* MouseMove-event -|* -\************************************************************************/ - -bool FuConstUnoControl::MouseMove(const MouseEvent& rMEvt) -{ - return FuConstruct::MouseMove(rMEvt); -} - -/************************************************************************* -|* |* MouseButtonUp-event |* \************************************************************************/ @@ -116,20 +105,6 @@ bool FuConstUnoControl::MouseButtonUp(const MouseEvent& rMEvt) /************************************************************************* |* -|* Tastaturereignisse bearbeiten -|* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls -|* FALSE. -|* -\************************************************************************/ - -bool FuConstUnoControl::KeyInput(const KeyEvent& rKEvt) -{ - return FuConstruct::KeyInput(rKEvt); -} - -/************************************************************************* -|* |* Function aktivieren |* \************************************************************************/ diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 56c519e2f85b..c6367848a9cb 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -666,28 +666,6 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) /************************************************************************* |* -|* enable function -|* -\************************************************************************/ - -void FuDraw::Activate() -{ - FuPoor::Activate(); -} - -/************************************************************************* -|* -|* disable function -|* -\************************************************************************/ - -void FuDraw::Deactivate() -{ - FuPoor::Deactivate(); -} - -/************************************************************************* -|* |* toggle mouse-pointer |* \************************************************************************/ diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index c7fd4c96c8ae..9b1c8d01392a 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -303,28 +303,6 @@ FuInsertGraphic::~FuInsertGraphic() /************************************************************************* |* -|* FuInsertGraphic::Function aktivieren -|* -\************************************************************************/ - -void FuInsertGraphic::Activate() -{ - FuPoor::Activate(); -} - -/************************************************************************* -|* -|* FuInsertGraphic::Function deaktivieren -|* -\************************************************************************/ - -void FuInsertGraphic::Deactivate() -{ - FuPoor::Deactivate(); -} - -/************************************************************************* -|* |* FuInsertMedia::Konstruktor |* \************************************************************************/ @@ -389,26 +367,4 @@ FuInsertMedia::~FuInsertMedia() { } -/************************************************************************* -|* -|* FuInsertMedia::Function aktivieren -|* -\************************************************************************/ - -void FuInsertMedia::Activate() -{ - FuPoor::Activate(); -} - -/************************************************************************* -|* -|* FuInsertMedia::Function deaktivieren -|* -\************************************************************************/ - -void FuInsertMedia::Deactivate() -{ - FuPoor::Deactivate(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 6fa3ead43578..f23346ce0ebd 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -377,16 +377,6 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* rReq.Ignore(); } -void FuInsertOLE::Activate() -{ - FuPoor::Activate(); -} - -void FuInsertOLE::Deactivate() -{ - FuPoor::Deactivate(); -} - FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pViewP, pDoc, rReq) @@ -726,16 +716,6 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV // BM/IHA -- } -void FuInsertChart::Activate() -{ - FuPoor::Activate(); -} - -void FuInsertChart::Deactivate() -{ - FuPoor::Deactivate(); -} - FuInsertChartFromFile::FuInsertChartFromFile( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq, const OUString& rURL): FuPoor(pViewSh, pWin, pViewP, pDoc, rReq) @@ -769,14 +749,4 @@ FuInsertChartFromFile::FuInsertChartFromFile( ScTabViewShell* pViewSh, vcl::Wind pViewShell->ActivateObject(pObj, embed::EmbedVerbs::MS_OLEVERB_SHOW); } -void FuInsertChartFromFile::Activate() -{ - FuPoor::Activate(); -} - -void FuInsertChartFromFile::Deactivate() -{ - FuPoor::Deactivate(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index c151c97c62d7..2ac0f5b0a131 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -574,20 +574,6 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) /************************************************************************* |* -|* Tastaturereignisse bearbeiten -|* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls -|* FALSE. -|* -\************************************************************************/ - -bool FuSelection::KeyInput(const KeyEvent& rKEvt) -{ - return FuDraw::KeyInput(rKEvt); -} - -/************************************************************************* -|* |* Function aktivieren |* \************************************************************************/ diff --git a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx index 7505a4a06272..6fb1f89592a2 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx @@ -44,7 +44,6 @@ public: virtual ~ScPivotLayoutTreeListBase(); virtual void dispose() override; - virtual sal_Int8 AcceptDrop(const AcceptDropEvent& rEvent) override; virtual bool NotifyAcceptDrop(SvTreeListEntry* pEntry) override; virtual TriState NotifyMoving(SvTreeListEntry* pTarget, SvTreeListEntry* pSource, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos) override; diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 107c2dc990fa..7385a71406c8 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -199,10 +199,8 @@ public: virtual bool ConvertTo( SfxMedium &rMedium ) override; virtual bool PrepareClose( bool bUI = true ) override; virtual void PrepareReload() override; - virtual bool IsInformationLost() override; virtual void LoadStyles( SfxObjectShell &rSource ) override; - virtual bool SaveCompleted( const css::uno::Reference< css::embed::XStorage >& ) override; // SfxInPlaceObject virtual bool DoSaveCompleted( SfxMedium * pNewStor, bool bRegisterRecent ) override; // SfxObjectShell virtual bool QuerySlotExecutable( sal_uInt16 nSlotId ) override; diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx index 07ce623639eb..8b4986a1ac23 100644 --- a/sc/source/ui/inc/fuconarc.hxx +++ b/sc/source/ui/inc/fuconarc.hxx @@ -31,8 +31,6 @@ class FuConstArc : public FuConstruct virtual ~FuConstArc(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) override; - virtual bool MouseMove(const MouseEvent& rMEvt) override; virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx index 0e722e44600f..761eaa563322 100644 --- a/sc/source/ui/inc/fuconcustomshape.hxx +++ b/sc/source/ui/inc/fuconcustomshape.hxx @@ -34,8 +34,6 @@ public: virtual ~FuConstCustomShape(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) override; - virtual bool MouseMove(const MouseEvent& rMEvt) override; virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx index edf616b567de..2ae4edff450d 100644 --- a/sc/source/ui/inc/fuconpol.hxx +++ b/sc/source/ui/inc/fuconpol.hxx @@ -31,7 +31,6 @@ class FuConstPolygon : public FuConstruct virtual ~FuConstPolygon(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) override; virtual bool MouseMove(const MouseEvent& rMEvt) override; virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx index 7614a260d894..719f4bbcf1c4 100644 --- a/sc/source/ui/inc/fuconrec.hxx +++ b/sc/source/ui/inc/fuconrec.hxx @@ -31,8 +31,6 @@ class FuConstRectangle : public FuConstruct virtual ~FuConstRectangle(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) override; - virtual bool MouseMove(const MouseEvent& rMEvt) override; virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx index 736477e35b60..74899d3086b1 100644 --- a/sc/source/ui/inc/fuconstr.hxx +++ b/sc/source/ui/inc/fuconstr.hxx @@ -39,9 +39,6 @@ class FuConstruct : public FuDraw bool SimpleMouseButtonUp(const MouseEvent& rMEvt); - virtual void Activate() override; - virtual void Deactivate() override; - // Returns grid sync offset for rInOutPos, additionally adjusts rInOutPos // by the offset Point CurrentGridSyncOffsetAndPos( Point& rInOutPos); diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx index 7369f0d7a8cd..da0fe6b7fed5 100644 --- a/sc/source/ui/inc/fuconuno.hxx +++ b/sc/source/ui/inc/fuconuno.hxx @@ -35,8 +35,6 @@ public: virtual ~FuConstUnoControl(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) override; - virtual bool MouseMove(const MouseEvent& rMEvt) override; virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx index 2272ccf38baf..a635682c641b 100644 --- a/sc/source/ui/inc/fudraw.hxx +++ b/sc/source/ui/inc/fudraw.hxx @@ -37,9 +37,6 @@ class FuDraw : public FuPoor virtual bool KeyInput(const KeyEvent& rKEvt) override; - virtual void Activate() override; - virtual void Deactivate() override; - virtual void ForcePointer(const MouseEvent* pMEvt); virtual bool MouseMove(const MouseEvent& rMEvt) override; diff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxx index f266d0f29994..325524850122 100644 --- a/sc/source/ui/inc/fuinsert.hxx +++ b/sc/source/ui/inc/fuinsert.hxx @@ -29,9 +29,6 @@ class FuInsertGraphic : public FuPoor FuInsertGraphic( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertGraphic(); - - virtual void Activate() override; - virtual void Deactivate() override; }; class FuInsertOLE : public FuPoor @@ -39,9 +36,6 @@ class FuInsertOLE : public FuPoor public: FuInsertOLE( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); - - virtual void Activate() override; - virtual void Deactivate() override; }; class FuInsertChart : public FuPoor @@ -49,9 +43,6 @@ class FuInsertChart : public FuPoor public: FuInsertChart( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); - - virtual void Activate() override; - virtual void Deactivate() override; }; class FuInsertChartFromFile : public FuPoor @@ -59,9 +50,6 @@ class FuInsertChartFromFile : public FuPoor public: FuInsertChartFromFile( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq, const OUString& rURL); - - virtual void Activate() override; - virtual void Deactivate() override; }; class FuInsertMedia : public FuPoor @@ -70,9 +58,6 @@ class FuInsertMedia : public FuPoor FuInsertMedia( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertMedia(); - - virtual void Activate() override; - virtual void Deactivate() override; }; void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& rPage ); diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx index 32bff11625d2..52b2e97169a9 100644 --- a/sc/source/ui/inc/fusel.hxx +++ b/sc/source/ui/inc/fusel.hxx @@ -33,7 +33,6 @@ public: virtual ~FuSelection(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) override; virtual bool MouseMove(const MouseEvent& rMEvt) override; virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; diff --git a/sc/source/ui/inc/lnktrans.hxx b/sc/source/ui/inc/lnktrans.hxx index 830854720371..f22b89ec81f7 100644 --- a/sc/source/ui/inc/lnktrans.hxx +++ b/sc/source/ui/inc/lnktrans.hxx @@ -37,7 +37,6 @@ public: virtual void AddSupportedFormats() override; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; - virtual void ObjectReleased() override; virtual void DragFinished( sal_Int8 nDropAction ) override; }; diff --git a/sccomp/CppunitTest_sccomp_lpsolver.mk b/sccomp/CppunitTest_sccomp_lpsolver.mk index c86cd22ffe39..e7ec230d3872 100644 --- a/sccomp/CppunitTest_sccomp_lpsolver.mk +++ b/sccomp/CppunitTest_sccomp_lpsolver.mk @@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sccomp_lpsolver,\ cppu \ sal \ test \ + unotest \ $(gb_UWINAPI) \ )) diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index a312ed4aa35e..0dff83016a07 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -496,17 +496,6 @@ public: } } - virtual void SAL_CALL acquire() - throw () override - - { - t_BrowseNodeBase::acquire(); - } - virtual void SAL_CALL release() - throw () override - { - t_BrowseNodeBase::release(); - } // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) virtual Sequence< Type > SAL_CALL getTypes() diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index 9949f6339cb8..5a0832cd1f21 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -120,8 +120,6 @@ public: virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire() throw () override; - virtual void SAL_CALL release() throw () override; protected: void RenameAndCopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix); void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily ); diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index e6f8522da705..ef8d9263d5d0 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -131,7 +131,6 @@ protected: static const SfxItemPropertySimpleEntry* getPropertyMapEntry( const OUString& rPropertyName ) throw (css::uno::RuntimeException); virtual void Load (SvStream& rIn, sal_uInt16 nVersion) override; - virtual void Store(SvStream& rOut) override; virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; virtual ~SdStyleSheet(); diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 90ce2f7905b4..9ca1277f2856 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -1423,14 +1423,4 @@ SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet ) return aResult; } -void SAL_CALL SdStyleSheetPool::acquire() throw () -{ - SdStyleSheetPoolBase::acquire(); -} - -void SAL_CALL SdStyleSheetPool::release() throw () -{ - SdStyleSheetPoolBase::release(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 2202ee28334d..2550a68f15e6 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -175,11 +175,6 @@ void SdStyleSheet::Load (SvStream& rIn, sal_uInt16 nVersion) nMask &= ~SFXSTYLEBIT_READONLY; } -void SdStyleSheet::Store(SvStream& rOut) -{ - SfxStyleSheetBase::Store(rOut); -} - bool SdStyleSheet::SetParent(const OUString& rParentName) { bool bResult = false; diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 2fe6584341e1..7fb492eecdac 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -191,13 +191,6 @@ OUString SAL_CALL //===== XEventListener ====================================================== -void SAL_CALL - AccessibleOutlineView::disposing (const lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) -{ - AccessibleDocumentViewBase::disposing (rEventObject); -} - //===== protected internal ================================================== void AccessibleOutlineView::Activated() diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 7b2c632c72ec..e89d965ec954 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -54,11 +54,6 @@ AccessiblePageShape::~AccessiblePageShape() OSL_TRACE ("~AccessiblePageShape"); } -void AccessiblePageShape::Init() -{ - AccessibleShape::Init (); -} - //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index b5875ddacbdd..90182198ba3d 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -951,11 +951,6 @@ void CustomAnimationList::ExecuteContextMenuAction( sal_uInt16 nSelectedPopupEnt mpController->onContextMenu( nSelectedPopupEntry ); } -void CustomAnimationList::SetTabs() -{ - SvTreeListBox::SetTabs(); -} - void CustomAnimationList::notify_change() { update(); diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index 260668b5a364..a45a303e4e93 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -81,8 +81,6 @@ public: virtual void KeyInput( const KeyEvent& rKEvt ) override; - virtual void SetTabs() override; - virtual void notify_change() override; const Image& getImage( sal_uInt16 nId ); diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 0e59a38b8f8a..d0b1aa4be26a 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -226,16 +226,6 @@ void AnnotationTextWindow::Command( const CommandEvent& rCEvt ) } } -void AnnotationTextWindow::GetFocus() -{ - Window::GetFocus(); -} - -void AnnotationTextWindow::LoseFocus() -{ - Window::LoseFocus(); -} - OUString AnnotationTextWindow::GetSurroundingText() const { if( mpOutlinerView ) @@ -448,11 +438,6 @@ void AnnotationWindow::DoResize() } -void AnnotationWindow::SetSizePixel( const Size& rNewSize ) -{ - Window::SetSizePixel(rNewSize); -} - void AnnotationWindow::SetScrollbar() { mpVScrollbar->SetThumbPos(mpOutlinerView->GetVisArea().Top()); diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 0ce319766afa..90ccbf350c3c 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -59,7 +59,6 @@ protected: virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; virtual void Command( const CommandEvent& rCEvt ) override; - virtual void LoseFocus() override; public: AnnotationTextWindow( AnnotationWindow* pParent, WinBits nBits ); @@ -70,8 +69,6 @@ public: virtual OUString GetSurroundingText() const override; virtual Selection GetSurroundingTextSelection() const override; - - virtual void GetFocus() override; }; class AnnotationWindow : public FloatingWindow @@ -94,8 +91,6 @@ class AnnotationWindow : public FloatingWindow basegfx::B2DPolygon maPopupTriangle; protected: - void SetSizePixel( const Size& rNewSize ) override; - DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); public: diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index 702d1bd0a106..5661a463c61e 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -336,11 +336,6 @@ bool FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt) return bReturn; } -bool FuConstruct3dObject::MouseMove(const MouseEvent& rMEvt) -{ - return FuConstruct::MouseMove(rMEvt); -} - bool FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt) { bool bReturn = false; @@ -359,15 +354,6 @@ bool FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt) return bReturn; } -/** - * Process keyboard input - * @returns sal_True if a KeyEvent is being processed, sal_False otherwise - */ -bool FuConstruct3dObject::KeyInput(const KeyEvent& rKEvt) -{ - return FuConstruct::KeyInput(rKEvt); -} - void FuConstruct3dObject::Activate() { mpView->SetCurrentObj(OBJ_NONE); @@ -375,11 +361,6 @@ void FuConstruct3dObject::Activate() FuConstruct::Activate(); } -void FuConstruct3dObject::Deactivate() -{ - FuConstruct::Deactivate(); -} - SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) { diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index 4ef597f659dd..631040a977d1 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -127,11 +127,6 @@ bool FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) return bReturn; } -bool FuConstructArc::MouseMove( const MouseEvent& rMEvt ) -{ - return FuConstruct::MouseMove(rMEvt); -} - bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) { bool bReturn = false; @@ -160,15 +155,6 @@ bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) return bReturn; } -/** - * Process keyboard input - * @returns sal_True if a KeyEvent is being processed, sal_False otherwise - */ -bool FuConstructArc::KeyInput(const KeyEvent& rKEvt) -{ - return FuConstruct::KeyInput(rKEvt); -} - void FuConstructArc::Activate() { SdrObjKind aObjKind; @@ -212,11 +198,6 @@ void FuConstructArc::Activate() FuConstruct::Activate(); } -void FuConstructArc::Deactivate() -{ - FuConstruct::Deactivate(); -} - SdrObject* FuConstructArc::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) { diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index bc0cc72a32e1..bc69485e26d4 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -119,11 +119,6 @@ bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) return bReturn; } -bool FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt) -{ - return FuConstruct::MouseMove(rMEvt); -} - bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) { bool bReturn = false; @@ -202,15 +197,6 @@ bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) return bReturn; } -/** - * Process keyboard input - * @returns sal_True if a KeyEvent is being processed, sal_False otherwise - */ -bool FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt) -{ - return FuConstruct::KeyInput(rKEvt); -} - void FuConstructBezierPolygon::Activate() { mpView->EnableExtendedMouseEventDispatcher(true); diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index 015ab43afb3c..8aba283dfbbe 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -136,11 +136,6 @@ bool FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt) return bReturn; } -bool FuConstructCustomShape::MouseMove(const MouseEvent& rMEvt) -{ - return FuConstruct::MouseMove(rMEvt); -} - bool FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt) { bool bReturn(false); @@ -161,15 +156,6 @@ bool FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt) return bReturn; } -/** - * Process keyboard input - * @returns sal_True if a KeyEvent is being processed, sal_False otherwise - */ -bool FuConstructCustomShape::KeyInput(const KeyEvent& rKEvt) -{ - return FuConstruct::KeyInput(rKEvt); -} - void FuConstructCustomShape::Activate() { mpView->SetCurrentObj( OBJ_CUSTOMSHAPE ); diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 0acc56c3cef4..d7fe22933962 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -215,11 +215,6 @@ bool FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt) return bReturn; } -bool FuConstructRectangle::MouseMove(const MouseEvent& rMEvt) -{ - return FuConstruct::MouseMove(rMEvt); -} - bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) { bool bReturn(false); @@ -266,15 +261,6 @@ bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) return bReturn; } -/** - * Process keyboard input - * @returns sal_True if a KeyEvent is being processed, sal_False otherwise - */ -bool FuConstructRectangle::KeyInput(const KeyEvent& rKEvt) -{ - return FuConstruct::KeyInput(rKEvt); -} - void FuConstructRectangle::Activate() { SdrObjKind aObjKind; diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index a9eedc6f00e7..5e772f1ec930 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -94,11 +94,6 @@ bool FuConstructUnoControl::MouseButtonDown(const MouseEvent& rMEvt) return bReturn; } -bool FuConstructUnoControl::MouseMove(const MouseEvent& rMEvt) -{ - return FuConstruct::MouseMove(rMEvt); -} - bool FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt) { bool bReturn = false; @@ -117,15 +112,6 @@ bool FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt) return bReturn; } -/** - * Process keyboard input - * @returns sal_True if a KeyEvent is being processed, sal_False otherwise - */ -bool FuConstructUnoControl::KeyInput(const KeyEvent& rKEvt) -{ - return FuConstruct::KeyInput(rKEvt); -} - void FuConstructUnoControl::Activate() { mpView->SetCurrentObj( nIdentifier, nInventor ); diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 4488b7bb2eff..926161743aa6 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -459,11 +459,6 @@ void FuDraw::Activate() ForcePointer(); } -void FuDraw::Deactivate() -{ - FuPoor::Deactivate(); -} - /** * Toggle mouse-pointer */ diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index c55ddfa783b8..a80fd6cd2c51 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -1156,11 +1156,6 @@ void FuText::DeleteDefaultText() } } -bool FuText::Command(const CommandEvent& rCEvt) -{ - return FuPoor::Command(rCEvt); -} - bool FuText::RequestHelp(const HelpEvent& rHEvt) { bool bReturn = false; diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index b6f73a360b55..9de60128a54d 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -89,9 +89,7 @@ public: //===== lang::XEventListener ============================================ - virtual void SAL_CALL - disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + using AccessibleDocumentViewBase::disposing; //===== XPropertyChangeListener ========================================= diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index 19c5e01a9a81..b69abf4075ab 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -61,11 +61,6 @@ public: virtual ~AccessiblePageShape(); - /** Initialize a new shape. See the documentation of the constructor - for the reason of this method's existence. - */ - virtual void Init() override; - //===== XAccessibleContext ============================================== /// Returns always 0 because there can be no children. diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index 38d0d7780cfd..e96e64e841f3 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -56,7 +56,6 @@ protected: virtual void MouseButtonDown(const MouseEvent& rMEvt) override; virtual void MouseButtonUp(const MouseEvent& rMEvt) override; - virtual void MouseMove(const MouseEvent& rMEvt) override; virtual void Command(const CommandEvent& rCEvt) override; virtual void ExtraDown() override; }; diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 8a5d2c8337fd..546dbef4acae 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -160,7 +160,6 @@ public: virtual void WriteUserData (OUString&, bool bBrowse = false) override; virtual void ReadUserData (const OUString&, bool bBrowse = false) override; virtual SdrView* GetDrawView() const override; - virtual void AdjustPosSizePixel (const Point &rOfs, const Size &rSize) override; /** When <TRUE/> is given, then the mouse shape is set to hour glass (or whatever the busy shape looks like on the system.) diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx index 5c7acb0b8f10..b199ae4263cd 100644 --- a/sd/source/ui/inc/fucon3d.hxx +++ b/sd/source/ui/inc/fucon3d.hxx @@ -38,13 +38,10 @@ public: virtual void DoExecute( SfxRequest& rReq ) override; // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) override; - virtual bool MouseMove(const MouseEvent& rMEvt) override; virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; virtual void Activate() override; - virtual void Deactivate() override; virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) override; diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx index aae040205a9c..de3ed819f613 100644 --- a/sd/source/ui/inc/fuconarc.hxx +++ b/sd/source/ui/inc/fuconarc.hxx @@ -33,13 +33,10 @@ public: virtual void DoExecute( SfxRequest& rReq ) override; // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) override; - virtual bool MouseMove(const MouseEvent& rMEvt) override; virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; virtual void Activate() override; - virtual void Deactivate() override; virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) override; diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index 55958d06d767..f43069632ae0 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -35,8 +35,6 @@ public: static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) override; - virtual bool MouseMove(const MouseEvent& rMEvt) override; virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx index 41faf9c79543..c8b058b33515 100644 --- a/sd/source/ui/inc/fuconcs.hxx +++ b/sd/source/ui/inc/fuconcs.hxx @@ -37,8 +37,6 @@ public: virtual void DoExecute( SfxRequest& rReq ) override; // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) override; - virtual bool MouseMove(const MouseEvent& rMEvt) override; virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx index 05026ea1726f..0ab328bb2b0c 100644 --- a/sd/source/ui/inc/fuconrec.hxx +++ b/sd/source/ui/inc/fuconrec.hxx @@ -41,8 +41,6 @@ public: virtual void DoExecute( SfxRequest& rReq ) override; // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) override; - virtual bool MouseMove(const MouseEvent& rMEvt) override; virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx index 142ee5f9e984..76c91a4485c3 100644 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/source/ui/inc/fuconuno.hxx @@ -37,8 +37,6 @@ public: virtual void DoExecute( SfxRequest& rReq ) override; // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt) override; - virtual bool MouseMove(const MouseEvent& rMEvt) override; virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx index 630006414eae..084161d2a22e 100644 --- a/sd/source/ui/inc/fudraw.hxx +++ b/sd/source/ui/inc/fudraw.hxx @@ -43,7 +43,6 @@ public: virtual bool RequestHelp(const HelpEvent& rHEvt) override; virtual void Activate() override; - virtual void Deactivate() override; virtual void ForcePointer(const MouseEvent* pMEvt = nullptr); diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index 49cb439a358f..610628328af8 100644 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/source/ui/inc/futext.hxx @@ -46,7 +46,6 @@ public: virtual bool MouseMove(const MouseEvent& rMEvt) override; virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual bool Command(const CommandEvent& rCEvt) override; virtual bool RequestHelp(const HelpEvent& rHEvt) override; virtual void ReceiveRequest(SfxRequest& rReq) override; virtual void DoubleClick(const MouseEvent& rMEvt) override; diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 67baa4f42d34..8b8f8c313167 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -294,11 +294,6 @@ void ShowWindow::LoseFocus() TerminateShow(); } -void ShowWindow::Resize() -{ - ::sd::Window::Resize(); -} - void ShowWindow::Move() { ::sd::Window::Move(); diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index af2f01637f0d..9e0aa32708c8 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -69,7 +69,6 @@ public: void RestartShow( sal_Int32 nPageIndexToRestart ); virtual void Move() override; - virtual void Resize() override; virtual void GetFocus() override; virtual void LoseFocus() override; diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 0dc10f44207c..6ef12537eaa9 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -585,16 +585,6 @@ void SelectionFunction::MoveFocus ( } } -void SelectionFunction::Activate() -{ - FuPoor::Activate(); -} - -void SelectionFunction::Deactivate() -{ - FuPoor::Deactivate(); -} - void SelectionFunction::DoCut() { if ( ! mrSlideSorter.GetProperties()->IsUIReadOnly()) diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index 935b4a6c2743..ccc8048c260a 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -50,9 +50,6 @@ public: virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void Activate() override; - virtual void Deactivate() override; - /// Forward to the clipboard manager. virtual void DoCut() override; diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index a5cda27ed6c7..668974e5c5c3 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -813,11 +813,6 @@ SdrView* ViewShellBase::GetDrawView() const return SfxViewShell::GetDrawView(); } -void ViewShellBase::AdjustPosSizePixel (const Point &rOfs, const Size &rSize) -{ - SfxViewShell::AdjustPosSizePixel (rOfs, rSize); -} - void ViewShellBase::SetBusyState (bool bBusy) { if (GetDocShell() != nullptr) diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 19efdac3cf02..3ccb4290196a 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -119,11 +119,6 @@ void Ruler::MouseButtonDown(const MouseEvent& rMEvt) SvxRuler::MouseButtonDown(rMEvt); } -void Ruler::MouseMove(const MouseEvent& rMEvt) -{ - SvxRuler::MouseMove(rMEvt); -} - void Ruler::MouseButtonUp(const MouseEvent& rMEvt) { SvxRuler::MouseButtonUp(rMEvt); diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 889259f25ff7..2f6c5c9016aa 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -116,9 +116,6 @@ public: protected: virtual void addCustomHandles( SdrHdlList& rHandlerList ) override; - virtual void disposing() override; - virtual void select() override; - virtual void deselect() override; private: SdrObjectWeakRef mxPlaceholderObj; @@ -397,21 +394,6 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) } } -void ChangePlaceholderTag::disposing() -{ - SmartTag::disposing(); -} - -void ChangePlaceholderTag::select() -{ - SmartTag::select(); -} - -void ChangePlaceholderTag::deselect() -{ - SmartTag::deselect(); -} - ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase ) : mrBase( rViewShellBase ) , mnUpdateTagsEvent( nullptr ) diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 5afb353de4e0..b9fb2c28287a 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -76,10 +76,8 @@ public: void SetWrappedWindow(vcl::Window* const pWindow); virtual void StateChanged( StateChangedType nType ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; virtual void Resize() override; virtual void Resizing( Size& rSize ) override; - virtual bool Close() override; }; namespace @@ -266,11 +264,6 @@ void SfxTitleDockingWindow::SetWrappedWindow( vcl::Window* const pWindow ) } } -bool SfxTitleDockingWindow::Notify( NotifyEvent& rNEvt ) -{ - return SfxDockingWindow::Notify( rNEvt ); -} - void SfxTitleDockingWindow::StateChanged( StateChangedType nType ) { if ( nType == StateChangedType::InitShow ) @@ -300,11 +293,6 @@ void SfxTitleDockingWindow::Resizing( Size &rSize ) m_pWrappedWindow->SetSizePixel( GetOutputSizePixel() ); } -bool SfxTitleDockingWindow::Close() -{ - return SfxDockingWindow::Close(); -} - namespace { struct ChildrenRegisteredMap : public rtl::Static< bool, ChildrenRegisteredMap > {}; diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index 7c5f4fa87e31..6f2f1fe34d0f 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -138,18 +138,6 @@ SfxPartDockWnd_Impl::SfxPartDockWnd_Impl } -void SfxPartDockWnd_Impl::Resize() - -/* [Description] - - Adjusting the size of the controls wrt the new window size -*/ - -{ - SfxDockingWindow::Resize(); -} - - bool SfxPartDockWnd_Impl::QueryClose() { bool bClose = true; diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 9873b0018457..39e6bcd92ed1 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -123,7 +123,6 @@ public: SplitWindow::dispose(); } - virtual void MouseMove( const MouseEvent& ) override; virtual void AutoHide() override; virtual void FadeIn() override; void Actualize(); @@ -179,12 +178,6 @@ void SfxSplitWindow::MouseButtonDown( const MouseEvent& rMEvt ) SplitWindow::MouseButtonDown( rMEvt ); } -void SfxEmptySplitWin_Impl::MouseMove( const MouseEvent& rMEvt ) -{ - SplitWindow::MouseMove( rMEvt ); -} - - SfxSplitWindow::SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl, SfxWorkWindow *pW, bool bWithButtons, WinBits nBits ) diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 879fcd9ebdb9..197a55e4fd5e 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -88,19 +88,6 @@ void SfxStyleDialog::dispose() } -void SfxStyleDialog::RefreshInputSet() - -/* [Description] - - This is called when <SfxTabPage::DeactivatePage(SfxItemSet *)> - returns <DeactivateRC::RefreshSet>. -*/ - -{ - SfxTabDialog::RefreshInputSet(); -} - - short SfxStyleDialog::Ok() /* [Description] diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 58c16e404dd1..2a3bb535189c 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -426,14 +426,6 @@ bool StyleTreeListBox_Impl::DoubleClickHdl() return false; } -/** Command Handler; this executes a PopupMenu (designer-specific) - SV virtual method. -*/ -void StyleTreeListBox_Impl::Command( const CommandEvent& rCEvt ) -{ - SvTreeListBox::Command(rCEvt); -} - bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt ) { // handle <RETURN> as double click diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx index e629f1390aa2..730c603c0789 100644 --- a/sfx2/source/inc/partwnd.hxx +++ b/sfx2/source/inc/partwnd.hxx @@ -58,7 +58,6 @@ public: class SfxPartDockWnd_Impl : public SfxDockingWindow { protected: - virtual void Resize() override; virtual bool Notify( NotifyEvent& rNEvt ) override; public: diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 13e36c5f1f9a..0ffb548a11c7 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -97,7 +97,6 @@ private: OUString aStyle; protected: - virtual void Command(const CommandEvent& rMEvt) override; virtual bool Notify(NotifyEvent& rNEvt) override; virtual bool DoubleClickHdl() override; virtual bool ExpandingHdl() override; diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index 9c05ddedc352..8b2bb7bd67ca 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -137,11 +137,6 @@ bool Panel::HasIdPredicate (const OUString& rsId) const return msPanelId.equals(rsId); } -void Panel::Paint (vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) -{ - Window::Paint(rRenderContext, rUpdateArea); -} - void Panel::Resize() { Window::Resize(); @@ -156,11 +151,6 @@ void Panel::Resize() } } -void Panel::Activate() -{ - Window::Activate(); -} - void Panel::DataChanged (const DataChangedEvent& rEvent) { (void)rEvent; diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index c47957292fd4..e76773198fd2 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -77,12 +77,6 @@ void SidebarDockingWindow::GetFocus() SfxDockingWindow::GetFocus(); } -// fdo#87217 -bool SidebarDockingWindow::Close() -{ - return SfxDockingWindow::Close(); -} - SfxChildAlignment SidebarDockingWindow::CheckAlignment ( SfxChildAlignment eCurrentAlignment, SfxChildAlignment eRequestedAlignment) diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 4dd498b52a90..e89a25e88175 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -189,22 +189,6 @@ void SAL_CALL SfxStatusBarControl::release() throw() } -// XEventListener -void SAL_CALL SfxStatusBarControl::disposing( const lang::EventObject& aEvent ) -throw( uno::RuntimeException, std::exception ) -{ - svt::StatusbarController::disposing( aEvent ); -} - - -// XComponent -void SAL_CALL SfxStatusBarControl::dispose() -throw (uno::RuntimeException, std::exception) -{ - svt::StatusbarController::dispose(); -} - - // XStatusListener void SAL_CALL SfxStatusBarControl::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 9a250b81c7fb..e17f67e67b3e 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -420,12 +420,6 @@ void SfxToolBoxControl::Dispatch( const OUString& aCommand, css::uno::Sequence< } } -void SAL_CALL SfxToolBoxControl::disposing( const css::lang::EventObject& aEvent ) -throw( css::uno::RuntimeException, std::exception ) -{ - svt::ToolboxController::disposing( aEvent ); -} - // XStatusListener void SAL_CALL SfxToolBoxControl::statusChanged( const FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 40de4e42fe98..ccc903754bb5 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -85,7 +85,6 @@ protected: aFormulaDrawPos = rPos; } - virtual void DataChanged( const DataChangedEvent& ) override; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; virtual void KeyInput(const KeyEvent& rKEvt) override; virtual void Command(const CommandEvent& rCEvt) override; diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index dd8bcb2d13f9..82c6e96955e5 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -145,12 +145,6 @@ void SmGraphicWindow::ApplyColorConfigValues(const svtools::ColorConfig &rColorC } -void SmGraphicWindow::DataChanged( const DataChangedEvent& rEvt ) -{ - ScrollableWindow::DataChanged( rEvt ); -} - - void SmGraphicWindow::MouseButtonDown(const MouseEvent& rMEvt) { ScrollableWindow::MouseButtonDown(rMEvt); diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx index f98b6d6ec418..218f9e8d9ef1 100644 --- a/svgio/qa/cppunit/SvgImportTest.cxx +++ b/svgio/qa/cppunit/SvgImportTest.cxx @@ -65,7 +65,6 @@ class Test : public test::BootstrapFixture, public XmlTestTools Primitive2DSequence parseSvg(const char* aSource); public: - virtual void setUp() override; virtual void tearDown() override; CPPUNIT_TEST_SUITE(Test); @@ -114,11 +113,6 @@ Primitive2DSequence Test::parseSvg(const char* aSource) return xSvgParser->getDecomposition(aInputStream, aPath); } -void Test::setUp() -{ - BootstrapFixture::setUp(); -} - void Test::tearDown() { BootstrapFixture::tearDown(); diff --git a/svtools/inc/vclxaccessibleheaderbar.hxx b/svtools/inc/vclxaccessibleheaderbar.hxx index 165793a615d4..bcf640d6c7e8 100644 --- a/svtools/inc/vclxaccessibleheaderbar.hxx +++ b/svtools/inc/vclxaccessibleheaderbar.hxx @@ -39,9 +39,6 @@ public: VclPtr<HeaderBar> m_pHeadBar; virtual ~VCLXAccessibleHeaderBar(); - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; - virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override; - VCLXAccessibleHeaderBar( VCLXWindow* pVCLXindow ); // XAccessibleContext diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx index 22691670b750..9db299802b1d 100644 --- a/svtools/source/brwbox/brwhead.cxx +++ b/svtools/source/brwbox/brwhead.cxx @@ -61,12 +61,6 @@ void BrowserHeader::Command( const CommandEvent& rCEvt ) } -void BrowserHeader::Select() -{ - HeaderBar::Select(); -} - - void BrowserHeader::EndDrag() { // call before other actions, it looks more nice in most cases diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index e27f192f657a..f56e06c527ba 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -396,12 +396,6 @@ namespace svt } - void EditBrowseBox::ImplTracking() - { - BrowseBox::ImplTracking(); - } - - void EditBrowseBox::ImplEndTracking() { if ( bActiveBeforeTracking ) diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index f0345af5143a..c334f5addfa3 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -377,11 +377,6 @@ sal_uLong SvTabListBox::GetEntryPos( const SvTreeListEntry* pEntry ) const return 0xffffffff; } -void SvTabListBox::Resize() -{ - SvTreeListBox::Resize(); -} - // static OUString SvTabListBox::GetToken( const OUString &sStr, sal_Int32& nIndex ) { diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 542731b37d69..7fc2b0f1bc24 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -1061,12 +1061,6 @@ bool SvtURLBox::ProcessKey( const vcl::KeyCode& rKey ) } -void SvtURLBox::Modify() -{ - ComboBox::Modify(); -} - - bool SvtURLBox::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetWindow() == GetSubEdit() && rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 0662e0693d95..5d6c352137dd 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -318,7 +318,6 @@ public: private: void ImplTrack( const Point& rScreenPos ); - virtual void dispose() override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void Tracking( const TrackingEvent& rTEvt ) override; virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override; @@ -336,11 +335,6 @@ ImplTabSizer::ImplTabSizer( TabBar* pParent, WinBits nWinStyle ) SetSizePixel(Size(7 * nScaleFactor, 0)); } -void ImplTabSizer::dispose() -{ - vcl::Window::dispose(); -} - void ImplTabSizer::ImplTrack( const Point& rScreenPos ) { TabBar* pParent = GetParent(); diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx index 7065e6dcf295..4185be0ab2f8 100644 --- a/svtools/source/control/vclxaccessibleheaderbar.cxx +++ b/svtools/source/control/vclxaccessibleheaderbar.cxx @@ -65,18 +65,6 @@ VCLXAccessibleHeaderBar::~VCLXAccessibleHeaderBar() } -void VCLXAccessibleHeaderBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) -{ - VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent ); -} - - -void VCLXAccessibleHeaderBar::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) -{ - VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet ); -} - - // XServiceInfo diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index b83ca08fb1d2..c7cab7046020 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -43,11 +43,6 @@ namespace svt disposeOnce(); } - void OWizardPage::dispose() - { - TabPage::dispose(); - } - void OWizardPage::initializePage() { } diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index b1a977b7c7b6..39e651c5ab5a 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -188,16 +188,6 @@ void SAL_CALL PopupWindowController::execute( sal_Int16 KeyModifier ) throw (Run svt::ToolboxController::execute( KeyModifier ); } -void SAL_CALL PopupWindowController::click() throw (RuntimeException, std::exception) -{ - svt::ToolboxController::click(); -} - -void SAL_CALL PopupWindowController::doubleClick() throw (RuntimeException, std::exception) -{ - svt::ToolboxController::doubleClick(); -} - Reference< awt::XWindow > SAL_CALL PopupWindowController::createPopupWindow() throw (RuntimeException, std::exception) { VclPtr< ToolBox > pToolBox = dynamic_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ).get() ); diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index b6b5fa5c1ea6..3c6f3ca77a26 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -212,12 +212,6 @@ void TreeControlPeer::disposeControl() } -void TreeControlPeer::SetWindow( const VclPtr< vcl::Window > &pWindow ) -{ - VCLXWindow::SetWindow( pWindow ); -} - - UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uLong nPos /* = TREELIST_APPEND */ ) { UnoTreeListEntry* pEntry = nullptr; diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx index c1d8f9ba787e..545b81398741 100644 --- a/svtools/source/uno/treecontrolpeer.hxx +++ b/svtools/source/uno/treecontrolpeer.hxx @@ -57,9 +57,6 @@ public: vcl::Window* createVclControl( vcl::Window* pParent, sal_Int64 nWinStyle ); - // VCLXWindow - virtual void SetWindow( const VclPtr< vcl::Window > &pWindow ) override; - // css::view::XSelectionSupplier virtual sal_Bool SAL_CALL select( const css::uno::Any& xSelection ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getSelection( ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 4ba77b9ba492..cbe50ac633a8 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -815,11 +815,6 @@ void IMapWindow::CreateDefaultObject() } } -void IMapWindow::KeyInput( const KeyEvent& rKEvt ) -{ - GraphCtrl::KeyInput( rKEvt ); -} - void IMapWindow::SelectFirstObject() { SdrPage* pPage = pModel->GetPage( 0 ); diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 2ef4eeea41c1..74974a5b003d 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -137,8 +137,6 @@ public: void CreateDefaultObject(); void SelectFirstObject(); void StartPolyEdit(); - - virtual void KeyInput( const KeyEvent& rKEvt ) override; }; diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 281ffefa8fe8..650cb12a91d7 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2185,12 +2185,6 @@ namespace svxform } - bool DataNavigator::Close() - { - return SfxDockingWindow::Close(); - } - - Size DataNavigator::CalcDockingSize( SfxChildAlignment eAlign ) { if ( ( eAlign == SfxChildAlignment::TOP ) || ( eAlign == SfxChildAlignment::BOTTOM ) ) diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index f989ff1b964b..f81e8cb0eb94 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -614,17 +614,6 @@ FmXFormShell_Base_Disambiguation::FmXFormShell_Base_Disambiguation( ::osl::Mutex { } -void SAL_CALL FmXFormShell_Base_Disambiguation::disposing() -{ - WeakComponentImplHelperBase::disposing(); - // Note: - // This is a HACK. - // Normally it should be sufficient to call the "disposing" of our direct - // base class, but SUN PRO 5 does not like this and claims there is a conflict - // with the XEventListener::disposing(EventObject) of our various listener - // base classes. -} - FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) :FmXFormShell_BASE(m_aMutex) ,FmXFormShell_CFGBASE(OUString("Office.Common/Misc"), ConfigItemMode::DelayedUpdate) diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index e9b06b34a04c..6e507f95bb3d 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -257,12 +257,6 @@ bool FmFieldWin::PreNotify( NotifyEvent& _rNEvt ) } -bool FmFieldWin::Close() -{ - return SfxFloatingWindow::Close(); -} - - void FmFieldWin::_propertyChanged(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) { css::uno::Reference< css::form::XForm > xForm(evt.Source, css::uno::UNO_QUERY); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 81b4ddff09cd..83d44467088b 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -379,7 +379,6 @@ namespace svxform protected: virtual void Resize() override; - virtual bool Close() override; virtual void GetFocus() override; virtual Size CalcDockingSize( SfxChildAlignment ) override; virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ) override; diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 430b269543ce..d42f13fcd21a 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -135,7 +135,7 @@ class FmXFormShell_Base_Disambiguation : public FmXFormShell_BD_BASE using css::beans::XPropertyChangeListener::disposing; protected: FmXFormShell_Base_Disambiguation( ::osl::Mutex& _rMutex ); - virtual void SAL_CALL disposing() override; + using WeakComponentImplHelperBase::disposing; }; diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index 2774ccbc035b..07b09e00b6de 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -83,7 +83,7 @@ public: virtual ~FmFieldWin(); virtual void dispose() override; virtual void Resize() override; - virtual bool Close() override; + using SfxFloatingWindow::Close; virtual void GetFocus() override; virtual bool PreNotify( NotifyEvent& _rNEvt ) override; virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.cxx b/svx/source/sidebar/styles/StylesPropertyPanel.cxx index 5c1631c694ec..c93277f0913e 100644 --- a/svx/source/sidebar/styles/StylesPropertyPanel.cxx +++ b/svx/source/sidebar/styles/StylesPropertyPanel.cxx @@ -28,11 +28,6 @@ StylesPropertyPanel::~StylesPropertyPanel() disposeOnce(); } -void StylesPropertyPanel::dispose() -{ - PanelLayout::dispose(); -} - void StylesPropertyPanel::DataChanged( const DataChangedEvent& /*rEvent*/) { diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.hxx b/svx/source/sidebar/styles/StylesPropertyPanel.hxx index 1b16267bff53..dcbd210086ad 100644 --- a/svx/source/sidebar/styles/StylesPropertyPanel.hxx +++ b/svx/source/sidebar/styles/StylesPropertyPanel.hxx @@ -20,7 +20,6 @@ class StylesPropertyPanel: { public: virtual ~StylesPropertyPanel(); - virtual void dispose() override; static VclPtr<vcl::Window> Create ( vcl::Window* pParent, diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 7b3d6a94a193..0f4acc0f137e 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -1409,10 +1409,6 @@ sal_uInt16 SdrObjCustomShape::GetObjIdentifier() const } -void SdrObjCustomShape::RecalcSnapRect() -{ - SdrTextObj::RecalcSnapRect(); -} const Rectangle& SdrObjCustomShape::GetSnapRect() const { return SdrTextObj::GetSnapRect(); @@ -2177,11 +2173,6 @@ void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat ) bSnapRectDirty=true; } -bool SdrObjCustomShape::BegCreate( SdrDragStat& rDrag ) -{ - return SdrTextObj::BegCreate( rDrag ); -} - bool SdrObjCustomShape::MovCreate(SdrDragStat& rStat) { SdrView* pView = rStat.GetView(); // #i37448# @@ -2546,10 +2537,6 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight() } return bRet; } -bool SdrObjCustomShape::BegTextEdit( SdrOutliner& rOutl ) -{ - return SdrTextObj::BegTextEdit( rOutl ); -} void SdrObjCustomShape::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const { Size aPaperMin,aPaperMax; diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index dfd94564165a..c47647b853b2 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -639,27 +639,11 @@ const Point& SdrCaptionObj::GetAnchorPos() const return SdrRectObj::GetAnchorPos(); } -void SdrCaptionObj::RecalcSnapRect() -{ - SdrRectObj::RecalcSnapRect(); - // #i32599# - // TODO: Implementation missing. -} - const Rectangle& SdrCaptionObj::GetSnapRect() const { return SdrRectObj::GetSnapRect(); } -void SdrCaptionObj::NbcSetSnapRect(const Rectangle& rRect) -{ - // #i32599# - // Move back to see the rectangle of the underlying SdrRectObj - // as the SnapRect, without the TailPos. That simplifies SnapRect - // handling again, if not allows it at all... - SdrRectObj::NbcSetSnapRect(rRect); -} - const Rectangle& SdrCaptionObj::GetLogicRect() const { return maRect; diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 2dc637106cb2..4fd6ce448b66 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -944,16 +944,6 @@ void SdrGrafObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShea SdrRectObj::NbcShear(rRef, nAngle, tn, bVShear); } -void SdrGrafObj::NbcSetSnapRect(const Rectangle& rRect) -{ - SdrRectObj::NbcSetSnapRect(rRect); -} - -void SdrGrafObj::NbcSetLogicRect( const Rectangle& rRect) -{ - SdrRectObj::NbcSetLogicRect(rRect); -} - SdrObjGeoData* SdrGrafObj::NewGeoData() const { return new SdrGrafObjGeoData; diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 587363daf1dc..d8d59494b759 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -128,11 +128,6 @@ void SdrVirtObj::RecalcBoundRect() aOutRect+=aAnchor; } -void SdrVirtObj::SetChanged() -{ - SdrObject::SetChanged(); -} - SdrVirtObj* SdrVirtObj::Clone() const { return new SdrVirtObj(this->rRefObj); // only a further reference diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 3c6491caabd1..47245fa2de70 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -385,18 +385,6 @@ awt::Size SAL_CALL AccessibleCell::getSize() throw (RuntimeException, std::excep } -void SAL_CALL AccessibleCell::addFocusListener ( const css::uno::Reference< css::awt::XFocusListener >& xListener) throw (css::uno::RuntimeException) -{ - AccessibleComponentBase::addFocusListener( xListener ); -} - - -void SAL_CALL AccessibleCell::removeFocusListener (const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) -{ - AccessibleComponentBase::removeFocusListener( xListener ); -} - - void SAL_CALL AccessibleCell::grabFocus() throw (css::uno::RuntimeException, std::exception) { AccessibleComponentBase::grabFocus(); diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index 0279b6a96fbb..df9de137c21b 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -83,8 +83,6 @@ public: virtual css::awt::Point SAL_CALL getLocation() throw(css::uno::RuntimeException, std::exception) override; virtual css::awt::Point SAL_CALL getLocationOnScreen() throw(css::uno::RuntimeException, std::exception) override; virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addFocusListener ( const css::uno::Reference< css::awt::XFocusListener >& xListener) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeFocusListener (const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override; virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getForeground() throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground() throw(css::uno::RuntimeException, std::exception) override; diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 73e82524660c..8657a59a0a4c 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -2046,14 +2046,6 @@ bool SdrTableObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2D return SdrTextObj::TRGetBaseGeometry( rMatrix, rPolyPolygon ); } -// sets the base geometry of the object using infos contained in the homogen 3x3 matrix. -// If it's an SdrPathObj it will use the provided geometry information. The Polygon has -// to use (0,0) as upper left and will be scaled to the given size in the matrix. -void SdrTableObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon ) -{ - SdrTextObj::TRSetBaseGeometry( rMatrix, rPolyPolygon ); -} - bool SdrTableObj::IsReallyEdited() const { return pEdtOutl && pEdtOutl->IsModified(); diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index e7062289ca48..a63520ca57f4 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -339,18 +339,6 @@ void TableModel::dispose() throw (RuntimeException, std::exception) } -void SAL_CALL TableModel::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) -{ - TableModelBase::addEventListener( xListener ); -} - - -void SAL_CALL TableModel::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) -{ - TableModelBase::removeEventListener( xListener ); -} - - // XModifiable diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx index 3f6f82b6f697..3a03b5173784 100644 --- a/svx/source/table/tablemodel.hxx +++ b/svx/source/table/tablemodel.hxx @@ -99,8 +99,6 @@ public: // XComponent virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XModifiable virtual sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 8dd2ed669fd9..cd37b984df68 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -305,16 +305,6 @@ void SvxMetricField::ReleaseFocus_Impl() } } -void SvxMetricField::Down() -{ - MetricField::Down(); -} - -void SvxMetricField::Up() -{ - MetricField::Up(); -} - void SvxMetricField::SetCoreUnit( SfxMapUnit eUnit ) { ePoolUnit = eUnit; diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index ef930dd858e2..54c8a686e69e 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -483,12 +483,6 @@ void SvxLineEndWindow::StartSelection() } -bool SvxLineEndWindow::Close() -{ - return SfxPopupWindow::Close(); -} - - void SvxLineEndWindow::StateChanged( sal_uInt16 nSID, SfxItemState, const SfxPoolItem* pState ) { diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk index b9644edbbd0c..8196f08d336c 100644 --- a/sw/CppunitTest_sw_uwriter.mk +++ b/sw/CppunitTest_sw_uwriter.mk @@ -51,6 +51,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uwriter, \ tk \ tl \ ucbhelper \ + unotest \ utl \ vbahelper \ vcl \ diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 7bb7d123a17a..733a20c70517 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -188,7 +188,6 @@ class SwSidebarWin : public vcl::Window void SetCursorLogicPosition(const Point& rPosition, bool bPoint, bool bClearMark); protected: - virtual void DataChanged( const DataChangedEvent& aEvent) override; virtual void LoseFocus() override; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; virtual void GetFocus() override; diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 2e9355c8d935..49f240442841 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -222,9 +222,6 @@ public: void dispose(); - virtual void SAL_CALL acquire( ) throw () override; - virtual void SAL_CALL release( ) throw () override; - void InvalidateIterator(); protected: diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 5acb95c351d7..439223af6f20 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -42,13 +42,6 @@ class SwDoc; class SwFmDrawPage : public SvxFmDrawPage { SdrPageView* pPageView; -protected: - - // Create a SdrObject according to a description. Can be used by derived classes to - // support own css::drawing::Shapes (e.g. controls). - virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xShape ) - throw (css::uno::RuntimeException, std::exception) override; - public: SwFmDrawPage( SdrPage* pPage ); virtual ~SwFmDrawPage() throw (); diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index 939e823a07dc..41d1b64b143e 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -300,12 +300,6 @@ public: const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL acquire( ) throw () override - { SwAccessibleTable::acquire(); }; - - virtual void SAL_CALL release( ) throw () override - { SwAccessibleTable::release(); }; - // XAccessibleContext /// Return the number of currently visible children. diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index d8d7ff42894b..8082ad4dcf9a 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -294,13 +294,6 @@ uno::Reference< uno::XInterface > SwFmDrawPage::GetInterface( SdrObject* pObj return xShape; } -SdrObject* SwFmDrawPage::CreateSdrObject_( const uno::Reference< drawing::XShape > & xShape ) - throw (uno::RuntimeException, std::exception) -{ - //FIXME: just a redirect call - can this method be deleted? - return SvxFmDrawPage::CreateSdrObject_( xShape ); -} - uno::Reference< drawing::XShape > SwFmDrawPage::CreateShape( SdrObject *pObj ) const throw (uno::RuntimeException, std::exception) { diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 33b78477fd3f..91c5c3b21786 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -2363,16 +2363,6 @@ SwDocStyleSheetPool::SwDocStyleSheetPool( SwDoc& rDocument, bool bOrg ) { } -void SAL_CALL SwDocStyleSheetPool::acquire( ) throw () -{ - comphelper::OWeakTypeObject::acquire(); -} - -void SAL_CALL SwDocStyleSheetPool::release( ) throw () -{ - comphelper::OWeakTypeObject::release(); -} - SfxStyleSheetBase& SwDocStyleSheetPool::Make( const OUString& rName, SfxStyleFamily eFam, sal_uInt16 _nMask) diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index 3a23913d288d..0788cb9f091b 100644 --- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx +++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx @@ -94,9 +94,6 @@ public: // XComponent virtual void SAL_CALL dispose() throw (uno::RuntimeException, std::exception) override; - // XInitialization - virtual void SAL_CALL initialize(const uno::Sequence< uno::Any >& aArguments) throw (uno::Exception, uno::RuntimeException, std::exception) override; - // XToolbarController virtual uno::Reference<awt::XWindow> SAL_CALL createItemWindow(const uno::Reference<awt::XWindow>& rParent) throw (uno::RuntimeException, std::exception) override; @@ -162,9 +159,6 @@ public: // XComponent virtual void SAL_CALL dispose() throw (uno::RuntimeException, std::exception) override; - // XInitialization - virtual void SAL_CALL initialize(const uno::Sequence< uno::Any >& aArguments) throw (uno::Exception, uno::RuntimeException, std::exception) override; - // XToolbarController virtual uno::Reference<awt::XWindow> SAL_CALL createItemWindow(const uno::Reference<awt::XWindow>& rParent) throw (uno::RuntimeException, std::exception) override; @@ -180,11 +174,6 @@ void MMCurrentEntryController::dispose() throw (uno::RuntimeException, std::exce m_pCurrentEdit.disposeAndClear(); } -void MMCurrentEntryController::initialize(const uno::Sequence< uno::Any >& aArguments) throw (uno::Exception, uno::RuntimeException, std::exception) -{ - svt::ToolboxController::initialize(aArguments); -} - uno::Reference<awt::XWindow> MMCurrentEntryController::createItemWindow(const uno::Reference<awt::XWindow>& rParent) throw (uno::RuntimeException, std::exception) { vcl::Window* pParent = VCLUnoHelper::GetWindow(rParent); @@ -252,11 +241,6 @@ void MMExcludeEntryController::dispose() throw (uno::RuntimeException, std::exce m_pExcludeCheckbox.disposeAndClear(); } -void MMExcludeEntryController::initialize(const uno::Sequence< uno::Any >& aArguments) throw (uno::Exception, uno::RuntimeException, std::exception) -{ - svt::ToolboxController::initialize(aArguments); -} - uno::Reference<awt::XWindow> MMExcludeEntryController::createItemWindow(const uno::Reference<awt::XWindow>& rParent) throw (uno::RuntimeException, std::exception) { vcl::Window* pParent = VCLUnoHelper::GetWindow(rParent); diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 8fbd74042b48..9b60e19a8212 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -1187,11 +1187,6 @@ void SwSidebarWin::SetLanguage(const SvxLanguageItem& rNewItem) Invalidate(); } -void SwSidebarWin::DataChanged( const DataChangedEvent& aEvent) -{ - Window::DataChanged( aEvent ); -} - void SwSidebarWin::GetFocus() { if (mpSidebarTextControl) diff --git a/sw/source/uibase/inc/concustomshape.hxx b/sw/source/uibase/inc/concustomshape.hxx index e18604a3fc4d..80de599e227f 100644 --- a/sw/source/uibase/inc/concustomshape.hxx +++ b/sw/source/uibase/inc/concustomshape.hxx @@ -39,7 +39,6 @@ class ConstCustomShape : public SwDrawBase ConstCustomShape( SwWrtShell* pSh, SwEditWin* pWin, SwView* pView, SfxRequest& rReq ); // Mouse- & Key-Events - virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; virtual void Activate(const sal_uInt16 nSlotId) override; // activate function diff --git a/sw/source/uibase/ribbar/concustomshape.cxx b/sw/source/uibase/ribbar/concustomshape.cxx index 96e660790cb3..aa158975f3fa 100644 --- a/sw/source/uibase/ribbar/concustomshape.cxx +++ b/sw/source/uibase/ribbar/concustomshape.cxx @@ -96,11 +96,6 @@ bool ConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt) return bReturn; } -bool ConstCustomShape::MouseButtonUp(const MouseEvent& rMEvt) -{ - return SwDrawBase::MouseButtonUp(rMEvt); -} - void ConstCustomShape::Activate(const sal_uInt16 nSlotId) { m_pWin->SetSdrDrawMode( OBJ_CUSTOMSHAPE ); diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index c28615dc7719..27e1488c1f28 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -131,11 +131,6 @@ void test::BootstrapFixture::setUp() test_init_impl(m_bAssertOnDialog, m_bNeedUCB, m_xSFactory.get()); } -void test::BootstrapFixture::tearDown() -{ - test::BootstrapFixtureBase::tearDown(); -} - test::BootstrapFixture::~BootstrapFixture() { } diff --git a/test/source/unoapi_test.cxx b/test/source/unoapi_test.cxx index c66d487da5c7..42e05e3e9a18 100644 --- a/test/source/unoapi_test.cxx +++ b/test/source/unoapi_test.cxx @@ -29,11 +29,6 @@ void UnoApiTest::setUp() CPPUNIT_ASSERT_MESSAGE("no desktop!", mxDesktop.is()); } -void UnoApiTest::tearDown() -{ - test::BootstrapFixture::tearDown(); -} - void UnoApiTest::createFileURL(const OUString& aFileBase, OUString& rFilePath) { rFilePath = m_directories.getSrcRootURL() + m_aBaseString + "/" + aFileBase; diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index e9a56413a0f3..70ff2170442c 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -340,8 +340,6 @@ class MyClass : public osl::DebugBase<MyClass>, public OWeakObject public: MyClass(); virtual ~MyClass(); - virtual void SAL_CALL acquire() throw () override; - virtual void SAL_CALL release() throw () override; }; @@ -353,17 +351,6 @@ MyClass::~MyClass() { } -void MyClass::acquire() throw () -{ - OWeakObject::acquire(); -} - -void MyClass::release() throw () -{ - OWeakObject::release(); -} - - static bool performTest( const Reference<XComponentContext> & xContext, const Reference<XBridgeTest > & xLBT, diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index cc1df948df44..7a4d0cc3d0b4 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -320,16 +320,6 @@ namespace cmis XTYPEPROVIDER_COMMON_IMPL( RepoContent ); - void SAL_CALL RepoContent::acquire() throw() - { - ContentImplHelper::acquire(); - } - - void SAL_CALL RepoContent::release() throw() - { - ContentImplHelper::release(); - } - uno::Any SAL_CALL RepoContent::queryInterface( const uno::Type & rType ) throw ( uno::RuntimeException, std::exception ) { return ContentImplHelper::queryInterface(rType); diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx index 42ba9bbbbc3b..ed9681279bbc 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.hxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx @@ -91,10 +91,6 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL acquire() - throw() override; - virtual void SAL_CALL release() - throw() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx index 25137c66081f..9efb0e992419 100644 --- a/unotools/source/streaming/streamhelper.cxx +++ b/unotools/source/streaming/streamhelper.cxx @@ -22,16 +22,6 @@ namespace utl { -void SAL_CALL OInputStreamHelper::acquire() throw () -{ - InputStreamHelper_Base::acquire(); -} - -void SAL_CALL OInputStreamHelper::release() throw () -{ - InputStreamHelper_Base::release(); -} - sal_Int32 SAL_CALL OInputStreamHelper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) { diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 1e88ab7287b4..bc9d74820f58 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -1049,7 +1049,7 @@ UcbLockBytes::UcbLockBytes() , m_bDontClose( false ) , m_bStreamValid (false) { - SetSynchronMode( true ); + SetSynchronMode(); } UcbLockBytes::~UcbLockBytes() @@ -1168,11 +1168,6 @@ void UcbLockBytes::terminate_Impl() } } -void UcbLockBytes::SetSynchronMode (bool bSynchron) -{ - SvLockBytes::SetSynchronMode (bSynchron); -} - ErrCode UcbLockBytes::ReadAt(sal_uInt64 const nPos, void *pBuffer, sal_uLong nCount, sal_uLong *pRead) const { @@ -1398,7 +1393,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo return nullptr; UcbLockBytesRef xLockBytes = new UcbLockBytes; - xLockBytes->SetSynchronMode( true ); + xLockBytes->SetSynchronMode(); Reference< XActiveDataControl > xSink; if ( eOpenMode & StreamMode::WRITE ) xSink = static_cast<XActiveDataControl*>(new UcbStreamer_Impl( xLockBytes )); diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx index ae3dbb6c7d21..875f5a03d6f3 100644 --- a/unotools/source/ucbhelper/ucblockbytes.hxx +++ b/unotools/source/ucbhelper/ucblockbytes.hxx @@ -102,7 +102,6 @@ public: static UcbLockBytesRef CreateLockBytes( const css::uno::Reference < css::io::XStream >& xContent ); // SvLockBytes - virtual void SetSynchronMode (bool bSynchron) override; virtual ErrCode ReadAt(sal_uInt64 nPos, void *pBuffer, sal_uLong nCount, sal_uLong *pRead) const override; virtual ErrCode WriteAt(sal_uInt64, const void*, sal_uLong, sal_uLong *pWritten) override; virtual ErrCode Flush() const override; diff --git a/vcl/inc/unx/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx index 576afd4fe3cc..059379b9482d 100644 --- a/vcl/inc/unx/cupsmgr.hxx +++ b/vcl/inc/unx/cupsmgr.hxx @@ -80,9 +80,6 @@ public: virtual bool endSpool( const OUString& rPrinterName, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner, const OUString& rFaxNumber ) override; virtual void setupJobContextData( JobData& rData ) override; - /// changes the info about a named printer - virtual void changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo ) override; - /// check if the printer configuration has changed virtual bool checkPrintersChanged( bool bWait ) override; diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 41e1336c65bb..13ea3d0cdd96 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -87,16 +87,6 @@ void Control::EnableRTL( bool bEnable ) OutputDevice::EnableRTL(bEnable); } -void Control::GetFocus() -{ - Window::GetFocus(); -} - -void Control::LoseFocus() -{ - Window::LoseFocus(); -} - void Control::Resize() { ImplClearLayoutData(); diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 970180a1bb9d..26c9887afd93 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -591,11 +591,6 @@ bool SpinField::Notify(NotifyEvent& rNEvt) return bDone || Edit::Notify(rNEvt); } -void SpinField::Command(const CommandEvent& rCEvt) -{ - Edit::Command(rCEvt); -} - void SpinField::FillLayoutData() const { if (mbSpin) diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 02363f4cdb87..50c4dfe7d770 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -64,7 +64,6 @@ public: virtual void TitleButtonClick( TitleButton nButton ) override; virtual void Pin() override; virtual void Roll() override; - virtual void PopupModeEnd() override; virtual void Resizing( Size& rSize ) override; virtual bool Close() override; }; @@ -270,11 +269,6 @@ void ImplDockFloatWin2::Roll() FloatingWindow::Roll(); } -void ImplDockFloatWin2::PopupModeEnd() -{ - FloatingWindow::PopupModeEnd(); -} - void ImplDockFloatWin2::Resizing( Size& rSize ) { FloatingWindow::Resizing( rSize ); diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 3ec763444b2c..da9ffc596c5e 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -80,7 +80,6 @@ public: virtual void TitleButtonClick( TitleButton nButton ) override; virtual void Pin() override; virtual void Roll() override; - virtual void PopupModeEnd() override; virtual void Resizing( Size& rSize ) override; virtual bool Close() override; }; @@ -233,11 +232,6 @@ void ImplDockFloatWin::Roll() FloatingWindow::Roll(); } -void ImplDockFloatWin::PopupModeEnd() -{ - FloatingWindow::PopupModeEnd(); -} - void ImplDockFloatWin::Resizing( Size& rSize ) { FloatingWindow::Resizing( rSize ); diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 31c7bbd04878..daf4dd16e5a3 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -648,11 +648,6 @@ void Splitter::KeyInput( const KeyEvent& rKEvt ) mbInKeyEvent = 0; } -bool Splitter::Notify( NotifyEvent& rNEvt ) -{ - return Window::Notify( rNEvt ); -} - void Splitter::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 46d173b65b9f..97d59e33d1ec 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -733,11 +733,6 @@ void StatusBar::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect rRenderContext.DrawLine(Point(0, 0), Point(mnDX-1, 0)); } -void StatusBar::Move() -{ - Window::Move(); -} - void StatusBar::Resize() { // save width and height diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index c5f07b500868..7e6601766b7a 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4532,11 +4532,6 @@ void ToolBox::statusChanged( const css::frame::FeatureStateEvent& Event ) } } -bool ToolBox::PrepareToggleFloatingMode() -{ - return DockingWindow::PrepareToggleFloatingMode(); -} - void ToolBox::SetStyle(WinBits nNewStyle) { mnWinStyle = nNewStyle; diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index 6f000e442f5f..cafaeedc120f 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -684,11 +684,6 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi return nJobID != 0; } -void CUPSManager::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo ) -{ - PrinterInfoManager::changePrinterInfo( rPrinter, rNewInfo ); -} - bool CUPSManager::checkPrintersChanged( bool bWait ) { bool bChanged = false; diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx index 9cf2280270f1..b43a0804bd43 100644 --- a/xmlhelp/source/cxxhelp/provider/content.cxx +++ b/xmlhelp/source/cxxhelp/provider/content.cxx @@ -69,22 +69,6 @@ Content::~Content() { } -// XInterface methods. - -// virtual -void SAL_CALL Content::acquire() - throw( ) -{ - ContentImplHelper::acquire(); -} - -// virtual -void SAL_CALL Content::release() - throw( ) -{ - ContentImplHelper::release(); -} - // virtual uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) throw ( uno::RuntimeException, std::exception ) diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx index 785143d21ee6..c5e1ea947c9a 100644 --- a/xmlhelp/source/cxxhelp/provider/content.hxx +++ b/xmlhelp/source/cxxhelp/provider/content.hxx @@ -53,10 +53,6 @@ namespace chelp // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL acquire() - throw() override; - virtual void SAL_CALL release() - throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() diff --git a/xmloff/CppunitTest_xmloff_uxmloff.mk b/xmloff/CppunitTest_xmloff_uxmloff.mk index cf2b0c693adf..7e517229b47f 100644 --- a/xmloff/CppunitTest_xmloff_uxmloff.mk +++ b/xmloff/CppunitTest_xmloff_uxmloff.mk @@ -44,6 +44,7 @@ $(eval $(call gb_CppunitTest_use_libraries,xmloff_uxmloff, \ svl \ test \ tl \ + unotest \ utl \ vcl \ $(gb_UWINAPI) \ diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 557d104bdb31..2229a56239ca 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -95,13 +95,6 @@ void SdXML3DObjectContext::StartElement(const uno::Reference< xml::sax::XAttribu } } -void SdXML3DObjectContext::EndElement() -{ - // call parent - SdXMLShapeContext::EndElement(); -} - - SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx index b66dbaece749..cf4b13669c1a 100644 --- a/xmloff/source/draw/ximp3dobject.hxx +++ b/xmloff/source/draw/ximp3dobject.hxx @@ -49,7 +49,6 @@ public: virtual ~SdXML3DObjectContext(); virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; - virtual void EndElement() override; }; // dr3d:3dcube context diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx index 18349cf43936..edbc4bb30d42 100644 --- a/xmloff/source/draw/ximplink.cxx +++ b/xmloff/source/draw/ximplink.cxx @@ -65,14 +65,4 @@ SvXMLImportContext* SdXMLShapeLinkContext::CreateChildContext( sal_uInt16 nPrefi } -void SdXMLShapeLinkContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttr ) -{ - SvXMLImportContext::StartElement( xAttr ); -} - -void SdXMLShapeLinkContext::EndElement() -{ - SvXMLImportContext::EndElement(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx index fac6b99382be..187cda328f34 100644 --- a/xmloff/source/draw/ximplink.hxx +++ b/xmloff/source/draw/ximplink.hxx @@ -47,8 +47,6 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; - virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; - virtual void EndElement() override; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPLINK_HXX diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx index 23272f3e6730..4f711bb042ce 100644 --- a/xmloff/source/draw/ximpnote.cxx +++ b/xmloff/source/draw/ximpnote.cxx @@ -100,9 +100,4 @@ SvXMLImportContext *SdXMLNotesContext::CreateChildContext( sal_uInt16 nPrefix, return SdXMLGenericPageContext::CreateChildContext(nPrefix, rLocalName, xAttrList); } -void SdXMLNotesContext::EndElement() -{ - SdXMLGenericPageContext::EndElement(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx index a27e33e52907..a53a5c70084c 100644 --- a/xmloff/source/draw/ximpnote.hxx +++ b/xmloff/source/draw/ximpnote.hxx @@ -42,7 +42,6 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; - virtual void EndElement() override; }; #endif // INCLUDED_XMLOFF_SOURCE_DRAW_XIMPNOTE_HXX diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx index f35fde9c4dfe..6b3df5fa947e 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -45,20 +45,6 @@ public: const OUString& rLocalName, const OUString& rQName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - - // StartElement is called after a context has been constructed and - // before a elements context is parsed. It may be used for actions that - // require virtual methods. The default is to do nothing. - virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - - // EndElement is called before a context will be destructed, but - // after a elements context has been parsed. It may be used for actions - // that require virtual methods. The default is to do nothing. - virtual void EndElement() override; - - // This method is called for all characters that are contained in the - // current element. The default is to ignore them. - virtual void Characters( const OUString& rChars ) override; }; XMLParagraphTransformerContext::XMLParagraphTransformerContext( @@ -82,21 +68,6 @@ rtl::Reference<XMLTransformerContext> XMLParagraphTransformerContext::CreateChil rQName, true ); } -void XMLParagraphTransformerContext::StartElement( const Reference< XAttributeList >& rAttrList ) -{ - XMLTransformerContext::StartElement( rAttrList ); -} - -void XMLParagraphTransformerContext::EndElement() -{ - XMLTransformerContext::EndElement(); -} - -void XMLParagraphTransformerContext::Characters( const OUString& rChars ) -{ - XMLTransformerContext::Characters( rChars ); -} - class XMLPersTextContentRNGTransformTContext : public XMLPersTextContentTContext { public: |