diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /extensions/source/bibliography | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'extensions/source/bibliography')
-rw-r--r-- | extensions/source/bibliography/bibbeam.cxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/bibbeam.hxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/bibconfig.hxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/bibcont.hxx | 4 | ||||
-rw-r--r-- | extensions/source/bibliography/bibload.cxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/bibshortcuthandler.hxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/bibview.hxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/datman.cxx | 4 | ||||
-rw-r--r-- | extensions/source/bibliography/datman.hxx | 4 | ||||
-rw-r--r-- | extensions/source/bibliography/formcontrolcontainer.hxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/framectr.cxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/framectr.hxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/general.hxx | 2 | ||||
-rw-r--r-- | extensions/source/bibliography/toolbar.hxx | 10 |
14 files changed, 21 insertions, 21 deletions
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index 812b30568c44..d0a488dc77b1 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -85,7 +85,7 @@ namespace bib public: BibGridwin(vcl::Window* pParent, WinBits nStyle = WB_3DLOOK ); - virtual ~BibGridwin(); + virtual ~BibGridwin() override; virtual void dispose() override; void createGridWin(const Reference< awt::XControlModel > & xDbForm); diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx index 19d5f0e7b1db..ea03b209c55a 100644 --- a/extensions/source/bibliography/bibbeam.hxx +++ b/extensions/source/bibliography/bibbeam.hxx @@ -66,7 +66,7 @@ namespace bib getDispatchProviderInterception(); BibBeamer(vcl::Window* pParent,BibDataManager* pDatMan ); - virtual ~BibBeamer(); + virtual ~BibBeamer() override; virtual void dispose() override; void SetXController(const css::uno::Reference< css::frame::XController > &); diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index f4dba759f2e0..2b1ed8ceb880 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -107,7 +107,7 @@ class BibConfig : public utl::ConfigItem public: BibConfig(); - virtual ~BibConfig(); + virtual ~BibConfig() override; virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override; diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx index a47cafb01b83..6b6435c1c8b9 100644 --- a/extensions/source/bibliography/bibcont.hxx +++ b/extensions/source/bibliography/bibcont.hxx @@ -42,7 +42,7 @@ class BibWindowContainer : public BibWindow //Window public: BibWindowContainer( vcl::Window* pParent, BibShortCutHandler* pChild); - virtual ~BibWindowContainer(); + virtual ~BibWindowContainer() override; virtual void dispose() override; inline vcl::Window* GetChild(); @@ -83,7 +83,7 @@ class BibBookContainer: public BibSplitWindow public: BibBookContainer(vcl::Window* pParent ); - virtual ~BibBookContainer(); + virtual ~BibBookContainer() override; virtual void dispose() override; // !BibShortCutHandler is also always a Window! diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 3d9d4756afc2..6144d9ef0ff1 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -94,7 +94,7 @@ private: public: BibliographyLoader(); - virtual ~BibliographyLoader(); + virtual ~BibliographyLoader() override; // XServiceInfo OUString SAL_CALL getImplementationName() throw(std::exception ) override; diff --git a/extensions/source/bibliography/bibshortcuthandler.hxx b/extensions/source/bibliography/bibshortcuthandler.hxx index daef09c081e9..12e28ebff577 100644 --- a/extensions/source/bibliography/bibshortcuthandler.hxx +++ b/extensions/source/bibliography/bibshortcuthandler.hxx @@ -56,7 +56,7 @@ class BibWindow : public vcl::Window, public BibShortCutHandler { public: BibWindow( vcl::Window* pParent,WinBits nStyle = WB_3DLOOK); - virtual ~BibWindow(); + virtual ~BibWindow() override; }; class BibSplitWindow : public SplitWindow, public BibShortCutHandler diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx index 8bc191c04765..8e68191a9ec1 100644 --- a/extensions/source/bibliography/bibview.hxx +++ b/extensions/source/bibliography/bibview.hxx @@ -71,7 +71,7 @@ namespace bib public: BibView( vcl::Window* _pParent, BibDataManager* _pDatMan, WinBits nStyle = WB_3DLOOK ); - virtual ~BibView(); + virtual ~BibView() override; virtual void dispose() override; void UpdatePages(); diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 8ce8ba0f6f37..5062274d449a 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -241,7 +241,7 @@ class MappingDialog_Impl : public ModalDialog public: MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pDatMan); - virtual ~MappingDialog_Impl(); + virtual ~MappingDialog_Impl() override; virtual void dispose() override; void SetModified() {bModified = true;} @@ -476,7 +476,7 @@ class DBChangeDialog_Impl : public ModalDialog DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void); public: DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* pMan ); - virtual ~DBChangeDialog_Impl(); + virtual ~DBChangeDialog_Impl() override; virtual void dispose() override; OUString GetCurrentURL()const; diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index 3ba10aac8047..c8d1b4c61595 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.hxx @@ -56,7 +56,7 @@ private: css::uno::Reference< css::frame::XDispatchProviderInterception > xInterception; protected: - virtual ~BibInterceptorHelper( ); + virtual ~BibInterceptorHelper( ) override; public: BibInterceptorHelper( ::bib::BibBeamer* pBibBeamer, css::uno::Reference< css::frame::XDispatch > const & xDispatch); @@ -124,7 +124,7 @@ protected: public: BibDataManager(); - virtual ~BibDataManager(); + virtual ~BibDataManager() override; virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) override; diff --git a/extensions/source/bibliography/formcontrolcontainer.hxx b/extensions/source/bibliography/formcontrolcontainer.hxx index f67ee4a09c63..3f35df98268e 100644 --- a/extensions/source/bibliography/formcontrolcontainer.hxx +++ b/extensions/source/bibliography/formcontrolcontainer.hxx @@ -40,7 +40,7 @@ namespace bib protected: FormControlContainer( ); - virtual ~FormControlContainer( ); + virtual ~FormControlContainer( ) override; bool isFormConnected() const { return nullptr != m_pFormAdapter; } void connectForm( const css::uno::Reference< css::form::XLoadable >& _rxForm ); diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 6da8c22c8a1e..b1bceba699fb 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -144,7 +144,7 @@ public: , pController(nullptr) {} - virtual ~BibFrameCtrl_Impl(); + virtual ~BibFrameCtrl_Impl() override; virtual void SAL_CALL frameAction(const FrameActionEvent& aEvent) throw( RuntimeException, std::exception ) override; virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx index a68b4b933dfe..2efbbd0d3eed 100644 --- a/extensions/source/bibliography/framectr.hxx +++ b/extensions/source/bibliography/framectr.hxx @@ -76,7 +76,7 @@ friend class BibFrameCtrl_Impl; public: BibFrameController_Impl( const css::uno::Reference< css::awt::XWindow > & xComponent, BibDataManager* pDatMan); - virtual ~BibFrameController_Impl(); + virtual ~BibFrameController_Impl() override; void ChangeDataSource(const css::uno::Sequence< css::beans::PropertyValue >& aArgs); diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index 65fd646b0490..37005847bc38 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -141,7 +141,7 @@ protected: public: BibGeneralPage(vcl::Window* pParent, BibDataManager* pDatMan); - virtual ~BibGeneralPage(); + virtual ~BibGeneralPage() override; virtual void dispose() override; inline const OUString& GetErrorString() const; diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 136f8382ee64..e8ae3c5cd54d 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -49,7 +49,7 @@ protected: public: BibToolBarListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId); - virtual ~BibToolBarListener(); + virtual ~BibToolBarListener() override; const OUString& GetCommand() const { return aCommand;} @@ -69,7 +69,7 @@ class BibTBListBoxListener: public BibToolBarListener public: BibTBListBoxListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId); - virtual ~BibTBListBoxListener(); + virtual ~BibTBListBoxListener() override; virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) throw( css::uno::RuntimeException, std::exception ) override; @@ -81,7 +81,7 @@ class BibTBEditListener: public BibToolBarListener public: BibTBEditListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId); - virtual ~BibTBEditListener(); + virtual ~BibTBEditListener() override; virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) throw( css::uno::RuntimeException, std::exception ) override; @@ -93,7 +93,7 @@ class BibTBQueryMenuListener: public BibToolBarListener public: BibTBQueryMenuListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId); - virtual ~BibTBQueryMenuListener(); + virtual ~BibTBQueryMenuListener() override; virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) throw( css::uno::RuntimeException, std::exception ) override; @@ -156,7 +156,7 @@ class BibToolBar: public ToolBox public: BibToolBar(vcl::Window* pParent, Link<void*,void> aLink); - virtual ~BibToolBar(); + virtual ~BibToolBar() override; virtual void dispose() override; sal_uInt16 GetChangeSourceId() const { return nTBC_BT_CHANGESOURCE; } |