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 /starmath/inc | |
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 'starmath/inc')
-rw-r--r-- | starmath/inc/ElementsDockingWindow.hxx | 6 | ||||
-rw-r--r-- | starmath/inc/dialog.hxx | 20 | ||||
-rw-r--r-- | starmath/inc/document.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/edit.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/node.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/smmod.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/symbol.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/unomodel.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/view.hxx | 6 |
9 files changed, 22 insertions, 22 deletions
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index cbc4bed734f2..9bef86d3a562 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -116,7 +116,7 @@ class SmElementsControl : public Control public: explicit SmElementsControl(vcl::Window *pParent); - virtual ~SmElementsControl(); + virtual ~SmElementsControl() override; virtual void dispose() override; void setElementSetId(sal_uInt16 aSetId); @@ -151,7 +151,7 @@ public: SmElementsDockingWindow( SfxBindings* pBindings, SfxChildWindow* pChildWindow, vcl::Window* pParent ); - virtual ~SmElementsDockingWindow(); + virtual ~SmElementsDockingWindow() override; virtual void dispose() override; virtual void EndDocking( const Rectangle& rReactangle, bool bFloatMode) override; @@ -167,7 +167,7 @@ protected: sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); - virtual ~SmElementsDockingWindowWrapper(); + virtual ~SmElementsDockingWindowWrapper() override; }; #endif // INCLUDED_STARMATH_INC_ELEMENTSDOCKINGWINDOW_HXX diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 65062cc7bd86..4c15ed3d8399 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -72,7 +72,7 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window *pWindow, const SfxItemSet &rSet); SmPrintOptionsTabPage(vcl::Window *pParent, const SfxItemSet &rOptions); - virtual ~SmPrintOptionsTabPage(); + virtual ~SmPrintOptionsTabPage() override; virtual void dispose() override; }; @@ -111,7 +111,7 @@ class SmFontDialog : public ModalDialog public: SmFontDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes); - virtual ~SmFontDialog(); + virtual ~SmFontDialog() override; virtual void dispose() override; const vcl::Font& GetFont() const @@ -137,7 +137,7 @@ class SmFontSizeDialog : public ModalDialog public: SmFontSizeDialog(vcl::Window *pParent); - virtual ~SmFontSizeDialog(); + virtual ~SmFontSizeDialog() override; virtual void dispose() override; void ReadFrom(const SmFormat &rFormat); @@ -165,7 +165,7 @@ class SmFontTypeDialog : public ModalDialog public: SmFontTypeDialog(vcl::Window *pParent, OutputDevice *pFntListDevice); - virtual ~SmFontTypeDialog(); + virtual ~SmFontTypeDialog() override; virtual void dispose() override; void ReadFrom(const SmFormat &rFormat); @@ -234,7 +234,7 @@ class SmDistanceDialog : public ModalDialog public: SmDistanceDialog(vcl::Window *pParent); - virtual ~SmDistanceDialog(); + virtual ~SmDistanceDialog() override; virtual void dispose() override; void ReadFrom(const SmFormat &rFormat); @@ -259,7 +259,7 @@ class SmAlignDialog : public ModalDialog public: SmAlignDialog(vcl::Window *pParent); - virtual ~SmAlignDialog(); + virtual ~SmAlignDialog() override; virtual void dispose() override; void ReadFrom(const SmFormat &rFormat); @@ -291,7 +291,7 @@ class SmShowSymbolSetWindow : public Control DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); public: SmShowSymbolSetWindow(vcl::Window *pParent, WinBits nStyle); - virtual ~SmShowSymbolSetWindow(); + virtual ~SmShowSymbolSetWindow() override; virtual void dispose() override; void setScrollbar(ScrollBar *pVScrollBar); void calccols(); @@ -309,7 +309,7 @@ class SmShowSymbolSet : public VclHBox public: SmShowSymbolSet(vcl::Window *pParent); - virtual ~SmShowSymbolSet(); + virtual ~SmShowSymbolSet() override; virtual void dispose() override; void SetSymbolSet(const SymbolPtrVec_t& rSymbolSet) { aSymbolWindow->SetSymbolSet(rSymbolSet); } @@ -377,7 +377,7 @@ class SmSymbolDialog : public ModalDialog public: SmSymbolDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, SmSymbolManager &rSymbolMgr, SmViewShell &rViewShell); - virtual ~SmSymbolDialog(); + virtual ~SmSymbolDialog() override; virtual void dispose() override; bool SelectSymbolSet(const OUString &rSymbolSetName); @@ -467,7 +467,7 @@ class SmSymDefineDialog : public ModalDialog public: SmSymDefineDialog(vcl::Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr); - virtual ~SmSymDefineDialog(); + virtual ~SmSymDefineDialog() override; virtual void dispose() override; using OutputDevice::SetFont; diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index a03ad0db28a0..622c5062321d 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -149,7 +149,7 @@ private: public: explicit SmDocShell( SfxModelFlags i_nSfxCreationFlags ); - virtual ~SmDocShell(); + virtual ~SmDocShell() override; virtual bool ConvertTo( SfxMedium &rMedium ) override; diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index 084fae6b927b..8c17451eac64 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -84,7 +84,7 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper public: explicit SmEditWindow(SmCmdBoxWindow& rMyCmdBoxWin); - virtual ~SmEditWindow(); + virtual ~SmEditWindow() override; virtual void dispose() override; SmDocShell* GetDoc(); diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index 4a659b341d1a..bd92aa86b41a 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -236,7 +236,7 @@ protected: {} public: - virtual ~SmStructureNode(); + virtual ~SmStructureNode() override; virtual bool IsVisible() const override; diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index fe6020716152..62f244bed554 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -101,7 +101,7 @@ private: public: explicit SmModule(SfxObjectFactory* pObjFact); - virtual ~SmModule(); + virtual ~SmModule() override; virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) override; diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx index 225cb47907da..24e46bd9a088 100644 --- a/starmath/inc/symbol.hxx +++ b/starmath/inc/symbol.hxx @@ -86,7 +86,7 @@ private: public: SmSymbolManager(); SmSymbolManager(const SmSymbolManager& rSymbolSetManager); - virtual ~SmSymbolManager(); + virtual ~SmSymbolManager() override; SmSymbolManager & operator = (const SmSymbolManager& rSymbolSetManager); diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx index 86bfc93861d0..f20cdb8f95f5 100644 --- a/starmath/inc/unomodel.hxx +++ b/starmath/inc/unomodel.hxx @@ -60,7 +60,7 @@ protected: throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override; public: explicit SmModel( SfxObjectShell *pObjSh = nullptr ); - virtual ~SmModel() throw (); + virtual ~SmModel() throw () override; //XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 287ddc48d440..7c1af55e35d0 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -98,7 +98,7 @@ private: void CaretBlinkStop(); public: explicit SmGraphicWindow(SmViewShell* pShell); - virtual ~SmGraphicWindow(); + virtual ~SmGraphicWindow() override; virtual void dispose() override; // Window @@ -192,7 +192,7 @@ public: SfxChildWindow *pChildWindow, Window *pParent); - virtual ~SmCmdBoxWindow (); + virtual ~SmCmdBoxWindow () override; virtual void dispose() override; void AdjustPosition(); @@ -276,7 +276,7 @@ protected: public: SmViewShell(SfxViewFrame *pFrame, SfxViewShell *pOldSh); - virtual ~SmViewShell(); + virtual ~SmViewShell() override; SmDocShell * GetDoc() { |