From 8a22bc93e0988188a87c0a787a9b32a7f74da84d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 22 Oct 2016 10:04:52 +0200 Subject: update unnecessaryoverride plugin to find pure forwarding methods which can be replaced with using declarations. Is there a more efficient way to code the search? Seems to slow the build down a little. Change-Id: I08cda21fa70dce6572e1acc71bf5e6df36bb951f Reviewed-on: https://gerrit.libreoffice.org/30157 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- dbaccess/source/core/api/query.hxx | 2 +- dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 5 ----- dbaccess/source/ui/inc/indexfieldscontrol.hxx | 2 +- dbaccess/source/ui/inc/sbagrid.hxx | 2 +- dbaccess/source/ui/inc/singledoccontroller.hxx | 2 +- dbaccess/source/ui/misc/singledoccontroller.cxx | 6 ------ dbaccess/source/ui/tabledesign/TableFieldControl.hxx | 4 ++-- 7 files changed, 6 insertions(+), 17 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx index c7d32d0aa4ca..16ce7a25463b 100644 --- a/dbaccess/source/core/api/query.hxx +++ b/dbaccess/source/core/api/query.hxx @@ -87,7 +87,7 @@ protected: // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; - ::cppu::IPropertyArrayHelper* getArrayHelper() { return OQuery_ArrayHelperBase::getArrayHelper(); } + using OQuery_ArrayHelperBase::getArrayHelper; public: OQuery( diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index a5f8509d9be1..a7e0ec20ab8c 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -284,11 +284,6 @@ namespace dbaui return true; } - bool IndexFieldsControl::IsModified() const - { - return EditBrowseBox::IsModified(); - } - bool IndexFieldsControl::SaveModified() { if (!IsModified()) diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 68586c62dfb3..3ddeca497062 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -62,7 +62,7 @@ namespace dbaui void commitTo(IndexFields& _rFields); bool SaveModified() override; - bool IsModified() const override; + using EditBrowseBox::IsModified; const IndexFields& GetSavedValue() const { return m_aSavedValue; } void SaveValue() { m_aSavedValue = m_aFields; } diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 4908ab97c826..4ca7001affb7 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -230,7 +230,7 @@ namespace dbaui virtual void ActivateCell(long nRow, sal_uInt16 nCol, bool bSetCellFocus = true) override; virtual void DeactivateCell(bool bUpdate = true) override; - void ActivateCell() { FmGridControl::ActivateCell(); } + using FmGridControl::ActivateCell; bool IsAllSelected() const { return (GetSelectRowCount() == GetRowCount()) && (GetRowCount() > 0); } diff --git a/dbaccess/source/ui/inc/singledoccontroller.hxx b/dbaccess/source/ui/inc/singledoccontroller.hxx index 8be66336e397..f1d5212044be 100644 --- a/dbaccess/source/ui/inc/singledoccontroller.hxx +++ b/dbaccess/source/ui/inc/singledoccontroller.hxx @@ -67,7 +67,7 @@ namespace dbaui virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager( ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; + using OSingleDocumentController_Base::disposing; private: ::std::unique_ptr< OSingleDocumentController_Data > m_pData; diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index 76c1245b1c7f..b1bd4936cab8 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -68,12 +68,6 @@ namespace dbaui m_pData->m_xUndoManager->disposing(); } - void SAL_CALL OSingleDocumentController::disposing( const EventObject& i_event ) throw( RuntimeException, std::exception ) - { - // simply disambiguate - OSingleDocumentController_Base::disposing( i_event ); - } - void OSingleDocumentController::ClearUndoManager() { GetUndoManager().Clear(); diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx index e8e84b7a0532..6706598c5267 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx @@ -48,8 +48,8 @@ namespace dbaui public: OTableFieldControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar); - OUString BoolStringPersistent(const OUString& rUIString) const { return OFieldDescControl::BoolStringPersistent(rUIString); } - OUString BoolStringUI(const OUString& rPersistentString) const { return OFieldDescControl::BoolStringUI(rPersistentString); } + using OFieldDescControl::BoolStringPersistent; + using OFieldDescControl::BoolStringUI; virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() override; virtual css::uno::Reference< css::sdbc::XConnection> getConnection() override; -- cgit