From 6e72f0251bb8767942edf74f612547c12ca0cdf1 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 12 Jul 2016 08:21:27 +0200 Subject: new loplugin unnecessary override Change-Id: I88d3e33823d68745b98625050a8a274f9ef04bcb Reviewed-on: https://gerrit.libreoffice.org/27135 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann --- .../source/core/dataaccess/ComponentDefinition.hxx | 2 +- dbaccess/source/core/misc/apitools.cxx | 4 ---- .../ext/macromigration/macromigrationwizard.cxx | 6 ------ dbaccess/source/inc/apitools.hxx | 1 - dbaccess/source/ui/app/AppController.cxx | 25 ---------------------- dbaccess/source/ui/app/AppController.hxx | 7 ++---- dbaccess/source/ui/app/AppDetailView.cxx | 5 ----- dbaccess/source/ui/app/AppDetailView.hxx | 1 - dbaccess/source/ui/browser/sbagrid.cxx | 10 --------- dbaccess/source/ui/control/RelationControl.cxx | 2 +- dbaccess/source/ui/control/TableGrantCtrl.cxx | 5 ----- dbaccess/source/ui/inc/JoinController.hxx | 2 +- dbaccess/source/ui/inc/QueryTableView.hxx | 1 - dbaccess/source/ui/inc/TableGrantCtrl.hxx | 2 -- dbaccess/source/ui/inc/sbagrid.hxx | 3 +-- dbaccess/source/ui/querydesign/JoinController.cxx | 5 ----- dbaccess/source/ui/querydesign/QueryTableView.cxx | 5 ----- dbaccess/source/ui/querydesign/querycontroller.cxx | 2 +- 18 files changed, 7 insertions(+), 81 deletions(-) (limited to 'dbaccess') 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 createDialog( vcl::Window* _pParent ) override; - virtual void destroyDialog() override; private: Reference m_aContext; @@ -124,11 +123,6 @@ namespace dbmm return VclPtr::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(); 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()); } -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 OApplicationController::getContextMenu( Control& /*_rControl*/ ) const { return VclPtr::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& rConnection) override; - virtual void KeyInput(const KeyEvent& rEvt) override; virtual VclPtr 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& 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) -- cgit