diff options
Diffstat (limited to 'extensions/source')
-rw-r--r-- | extensions/source/abpilot/fieldmappingpage.cxx | 6 | ||||
-rw-r--r-- | extensions/source/abpilot/fieldmappingpage.hxx | 1 | ||||
-rw-r--r-- | extensions/source/abpilot/tableselectionpage.cxx | 6 | ||||
-rw-r--r-- | extensions/source/abpilot/tableselectionpage.hxx | 1 | ||||
-rw-r--r-- | extensions/source/dbpilots/controlwizard.cxx | 6 | ||||
-rw-r--r-- | extensions/source/dbpilots/controlwizard.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/composeduiupdate.cxx | 16 |
7 files changed, 1 insertions, 37 deletions
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() ) |