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 /include/svx | |
| 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 'include/svx')
176 files changed, 282 insertions, 282 deletions
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx index d2c2ec05c6b5..96c4c370d617 100644 --- a/include/svx/AccessibleControlShape.hxx +++ b/include/svx/AccessibleControlShape.hxx @@ -57,7 +57,7 @@ public: AccessibleControlShape( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo); - virtual ~AccessibleControlShape( ); + virtual ~AccessibleControlShape( ) override; const css::uno::Reference< css::beans::XPropertySet >& SAL_CALL GetControlModel( ) { return m_xControlModel;} ; AccessibleControlShape* SAL_CALL GetLabeledByControlShape(); diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx index 04271c7476db..a520a98e5176 100644 --- a/include/svx/AccessibleGraphicShape.hxx +++ b/include/svx/AccessibleGraphicShape.hxx @@ -41,7 +41,7 @@ public: const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo); - virtual ~AccessibleGraphicShape(); + virtual ~AccessibleGraphicShape() override; //===== XAccessibleImage ================================================ diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx index 55fa150cfc91..9b59fa15873a 100644 --- a/include/svx/AccessibleOLEShape.hxx +++ b/include/svx/AccessibleOLEShape.hxx @@ -41,7 +41,7 @@ public: AccessibleOLEShape ( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo); - virtual ~AccessibleOLEShape(); + virtual ~AccessibleOLEShape() override; //===== XAccessibleAction =============================================== diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index 8f961fffb111..f88d190bbe7a 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -154,7 +154,7 @@ public: /** The destructor releases its children manager and text engine if still existent. These are responsible to send appropriate events. */ - virtual ~AccessibleShape(); + virtual ~AccessibleShape() override; /** Initialize a new shape. See the documentation of the constructor for the reason of this method's existence. diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx index ff8617c0a1dc..78e169519659 100644 --- a/include/svx/AffineMatrixItem.hxx +++ b/include/svx/AffineMatrixItem.hxx @@ -32,7 +32,7 @@ public: AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix = nullptr); AffineMatrixItem(SvStream& rIn); AffineMatrixItem(const AffineMatrixItem&); - virtual ~AffineMatrixItem(); + virtual ~AffineMatrixItem() override; virtual bool operator==(const SfxPoolItem&) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/svx/CommonStyleManager.hxx b/include/svx/CommonStyleManager.hxx index edb8a6dc74fa..b8e6ad63f759 100644 --- a/include/svx/CommonStyleManager.hxx +++ b/include/svx/CommonStyleManager.hxx @@ -26,7 +26,7 @@ public: : StyleManager(rShell) {} - virtual ~CommonStyleManager() + virtual ~CommonStyleManager() override {} virtual sfx2::StylePreviewRenderer* CreateStylePreviewRenderer( diff --git a/include/svx/CommonStylePreviewRenderer.hxx b/include/svx/CommonStylePreviewRenderer.hxx index dc4ec8986ae7..790110d04478 100644 --- a/include/svx/CommonStylePreviewRenderer.hxx +++ b/include/svx/CommonStylePreviewRenderer.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC CommonStylePreviewRenderer : public sfx2::StylePreviewRender public: CommonStylePreviewRenderer(const SfxObjectShell& rShell, OutputDevice& rOutputDev, SfxStyleSheetBase* pStyle, long nMaxHeight = 32); - virtual ~CommonStylePreviewRenderer(); + virtual ~CommonStylePreviewRenderer() override; virtual bool recalculate() override; virtual Size getRenderSize() override; diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index 8ed9417af553..ee1d0e429330 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -192,7 +192,7 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet bool SetHandleControllerPosition( const sal_uInt32 nIndex, const css::awt::Point& rPosition ); EnhancedCustomShape2d( SdrObject* pSdrObjCustomShape ); - virtual ~EnhancedCustomShape2d(); + virtual ~EnhancedCustomShape2d() override; SAL_DLLPRIVATE double GetEnumFunc( const EnhancedCustomShape::ExpressionFunct eVal ) const; diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx index ffbd529fbe2f..b8814185e8b8 100644 --- a/include/svx/Palette.hxx +++ b/include/svx/Palette.hxx @@ -53,7 +53,7 @@ class SVX_DLLPUBLIC PaletteASE : public Palette void LoadPalette(); public: PaletteASE( const OUString &rFPath, const OUString &rFName ); - virtual ~PaletteASE(); + virtual ~PaletteASE() override; virtual const OUString& GetName() override; virtual const OUString& GetPath() override; @@ -78,7 +78,7 @@ class SVX_DLLPUBLIC PaletteGPL : public Palette void LoadPalette(); public: PaletteGPL( const OUString &rFPath, const OUString &rFName ); - virtual ~PaletteGPL(); + virtual ~PaletteGPL() override; virtual const OUString& GetName() override; virtual const OUString& GetPath() override; @@ -97,7 +97,7 @@ class SVX_DLLPUBLIC PaletteSOC : public Palette XColorListRef mpColorList; public: PaletteSOC( const OUString &rFPath, const OUString &rFName ); - virtual ~PaletteSOC(); + virtual ~PaletteSOC() override; virtual const OUString& GetName() override; virtual const OUString& GetPath() override; diff --git a/include/svx/ParaLineSpacingPopup.hxx b/include/svx/ParaLineSpacingPopup.hxx index c9f761c91beb..293253ec5f10 100644 --- a/include/svx/ParaLineSpacingPopup.hxx +++ b/include/svx/ParaLineSpacingPopup.hxx @@ -34,7 +34,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); ParaLineSpacingPopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); - virtual ~ParaLineSpacingPopup(); + virtual ~ParaLineSpacingPopup() override; virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; }; diff --git a/include/svx/ParaSpacingControl.hxx b/include/svx/ParaSpacingControl.hxx index b4e287c2370f..17f46b4650f6 100644 --- a/include/svx/ParaSpacingControl.hxx +++ b/include/svx/ParaSpacingControl.hxx @@ -34,7 +34,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); ParaULSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); - virtual ~ParaULSpacingControl(); + virtual ~ParaULSpacingControl() override; virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; @@ -48,7 +48,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); ParaLRSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); - virtual ~ParaLRSpacingControl(); + virtual ~ParaLRSpacingControl() override; virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/svx/SmartTagMgr.hxx b/include/svx/SmartTagMgr.hxx index 0a7cfcc4c700..f75a7f38385b 100644 --- a/include/svx/SmartTagMgr.hxx +++ b/include/svx/SmartTagMgr.hxx @@ -122,7 +122,7 @@ private: public: SmartTagMgr( const OUString& rApplicationName ); - virtual ~SmartTagMgr(); + virtual ~SmartTagMgr() override; /** Triggers configuration reading, library loading and listener registration NOTE: MUST BE CALLED AFTER CONSTRUCTION! diff --git a/include/svx/SpellDialogChildWindow.hxx b/include/svx/SpellDialogChildWindow.hxx index cae041cc83a3..9f1b3f20accf 100644 --- a/include/svx/SpellDialogChildWindow.hxx +++ b/include/svx/SpellDialogChildWindow.hxx @@ -53,7 +53,7 @@ public: sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); - virtual ~SpellDialogChildWindow (); + virtual ~SpellDialogChildWindow () override; protected: /** This abstract method has to be defined by a derived class. It diff --git a/include/svx/TextCharacterSpacingPopup.hxx b/include/svx/TextCharacterSpacingPopup.hxx index 68077b25f0c9..8bfbfce058da 100644 --- a/include/svx/TextCharacterSpacingPopup.hxx +++ b/include/svx/TextCharacterSpacingPopup.hxx @@ -32,7 +32,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); TextCharacterSpacingPopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); - virtual ~TextCharacterSpacingPopup(); + virtual ~TextCharacterSpacingPopup() override; virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; }; diff --git a/include/svx/TextUnderlinePopup.hxx b/include/svx/TextUnderlinePopup.hxx index c627391c3492..e13a520ec538 100644 --- a/include/svx/TextUnderlinePopup.hxx +++ b/include/svx/TextUnderlinePopup.hxx @@ -34,7 +34,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); TextUnderlinePopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); - virtual ~TextUnderlinePopup(); + virtual ~TextUnderlinePopup() override; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx index 3630f394b065..1f66ee5ef7b5 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -134,7 +134,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow public: SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window* pParent); - virtual ~SvxBmpMask(); + virtual ~SvxBmpMask() override; virtual void dispose() override; void SetColor( const Color& rColor ); diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index d748f37fe14c..e94dc5d2d9a8 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -40,7 +40,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxShowCharSet : public Control { public: SvxShowCharSet( vcl::Window* pParent ); - virtual ~SvxShowCharSet(); + virtual ~SvxShowCharSet() override; virtual void dispose() override; virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx index cad5b4a17174..d744c8f33f65 100644 --- a/include/svx/checklbx.hxx +++ b/include/svx/checklbx.hxx @@ -45,7 +45,7 @@ private: public: SvxCheckListBox( vcl::Window* pParent, WinBits nWinStyle = 0 ); void SetNormalStaticImage(const Image& rNormalStaticImage); - virtual ~SvxCheckListBox(); + virtual ~SvxCheckListBox() override; virtual void dispose() override; void InsertEntry ( const OUString& rStr, diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx index 931b3d21b51c..bbbfa2d85a2a 100644 --- a/include/svx/clipboardctl.hxx +++ b/include/svx/clipboardctl.hxx @@ -42,7 +42,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxClipBoardControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual ~SvxClipBoardControl(); + virtual ~SvxClipBoardControl() override; virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; virtual void StateChanged( sal_uInt16 nSID, diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx index 643c13217b8c..75b89fd4041e 100644 --- a/include/svx/clipfmtitem.hxx +++ b/include/svx/clipfmtitem.hxx @@ -37,7 +37,7 @@ public: static SfxPoolItem* CreateDefault(); SvxClipboardFormatItem( sal_uInt16 nId = 0 ); SvxClipboardFormatItem( const SvxClipboardFormatItem& ); - virtual ~SvxClipboardFormatItem(); + virtual ~SvxClipboardFormatItem() override; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index dbefc7f0cbfa..b212162feab0 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -103,7 +103,7 @@ public: SvxColorDockingWindow(SfxBindings* pBindings, SfxChildWindow *pCW, vcl::Window* pParent); - virtual ~SvxColorDockingWindow(); + virtual ~SvxColorDockingWindow() override; virtual void dispose() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx index 08819e9c04d3..eb863a166f55 100644 --- a/include/svx/compressgraphicdialog.hxx +++ b/include/svx/compressgraphicdialog.hxx @@ -90,7 +90,7 @@ private: public: CompressGraphicsDialog( vcl::Window* pParent, SdrGrafObj* pGraphicObj, SfxBindings& rBindings ); CompressGraphicsDialog( vcl::Window* pParent, Graphic& rGraphic, Size rViewSize100mm, Rectangle& rCropRectangle, SfxBindings& rBindings ); - virtual ~CompressGraphicsDialog(); + virtual ~CompressGraphicsDialog() override; virtual void dispose() override; SdrGrafObj* GetCompressedSdrGrafObj(); diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx index b9b388e533aa..2bdc9eeddc34 100644 --- a/include/svx/connctrl.hxx +++ b/include/svx/connctrl.hxx @@ -45,7 +45,7 @@ private: SVX_DLLPRIVATE void AdaptSize(); public: SvxXConnectionPreview( vcl::Window* pParent, WinBits nStyle); - virtual ~SvxXConnectionPreview(); + virtual ~SvxXConnectionPreview() override; virtual void dispose() override; virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx index 7e13ba44ba62..d60c929be112 100644 --- a/include/svx/contdlg.hxx +++ b/include/svx/contdlg.hxx @@ -58,7 +58,7 @@ public: SvxContourDlg(SfxBindings *pBindings, SfxChildWindow *pCW, vcl::Window* pParent); - virtual ~SvxContourDlg(); + virtual ~SvxContourDlg() override; virtual void dispose() override; const Graphic& GetGraphic() const; diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 807c4f32de55..50aa6544fac3 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -57,7 +57,7 @@ class SAL_WARN_UNUSED SvxRedlinEntry : public SvTreeListEntry { public: SvxRedlinEntry(); - virtual ~SvxRedlinEntry(); + virtual ~SvxRedlinEntry() override; }; /// Class for the representation of Strings depending on the font. @@ -70,7 +70,7 @@ private: public: SvLBoxColorString( const OUString& rStr, const Color& rCol); SvLBoxColorString(); - virtual ~SvLBoxColorString(); + virtual ~SvLBoxColorString() override; /** Paint function of the SvLBoxColorString class. @@ -113,7 +113,7 @@ protected: public: SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER); - virtual ~SvxRedlinTable(); + virtual ~SvxRedlinTable() override; virtual void dispose() override; // For FilterPage only { @@ -209,7 +209,7 @@ protected: public: SvxTPFilter( vcl::Window * pParent); - virtual ~SvxTPFilter(); + virtual ~SvxTPFilter() override; virtual void dispose() override; virtual void DeactivatePage() override; @@ -298,7 +298,7 @@ private: public: SvxTPView(vcl::Window * pParent, VclBuilderContainer *pTopLevel); - virtual ~SvxTPView(); + virtual ~SvxTPView() override; virtual void dispose() override; void InsertWriterHeader(); @@ -344,7 +344,7 @@ private: public: SvxAcceptChgCtr(vcl::Window* pParent, VclBuilderContainer* pTopLevel); - virtual ~SvxAcceptChgCtr(); + virtual ~SvxAcceptChgCtr() override; virtual void dispose() override; void ShowFilterPage(); diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index fa89bc436b98..cd33094ddb7d 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -49,7 +49,7 @@ protected: public: Svx3DPreviewControl(vcl::Window* pParent, WinBits nStyle = 0); - virtual ~Svx3DPreviewControl(); + virtual ~Svx3DPreviewControl() override; virtual void dispose() override; virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; @@ -149,7 +149,7 @@ private: public: SvxLightCtl3D(vcl::Window* pParent); - virtual ~SvxLightCtl3D(); + virtual ~SvxLightCtl3D() override; virtual void dispose() override; // react to size changes diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 9056efae0bdc..190c996c637a 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -111,7 +111,7 @@ public: sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80 ); void SetControlSettings(RectPoint eRpt, sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80); - virtual ~SvxRectCtl(); + virtual ~SvxRectCtl() override; virtual void dispose() override; virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; @@ -166,7 +166,7 @@ protected: public: SvxPixelCtl( vcl::Window* pParent, sal_uInt16 nNumber = 8 ); - virtual ~SvxPixelCtl(); + virtual ~SvxPixelCtl() override; virtual void dispose() override; virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; @@ -351,7 +351,7 @@ protected: public: SvxPreviewBase(vcl::Window* pParent); - virtual ~SvxPreviewBase(); + virtual ~SvxPreviewBase() override; virtual void dispose() override; // change support @@ -388,7 +388,7 @@ private: public: SvxXLinePreview( vcl::Window* pParent ); - virtual ~SvxXLinePreview(); + virtual ~SvxXLinePreview() override; virtual void dispose() override; void SetLineAttributes(const SfxItemSet& rItemSet); @@ -415,7 +415,7 @@ private: public: SvxXRectPreview(vcl::Window* pParent); - virtual ~SvxXRectPreview(); + virtual ~SvxXRectPreview() override; virtual void dispose() override; void SetAttributes(const SfxItemSet& rItemSet); @@ -441,7 +441,7 @@ private: public: SvxXShadowPreview(vcl::Window *pParent); - virtual ~SvxXShadowPreview(); + virtual ~SvxXShadowPreview() override; virtual void dispose() override; void SetRectangleAttributes(const SfxItemSet& rItemSet); diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx index fdfc704edcbf..66565e27d264 100644 --- a/include/svx/e3ditem.hxx +++ b/include/svx/e3ditem.hxx @@ -33,7 +33,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxB3DVectorItem : public SfxPoolItem public: SvxB3DVectorItem( sal_uInt16 nWhich, const basegfx::B3DVector& rVal ); SvxB3DVectorItem( const SvxB3DVectorItem& ); - virtual ~SvxB3DVectorItem(); + virtual ~SvxB3DVectorItem() override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx index d9f2d6a90f97..8be61b7b9e0e 100644 --- a/include/svx/e3dundo.hxx +++ b/include/svx/e3dundo.hxx @@ -43,7 +43,7 @@ class SAL_WARN_UNUSED E3dUndoAction : public SdrUndoAction { } - virtual ~E3dUndoAction (); + virtual ~E3dUndoAction () override; virtual bool CanRepeat(SfxRepeatTarget&) const override; }; @@ -69,7 +69,7 @@ class SAL_WARN_UNUSED E3dRotateUndoAction : public E3dUndoAction { } - virtual ~E3dRotateUndoAction (); + virtual ~E3dRotateUndoAction () override; virtual void Undo() override; virtual void Redo() override; @@ -96,7 +96,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoActi const SfxItemSet& rNewSet, const SfxItemSet& rOldSet); - virtual ~E3dAttributesUndoAction(); + virtual ~E3dAttributesUndoAction() override; virtual bool CanRepeat(SfxRepeatTarget& rView) const override; virtual void Undo() override; diff --git a/include/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx index 3b44d3e9986c..4aa902bf4fe2 100644 --- a/include/svx/extrusionbar.hxx +++ b/include/svx/extrusionbar.hxx @@ -46,7 +46,7 @@ private: public: ExtrusionBar(SfxViewShell* pViewShell); - virtual ~ExtrusionBar(); + virtual ~ExtrusionBar() override; static void execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings ); static void getState( SdrView* pSdrView, SfxItemSet& rSet ); diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index 98a662c0ed45..e5f447465416 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -67,7 +67,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxFillToolBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); - virtual ~SvxFillToolBoxControl(); + virtual ~SvxFillToolBoxControl() override; virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; void Update(); @@ -89,7 +89,7 @@ private: public: FillControl(vcl::Window* pParent); - virtual ~FillControl(); + virtual ~FillControl() override; virtual void dispose() override; virtual void Resize() override; diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index 70103b5742b4..d5c211ed4a13 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -213,7 +213,7 @@ protected: public: Svx3DWin( SfxBindings* pBindings, SfxChildWindow *pCW, vcl::Window* pParent ); - virtual ~Svx3DWin(); + virtual ~Svx3DWin() override; virtual void dispose() override; void InitColorLB( const SdrModel* pDoc ); diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx index dd9397ee1cae..be32ea540bdd 100644 --- a/include/svx/fmdpage.hxx +++ b/include/svx/fmdpage.hxx @@ -44,7 +44,7 @@ protected: public: SvxFmDrawPage( SdrPage* pPage ); - virtual ~SvxFmDrawPage() throw (); + virtual ~SvxFmDrawPage() throw () override; // UNO connection DECLARE_UNO3_AGG_DEFAULTS(SvxFmDrawPage, SvxDrawPage) diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index 1c6dea5ade5f..2b5f0a586aef 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -40,7 +40,7 @@ protected: public: FmGridHeader( BrowseBox* pParent, WinBits nWinBits = WB_STDHEADERBAR | WB_DRAG ); - virtual ~FmGridHeader(); + virtual ~FmGridHeader() override; virtual void dispose() override; public: diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 53a219884f47..67f8cefbf103 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -217,7 +217,7 @@ protected: public: FmXGridControl(const css::uno::Reference< css::uno::XComponentContext >&); - virtual ~FmXGridControl(); + virtual ~FmXGridControl() override; // UNO connection DECLARE_UNO3_AGG_DEFAULTS(FmXGridControl, UnoControl) @@ -367,7 +367,7 @@ protected: public: FmXGridPeer(const css::uno::Reference< css::uno::XComponentContext >&); - virtual ~FmXGridPeer(); + virtual ~FmXGridPeer() override; // spaeter Constructor, immer nach dem realen Constructor zu rufen ! void Create(vcl::Window* pParent, WinBits nStyle); diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx index d632df6d225c..4cbe427411ef 100644 --- a/include/svx/fmmodel.hxx +++ b/include/svx/fmmodel.hxx @@ -54,7 +54,7 @@ public: FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, bool bUseExtColorTable); - virtual ~FmFormModel(); + virtual ~FmFormModel() override; virtual SdrPage* AllocPage(bool bMasterPage) override; virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF) override; diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx index 851e3e473df7..3a515163d708 100644 --- a/include/svx/fmpage.hxx +++ b/include/svx/fmpage.hxx @@ -49,7 +49,7 @@ class SVX_DLLPUBLIC FmFormPage : public SdrPage public: explicit FmFormPage(FmFormModel& rModel, bool bMasterPage=false); - virtual ~FmFormPage(); + virtual ~FmFormPage() override; virtual void SetModel(SdrModel* pNewModel) override; diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index 38b8c341fcfe..82a289757456 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -61,7 +61,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FmDesignModeChangedHint : public SfxHint public: FmDesignModeChangedHint( bool bDesMode ); - virtual ~FmDesignModeChangedHint(); + virtual ~FmDesignModeChangedHint() override; bool GetDesignMode() const { return m_bDesignMode; } }; @@ -96,7 +96,7 @@ private: public: FmFormShell(SfxViewShell* pParent, FmFormView* pView = nullptr); - virtual ~FmFormShell(); + virtual ~FmFormShell() override; void Execute( SfxRequest& ); void GetState( SfxItemSet& ); diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index a29c7f76195b..7190ef0b4d6e 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -95,7 +95,7 @@ public: public: FmRecordCountListener(const css::uno::Reference< css::sdbc::XResultSet >& dbcCursor); // the set has to support the sdb::ResultSet service - virtual ~FmRecordCountListener(); + virtual ~FmRecordCountListener() override; // DECLARE_UNO3_AGG_DEFAULTS(FmPropertyListener, UsrObject) // virtual sal_Bool queryInterface(css::uno::Uik aUik, css::uno::Reference< css::uno::XInterface >& rOut); diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 043ae366ed05..c1c5d934475e 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -174,7 +174,7 @@ class SAL_WARN_UNUSED FmXDisposeMultiplexer : public ::cppu::WeakImplHelper1< cs css::uno::Reference< css::lang::XComponent> m_xObject; FmXDisposeListener* m_pListener; - virtual ~FmXDisposeMultiplexer(); + virtual ~FmXDisposeMultiplexer() override; public: FmXDisposeMultiplexer(FmXDisposeListener* _pListener, const css::uno::Reference< css::lang::XComponent>& _rxObject); diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index ed6e2644e9a0..675500de3e9f 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -63,7 +63,7 @@ class SVX_DLLPUBLIC FmFormView : public E3dView public: FmFormView(FmFormModel* pModel, OutputDevice* pOut = nullptr); - virtual ~FmFormView(); + virtual ~FmFormView() override; /** create a control pair (label/bound control) for the database field description given. @param rFieldDesc diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index d491e8f7e4bd..ff26909bea8e 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -47,7 +47,7 @@ private: public: SvxFontPrevWindow(vcl::Window* pParent, const ResId& rId); SvxFontPrevWindow(vcl::Window* pParent, WinBits nStyle); - virtual ~SvxFontPrevWindow(); + virtual ~SvxFontPrevWindow() override; virtual void dispose() override; virtual void StateChanged( StateChangedType nStateChange ) override; diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx index 9174b97ad193..f7601b58e940 100644 --- a/include/svx/fontlb.hxx +++ b/include/svx/fontlb.hxx @@ -40,7 +40,7 @@ public: const vcl::Font& rFont, const Color* pColor = nullptr ); - virtual ~SvLBoxFontString(); + virtual ~SvLBoxFontString() override; /** Creates a new empty list box item. */ virtual SvLBoxItem* Create() const override; diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx index 48939bc5ecc6..8ef0eb84187a 100644 --- a/include/svx/fontwork.hxx +++ b/include/svx/fontwork.hxx @@ -173,7 +173,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow public: SvxFontWorkDialog(SfxBindings *pBinding, SfxChildWindow *pCW, vcl::Window* pParent); - virtual ~SvxFontWorkDialog(); + virtual ~SvxFontWorkDialog() override; virtual void dispose() override; void SetColorList(const XColorListRef &pTable); diff --git a/include/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx index 02f891938154..e2a38a6f0fb5 100644 --- a/include/svx/fontworkbar.hxx +++ b/include/svx/fontworkbar.hxx @@ -46,7 +46,7 @@ private: public: FontworkBar(SfxViewShell* pViewShell); - virtual ~FontworkBar(); + virtual ~FontworkBar() override; static void execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings ); static void getState( SdrView* pSdrView, SfxItemSet& rSet ); diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index bc339c7cdb8f..0149c022c26a 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -53,7 +53,7 @@ class SAL_WARN_UNUSED FontworkCharacterSpacingDialog : public ModalDialog public: FontworkCharacterSpacingDialog( vcl::Window* pParent, sal_Int32 nScale ); - virtual ~FontworkCharacterSpacingDialog(); + virtual ~FontworkCharacterSpacingDialog() override; virtual void dispose() override; sal_Int32 getScale() const; @@ -82,7 +82,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog public: FontWorkGalleryDialog( SdrView* pView, vcl::Window* pParent, sal_uInt16 nSID ); - virtual ~FontWorkGalleryDialog(); + virtual ~FontWorkGalleryDialog() override; virtual void dispose() override; // SJ: if the SdrObject** is set, the SdrObject is not inserted into the page when executing the dialog diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx index d4805246d6ec..1cb11c82ad20 100644 --- a/include/svx/formatpaintbrushctrl.hxx +++ b/include/svx/formatpaintbrushctrl.hxx @@ -37,7 +37,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FormatPaintBrushToolBoxControl : public SfxT public: SFX_DECL_TOOLBOX_CONTROL(); FormatPaintBrushToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual ~FormatPaintBrushToolBoxControl(); + virtual ~FormatPaintBrushToolBoxControl() override; virtual void DoubleClick() override; virtual void Click() override; diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 471d1fd25e92..8cc89c7a994d 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -86,7 +86,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FrameSelector : public Control { public: FrameSelector(vcl::Window* pParent); - virtual ~FrameSelector(); + virtual ~FrameSelector() override; /** Initializes the control, enables/disables frame borders according to flags. */ void Initialize( FrameSelFlags nFlags ); diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index 56ac84846b22..9d9dcc34f843 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -111,7 +111,7 @@ private: SAL_DLLPRIVATE void ImplDeleteCachedTheme( GalleryTheme* pTheme ); Gallery( const OUString& rMultiPath ); - virtual ~Gallery(); + virtual ~Gallery() override; public: diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx index 988c4ef2074f..db76b18f8150 100644 --- a/include/svx/galleryitem.hxx +++ b/include/svx/galleryitem.hxx @@ -49,7 +49,7 @@ public: SvxGalleryItem(); SvxGalleryItem( const SvxGalleryItem& ); - virtual ~SvxGalleryItem(); + virtual ~SvxGalleryItem() override; sal_Int8 GetType() const { return m_nType; } const rtl::OUString& GetURL() const { return m_aURL; } diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index 70e75e9cd475..6ae29851ef5a 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -112,7 +112,7 @@ public: SdrObjUserData( IV_IMAPINFO, ID_IMAPINFO ), aImageMap( rImageMap ) {}; - virtual ~SgaIMapInfo() {}; + virtual ~SgaIMapInfo() override {}; virtual SdrObjUserData* Clone( SdrObject* ) const override { @@ -170,7 +170,7 @@ private: protected: GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObjectPos, bool bLazy ); - virtual ~GalleryTransferable(); + virtual ~GalleryTransferable() override; void InitData( bool bLazy ); diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index 5ec4a59ed70b..6bf5ffbe1783 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -110,7 +110,7 @@ private: SAL_DLLPRIVATE void ImplBroadcast( sal_uIntPtr nUpdatePos ); SAL_DLLPRIVATE GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry ); - SAL_DLLPRIVATE virtual ~GalleryTheme(); + SAL_DLLPRIVATE virtual ~GalleryTheme() override; GalleryTheme(GalleryTheme const &) = delete; void operator =(GalleryTheme const &) = delete; diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx index 8634db586f35..f50df7df77b3 100644 --- a/include/svx/grafctrl.hxx +++ b/include/svx/grafctrl.hxx @@ -30,7 +30,7 @@ class SvxGrafToolBoxControl : public SfxToolBoxControl { public: SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual ~SvxGrafToolBoxControl(); + virtual ~SvxGrafToolBoxControl() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override; @@ -98,7 +98,7 @@ class SVX_DLLPUBLIC SvxGrafModeToolBoxControl : public SfxToolBoxControl, public public: SFX_DECL_TOOLBOX_CONTROL(); SvxGrafModeToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual ~SvxGrafModeToolBoxControl(); + virtual ~SvxGrafModeToolBoxControl() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; virtual VclPtr<vcl::Window> CreateItemWindow( vcl::Window *pParent ) override; diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 3416a351a0b8..c3bfe7e969f1 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -80,7 +80,7 @@ protected: public: GraphCtrl( vcl::Window* pParent, WinBits nStyle ); - virtual ~GraphCtrl(); + virtual ~GraphCtrl() override; virtual void dispose() override; void SetWinStyle( WinBits nWinBits ); @@ -123,7 +123,7 @@ public: : rWin(rGraphWin) {} - virtual ~GraphCtrlUserCall() + virtual ~GraphCtrlUserCall() override {} virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect) override; @@ -152,7 +152,7 @@ public: , rGraphCtrl(*pWindow) {} - virtual ~GraphCtrlView() + virtual ~GraphCtrlView() override {} }; diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index 721e5047250d..bbae2350ba66 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -34,7 +34,7 @@ public: SvxGrfCrop( sal_Int32 nLeft, sal_Int32 nRight, sal_Int32 nTop, sal_Int32 nBottom, sal_uInt16 ); - virtual ~SvxGrfCrop(); + virtual ~SvxGrfCrop() override; // "pure virtual methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 3aa546595aeb..bc48342c9995 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -75,7 +75,7 @@ public: DbGridRow(CursorWrapper* pCur, bool bPaintCursor); void SetState(CursorWrapper* pCur, bool bPaintCursor); - virtual ~DbGridRow(); + virtual ~DbGridRow() override; bool HasField(sal_uInt32 nPos) const { return nPos < m_aVariants.size(); } const ::svxform::DataColumn& GetField(sal_uInt32 nPos) const { return *m_aVariants[ nPos ]; } @@ -203,7 +203,7 @@ public: public: NavigationBar(vcl::Window* pParent); - virtual ~NavigationBar(); + virtual ~NavigationBar() override; virtual void dispose() override; // Status methods for Controls @@ -376,7 +376,7 @@ public: vcl::Window* pParent, WinBits nBits = WB_BORDER); - virtual ~DbGridControl(); + virtual ~DbGridControl() override; virtual void dispose() override; virtual void Init() override; diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index 1251685d5da0..f7a6b7674e64 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -51,7 +51,7 @@ public: virtual bool FillItemSet( SfxItemSet* rOutSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; - virtual ~SvxHFPage(); + virtual ~SvxHFPage() override; virtual void dispose() override; void DisableDeleteQueryBox() { mbDisableQueryBox = true; } diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx index 8f73036dbfd9..b851f42ac968 100644 --- a/include/svx/hlnkitem.hxx +++ b/include/svx/hlnkitem.hxx @@ -67,7 +67,7 @@ public: SvxLinkInsertMode eTyp = HLINK_FIELD, HyperDialogEvent nEvents = HyperDialogEvent::NONE, SvxMacroTableDtor *pMacroTbl =nullptr ); - virtual ~SvxHyperlinkItem () { delete pMacroTable; } + virtual ~SvxHyperlinkItem () override { delete pMacroTable; } inline SvxHyperlinkItem& operator=( const SvxHyperlinkItem &rItem ); diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index c55fb1e7230b..50dc9fed2572 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -137,7 +137,7 @@ public: SvxIMapDlg( SfxBindings *pBindings, SfxChildWindow *pCW, vcl::Window* pParent ); - virtual ~SvxIMapDlg(); + virtual ~SvxIMapDlg() override; virtual void dispose() override; void SetExecState( bool bEnable ); diff --git a/include/svx/insctrl.hxx b/include/svx/insctrl.hxx index d5fc3c1fcb4e..3ef32376de29 100644 --- a/include/svx/insctrl.hxx +++ b/include/svx/insctrl.hxx @@ -34,7 +34,7 @@ public: SFX_DECL_STATUSBAR_CONTROL(); SvxInsertStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); - virtual ~SvxInsertStatusBarControl(); + virtual ~SvxInsertStatusBarControl() override; private: bool bInsert; diff --git a/include/svx/layctrl.hxx b/include/svx/layctrl.hxx index a068566608cd..ef3e32d1a361 100644 --- a/include/svx/layctrl.hxx +++ b/include/svx/layctrl.hxx @@ -38,7 +38,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual ~SvxTableToolBoxControl(); + virtual ~SvxTableToolBoxControl() override; }; // class SvxColumnsToolBoxControl ---------------------------------------- @@ -52,7 +52,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual ~SvxColumnsToolBoxControl(); + virtual ~SvxColumnsToolBoxControl() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx index 0dd05213cbaf..e3d1b0b25584 100644 --- a/include/svx/lboxctrl.hxx +++ b/include/svx/lboxctrl.hxx @@ -42,7 +42,7 @@ protected: public: SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual ~SvxListBoxControl(); + virtual ~SvxListBoxControl() override; virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; virtual void StateChanged( sal_uInt16 nSID, @@ -61,7 +61,7 @@ public: SvxUndoRedoControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual ~SvxUndoRedoControl(); + virtual ~SvxUndoRedoControl() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index b41d261b2b10..e11ef5b7b9f2 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -47,7 +47,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual ~SvxLineStyleToolBoxControl(); + virtual ~SvxLineStyleToolBoxControl() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; @@ -65,7 +65,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxLineWidthToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual ~SvxLineWidthToolBoxControl(); + virtual ~SvxLineWidthToolBoxControl() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; @@ -111,7 +111,7 @@ public: const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow, const OUString& rWndTitle ); - virtual ~SvxLineEndWindow(); + virtual ~SvxLineEndWindow() override; virtual void dispose() override; void StartSelection(); @@ -129,7 +129,7 @@ class SVX_DLLPUBLIC SvxLineEndToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual ~SvxLineEndToolBoxControl(); + virtual ~SvxLineEndToolBoxControl() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; diff --git a/include/svx/linkwarn.hxx b/include/svx/linkwarn.hxx index 9d6bbf4dbc51..07ea3b892c3c 100644 --- a/include/svx/linkwarn.hxx +++ b/include/svx/linkwarn.hxx @@ -31,7 +31,7 @@ private: public: SvxLinkWarningDialog(vcl::Window* pParent, const OUString& _rFileName); - virtual ~SvxLinkWarningDialog(); + virtual ~SvxLinkWarningDialog() override; virtual void dispose() override; }; diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx index 9bf46c642b26..118ea02ba764 100644 --- a/include/svx/measctrl.hxx +++ b/include/svx/measctrl.hxx @@ -36,7 +36,7 @@ private: public: SvxXMeasurePreview(vcl::Window* pParent, WinBits nStyle); - virtual ~SvxXMeasurePreview(); + virtual ~SvxXMeasurePreview() override; virtual void dispose() override; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index a2b44f234ecb..e5989253ba28 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -106,7 +106,7 @@ class SVX_DLLPUBLIC BulletsSettings_Impl:public BulletsSettings : BulletsSettings(eTy) , cBulletChar(0) {} - virtual ~BulletsSettings_Impl(){} + virtual ~BulletsSettings_Impl() override {} }; class SVX_DLLPUBLIC GrfBulDataRelation: public BulletsSettings @@ -124,7 +124,7 @@ class SVX_DLLPUBLIC GrfBulDataRelation: public BulletsSettings pGrfObj(nullptr), aSize(0,0) {} - virtual ~GrfBulDataRelation(){} + virtual ~GrfBulDataRelation() override {} }; class SVX_DLLPUBLIC MixBulletsSettings_Impl @@ -233,7 +233,7 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase static BulletsSettings_Impl* pActualBullets[DEFAULT_BULLET_TYPES]; public: BulletsTypeMgr(); - virtual ~BulletsTypeMgr() {} + virtual ~BulletsTypeMgr() override {} virtual void Init() override; virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) override; virtual void RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel) override; @@ -256,7 +256,7 @@ class SVX_DLLPUBLIC GraphicBulletsTypeMgr: public NBOTypeMgrBase ListType aGrfDataLst; public: GraphicBulletsTypeMgr(); - virtual ~GraphicBulletsTypeMgr(); + virtual ~GraphicBulletsTypeMgr() override; virtual void Init() override; virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) override; virtual void RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel) override; @@ -278,7 +278,7 @@ class SVX_DLLPUBLIC MixBulletsTypeMgr: public NBOTypeMgrBase static MixBulletsSettings_Impl* pDefaultActualBullets[DEFAULT_BULLET_TYPES]; public: MixBulletsTypeMgr(); - virtual ~MixBulletsTypeMgr() {} + virtual ~MixBulletsTypeMgr() override {} virtual void Init() override; virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) override; virtual void RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel) override; @@ -297,7 +297,7 @@ class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase NumberSettingsArr_Impl* pDefaultNumberSettingsArr; public: NumberingTypeMgr(); - virtual ~NumberingTypeMgr(); + virtual ~NumberingTypeMgr() override; virtual void Init() override; virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) override; virtual void RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel) override; @@ -316,7 +316,7 @@ class SVX_DLLPUBLIC OutlineTypeMgr: public NBOTypeMgrBase OutlineSettings_Impl* pDefaultOutlineSettingsArrs[DEFAULT_NUM_VALUSET_COUNT]; public: OutlineTypeMgr(); - virtual ~OutlineTypeMgr() {} + virtual ~OutlineTypeMgr() override {} virtual void Init() override; virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) override; virtual void RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel) override; diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx index 10314678d2af..694f8d5a3592 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -45,7 +45,7 @@ public: SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, const OUString& rValueStr, const sal_uInt16 nId ); SvxNumberInfoItem( const SvxNumberInfoItem& ); - virtual ~SvxNumberInfoItem(); + virtual ~SvxNumberInfoItem() override; virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index bbd8d919a445..0979d2c74f39 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -75,7 +75,7 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet public: SvxNumValueSet(vcl::Window* pParent, WinBits nWinBits = WB_TABSTOP); void init(NumberingPageType eType); - virtual ~SvxNumValueSet(); + virtual ~SvxNumValueSet() override; virtual void dispose() override; virtual void UserDraw( const UserDrawEvent& rUDEvt ) override; @@ -105,7 +105,7 @@ protected: public: SvxBmpNumValueSet(vcl::Window* pParent, WinBits nWinBits = WB_TABSTOP); - virtual ~SvxBmpNumValueSet(); + virtual ~SvxBmpNumValueSet() override; virtual void dispose() override; virtual void UserDraw( const UserDrawEvent& rUDEvt ) override; diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index a17dd6b5490c..5f852962309b 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -82,7 +82,7 @@ class E3dObjList : public SdrObjList public: E3dObjList(); - SVX_DLLPUBLIC virtual ~E3dObjList(); + SVX_DLLPUBLIC virtual ~E3dObjList() override; virtual E3dObjList* Clone() const override; @@ -143,7 +143,7 @@ public: virtual void RecalcSnapRect() override; virtual void SetRectsDirty(bool bNotMyself = false) override; - virtual ~E3dObject(); + virtual ~E3dObject() override; virtual sal_uInt32 GetObjInventor() const override; virtual sal_uInt16 GetObjIdentifier() const override; @@ -244,7 +244,7 @@ public: E3dCompoundObject(); E3dCompoundObject(E3dDefaultAttributes& rDefault); - virtual ~E3dCompoundObject(); + virtual ~E3dCompoundObject() override; virtual basegfx::B2DPolyPolygon TakeXorPoly() const override; virtual sal_uInt32 GetHdlCount() const override; diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index da7e37a73446..b0e2e59f92a8 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -101,7 +101,7 @@ class SVX_DLLPUBLIC SvxGridTabPage : public SfxTabPage public: SvxGridTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~SvxGridTabPage(); + virtual ~SvxGridTabPage() override; virtual void dispose() override; static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet& rAttrSet ); diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx index e344f3147ebe..82225f457de1 100644 --- a/include/svx/pagectrl.hxx +++ b/include/svx/pagectrl.hxx @@ -81,7 +81,7 @@ protected: public: SvxPageWindow(vcl::Window* pParent); - virtual ~SvxPageWindow(); + virtual ~SvxPageWindow() override; virtual void dispose() override; //UUUU diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index 8aa95584f40b..02466cfce962 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -72,7 +72,7 @@ public: SvxPageItem( const sal_uInt16 nId ); SvxPageItem( const SvxPageItem& rItem ); - virtual ~SvxPageItem(); + virtual ~SvxPageItem() override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx index e8dcfe7d9686..434d66660125 100644 --- a/include/svx/passwd.hxx +++ b/include/svx/passwd.hxx @@ -52,7 +52,7 @@ private: public: SvxPasswordDialog( vcl::Window* pParent, bool bAllowEmptyPasswords = false, bool bDisableOldPassword = false ); - virtual ~SvxPasswordDialog(); + virtual ~SvxPasswordDialog() override; virtual void dispose() override; OUString GetOldPassword() const { return m_pOldPasswdED->GetText(); } diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx index 388dfdea350d..345024d271fb 100644 --- a/include/svx/polygn3d.hxx +++ b/include/svx/polygn3d.hxx @@ -49,7 +49,7 @@ public: const basegfx::B3DPolyPolygon& rPolyPoly3D); E3dPolygonObj(); - virtual ~E3dPolygonObj(); + virtual ~E3dPolygonObj() override; const basegfx::B3DPolyPolygon& GetPolyPolygon3D() const { return aPolyPoly3D; } const basegfx::B3DPolyPolygon& GetPolyNormals3D() const { return aPolyNormals3D; } diff --git a/include/svx/pszctrl.hxx b/include/svx/pszctrl.hxx index f8e8dca4d07e..35441e14723c 100644 --- a/include/svx/pszctrl.hxx +++ b/include/svx/pszctrl.hxx @@ -38,7 +38,7 @@ public: SFX_DECL_STATUSBAR_CONTROL(); SvxPosSizeStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); - virtual ~SvxPosSizeStatusBarControl(); + virtual ~SvxPosSizeStatusBarControl() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; virtual void Paint( const UserDrawEvent& rEvt ) override; diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index 9dd5e2f57624..330b32d21bfc 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -41,7 +41,7 @@ public: SvxRotateModeItem( SvxRotateMode eMode=SVX_ROTATE_MODE_STANDARD, sal_uInt16 nWhich=0); SvxRotateModeItem( const SvxRotateModeItem& rItem ); - virtual ~SvxRotateModeItem(); + virtual ~SvxRotateModeItem() override; virtual sal_uInt16 GetValueCount() const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index a9aae6e140cb..3a8bfed02ea9 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -42,7 +42,7 @@ protected: public: RubyPreview(vcl::Window *pParent); - virtual ~RubyPreview(); + virtual ~RubyPreview() override; virtual void dispose() override; void setRubyDialog(SvxRubyDialog* pParentDlg) { @@ -153,7 +153,7 @@ protected: public: SvxRubyDialog(SfxBindings *pBindings, SfxChildWindow *pCW, vcl::Window* pParent); - virtual ~SvxRubyDialog(); + virtual ~SvxRubyDialog() override; virtual void dispose() override; virtual void Activate() override; diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index 5cdec682f0a5..7a81bbbc4c5d 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -261,7 +261,7 @@ public: SvxRuler(vcl::Window* pParent, vcl::Window *pEditWin, SvxRulerSupportFlags nRulerFlags, SfxBindings &rBindings, WinBits nWinStyle = WB_STDRULER); - virtual ~SvxRuler(); + virtual ~SvxRuler() override; virtual void dispose() override; void SetDefTabDist(long); diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 3eab85cd6877..294df95a14b3 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -185,7 +185,7 @@ public: SvxColumnItem(sal_uInt16 nAct = 0); SvxColumnItem(sal_uInt16 nActCol, sal_uInt16 nLeft, sal_uInt16 nRight = 0); // Table with borders SvxColumnItem(const SvxColumnItem& aItem); - virtual ~SvxColumnItem(); + virtual ~SvxColumnItem() override; SvxColumnItem &operator=(const SvxColumnItem &); diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx index be92d7ae5982..3babb6be0057 100644 --- a/include/svx/scene3d.hxx +++ b/include/svx/scene3d.hxx @@ -90,7 +90,7 @@ protected: public: E3dScene(); E3dScene(E3dDefaultAttributes& rDefault); - virtual ~E3dScene(); + virtual ~E3dScene() override; virtual void SetBoundRectDirty() override; diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx index a43d8790f4d2..9b731fe8009b 100644 --- a/include/svx/sdasaitm.hxx +++ b/include/svx/sdasaitm.hxx @@ -39,7 +39,7 @@ class SVX_DLLPUBLIC SdrCustomShapeAdjustmentItem : public SfxPoolItem SdrCustomShapeAdjustmentItem(); SdrCustomShapeAdjustmentItem( SvStream& rIn, sal_uInt16 nVersion ); - virtual ~SdrCustomShapeAdjustmentItem(); + virtual ~SdrCustomShapeAdjustmentItem() override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation(SfxItemPresentation ePresentation, diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index e7cfc76be8f9..31423f26728f 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -55,7 +55,7 @@ private: SdrCustomShapeGeometryItem(); SdrCustomShapeGeometryItem( const css::uno::Sequence< css::beans::PropertyValue >& ); SdrCustomShapeGeometryItem( SvStream& rIn, sal_uInt16 nVersion ); - virtual ~SdrCustomShapeGeometryItem(); + virtual ~SdrCustomShapeGeometryItem() override; virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation(SfxItemPresentation ePresentation, @@ -88,7 +88,7 @@ class SVX_DLLPUBLIC SdrCustomShapeReplacementURLItem : public SfxStringItem { public: SdrCustomShapeReplacementURLItem(); - virtual ~SdrCustomShapeReplacementURLItem(); + virtual ~SdrCustomShapeReplacementURLItem() override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; diff --git a/include/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx index 7b83945169d7..85c5b1159cbb 100644 --- a/include/svx/sdr/animation/animationstate.hxx +++ b/include/svx/sdr/animation/animationstate.hxx @@ -55,7 +55,7 @@ namespace sdr PrimitiveAnimation(sdr::contact::ViewObjectContact& rVOContact, const drawinglayer::primitive2d::Primitive2DContainer& rAnimatedPrimitives); // destructor - virtual ~PrimitiveAnimation(); + virtual ~PrimitiveAnimation() override; // execute event, from base class Event virtual void Trigger(sal_uInt32 nTime) override; diff --git a/include/svx/sdr/animation/objectanimator.hxx b/include/svx/sdr/animation/objectanimator.hxx index 5665b02d3eec..eab4fe79653c 100644 --- a/include/svx/sdr/animation/objectanimator.hxx +++ b/include/svx/sdr/animation/objectanimator.hxx @@ -36,7 +36,7 @@ namespace sdr public: // basic constructor and destructor primitiveAnimator(); - SVX_DLLPUBLIC virtual ~primitiveAnimator(); + SVX_DLLPUBLIC virtual ~primitiveAnimator() override; }; } // end of namespace animation } // end of namespace sdr diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx index 243d252a8c24..06477558f92f 100644 --- a/include/svx/sdr/animation/scheduler.hxx +++ b/include/svx/sdr/animation/scheduler.hxx @@ -113,7 +113,7 @@ namespace sdr public: // constructor/destructor SAL_DLLPRIVATE Scheduler(); - virtual ~Scheduler(); + virtual ~Scheduler() override; // From baseclass Timer, the timeout call virtual void Invoke() override; diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx index 640193123cbb..63f1247466ab 100644 --- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -39,7 +39,7 @@ protected: public: // basic constructor/destructor ObjectContactPainter(); - virtual ~ObjectContactPainter(); + virtual ~ObjectContactPainter() override; }; // typedef for transferring SdrObject @@ -67,7 +67,7 @@ public: OutputDevice& rTargetDevice, const SdrObjectVector& rObjects, const SdrPage* pProcessedPage); - virtual ~ObjectContactOfObjListPainter(); + virtual ~ObjectContactOfObjListPainter() override; // Process the whole displaying virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) override; @@ -100,7 +100,7 @@ protected: public: // basic constructor ObjectContactOfPagePainter(ObjectContact& rOriginalObjectContact); - virtual ~ObjectContactOfPagePainter(); + virtual ~ObjectContactOfPagePainter() override; // set another page void SetStartPage(const SdrPage* pPage); diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx index b475d511da50..a6a633eb698d 100644 --- a/include/svx/sdr/contact/viewcontactofe3d.hxx +++ b/include/svx/sdr/contact/viewcontactofe3d.hxx @@ -47,7 +47,7 @@ protected: public: // basic constructor, used from E3dObject. explicit ViewContactOfE3d(E3dObject& rObj); - virtual ~ViewContactOfE3d(); + virtual ~ViewContactOfE3d() override; // access to E3dObject const E3dObject& GetE3dObject() const diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx index 6087546b7faa..a618a788955c 100644 --- a/include/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx @@ -40,7 +40,7 @@ protected: public: // basic constructor, used from SdrObject. explicit ViewContactOfPageObj(SdrPageObj& rPageObj); - virtual ~ViewContactOfPageObj(); + virtual ~ViewContactOfPageObj() override; // #WIP# React on changes of the object of this ViewContact virtual void ActionChanged() override; diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index 902a55f29bf0..5652449d62e4 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -37,7 +37,7 @@ public: // basic constructor, used from SdrObject. explicit ViewContactOfSdrMediaObj( SdrMediaObj& rMediaObj ); - virtual ~ViewContactOfSdrMediaObj(); + virtual ~ViewContactOfSdrMediaObj() override; public: diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx index 2dbfdea043e8..81583a78932e 100644 --- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx @@ -55,7 +55,7 @@ public: // basic constructor, used from SdrObject. explicit ViewContactOfSdrObj(SdrObject& rObj); - virtual ~ViewContactOfSdrObj(); + virtual ~ViewContactOfSdrObj() override; // Access to possible sub-hierarchy virtual sal_uInt32 GetObjectCount() const override; diff --git a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx index 5892952808cd..e067fce70bda 100644 --- a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx @@ -37,7 +37,7 @@ protected: public: // basic constructor, used from SdrObject. explicit ViewContactOfSdrRectObj(SdrRectObj& rTextObj); - virtual ~ViewContactOfSdrRectObj(); + virtual ~ViewContactOfSdrRectObj() override; protected: // This method is responsible for creating the graphical visualisation data diff --git a/include/svx/sdr/contact/viewcontactoftextobj.hxx b/include/svx/sdr/contact/viewcontactoftextobj.hxx index 418ce1679f66..a81c4893bea2 100644 --- a/include/svx/sdr/contact/viewcontactoftextobj.hxx +++ b/include/svx/sdr/contact/viewcontactoftextobj.hxx @@ -31,7 +31,7 @@ class ViewContactOfTextObj : public ViewContactOfSdrObj public: // basic constructor, used from SdrObject. explicit ViewContactOfTextObj(SdrTextObj& rTextObj); - virtual ~ViewContactOfTextObj(); + virtual ~ViewContactOfTextObj() override; }; }} diff --git a/include/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx index eb83749cc4d6..e82e6ce30fb5 100644 --- a/include/svx/sdr/contact/viewcontactofvirtobj.hxx +++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx @@ -36,7 +36,7 @@ protected: public: // basic constructor, used from SdrObject. explicit ViewContactOfVirtObj(SdrVirtObj& rObj); - virtual ~ViewContactOfVirtObj(); + virtual ~ViewContactOfVirtObj() override; // Access to possible sub-hierarchy virtual sal_uInt32 GetObjectCount() const override; diff --git a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx index dccd52ca2b5c..e9b115ee4e2e 100644 --- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx @@ -42,7 +42,7 @@ protected: public: ViewObjectContactOfPageObj(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfPageObj(); + virtual ~ViewObjectContactOfPageObj() override; }; }} diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx index 9bd6e5ee516d..93332d41c917 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx @@ -44,7 +44,7 @@ protected: public: ViewObjectContactOfSdrObj(ObjectContact& rObjectContact, ViewContact& rViewContact); - virtual ~ViewObjectContactOfSdrObj(); + virtual ~ViewObjectContactOfSdrObj() override; virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const override; diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx index 20255ddd9dbc..c7c1f182aa2c 100644 --- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx @@ -66,7 +66,7 @@ namespace sdr sal_uInt16 nCenY2 = 0, double fShearX = 0.0, double fRotation = 0.0); - virtual ~OverlayAnimatedBitmapEx(); + virtual ~OverlayAnimatedBitmapEx() override; const BitmapEx& getBitmapEx1() const { return maBitmapEx1; } const BitmapEx& getBitmapEx2() const { return maBitmapEx2; } diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx index f8cc7ef8dcee..41dccb233e49 100644 --- a/include/svx/sdr/overlay/overlaybitmapex.hxx +++ b/include/svx/sdr/overlay/overlaybitmapex.hxx @@ -54,7 +54,7 @@ namespace sdr double fAlpha = 0.0, double fShearX = 0.0, double fRotation = 0.0); - virtual ~OverlayBitmapEx(); + virtual ~OverlayBitmapEx() override; const BitmapEx& getBitmapEx() const { return maBitmapEx; } diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx index 2be504623dc0..47ccf96ec19f 100644 --- a/include/svx/sdr/overlay/overlaymanager.hxx +++ b/include/svx/sdr/overlay/overlaymanager.hxx @@ -89,7 +89,7 @@ namespace sdr double getDiscreteOne() const; OverlayManager(OutputDevice& rOutputDevice); - virtual ~OverlayManager(); + virtual ~OverlayManager() override; public: static rtl::Reference<OverlayManager> create(OutputDevice& rOutputDevice); diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx index 35cb21956004..8aa49dc7b011 100644 --- a/include/svx/sdr/overlay/overlayobject.hxx +++ b/include/svx/sdr/overlay/overlayobject.hxx @@ -117,7 +117,7 @@ namespace sdr public: explicit OverlayObject(Color aBaseColor); - virtual ~OverlayObject(); + virtual ~OverlayObject() override; // get OverlayManager OverlayManager* getOverlayManager() const { return mpOverlayManager; } @@ -178,7 +178,7 @@ namespace sdr public: OverlayObjectWithBasePosition(const basegfx::B2DPoint& rBasePos, Color aBaseColor); - virtual ~OverlayObjectWithBasePosition(); + virtual ~OverlayObjectWithBasePosition() override; // access to basePosition const basegfx::B2DPoint& getBasePosition() const { return maBasePosition; } diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx index b2713a211374..751b67bdf43f 100644 --- a/include/svx/sdr/overlay/overlayobjectcell.hxx +++ b/include/svx/sdr/overlay/overlayobjectcell.hxx @@ -44,7 +44,7 @@ namespace sdr public: OverlayObjectCell( const Color& rColor, const RangeVector& rRects); - virtual ~OverlayObjectCell(); + virtual ~OverlayObjectCell() override; }; } // end of namespace overlay diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx index 7cc20f481aee..bcdf90f8e5f2 100644 --- a/include/svx/sdr/overlay/overlaypolypolygon.hxx +++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx @@ -41,7 +41,7 @@ namespace sdr public: explicit OverlayPolyPolygonStripedAndFilled( const basegfx::B2DPolyPolygon& rLinePolyPolygon); - virtual ~OverlayPolyPolygonStripedAndFilled(); + virtual ~OverlayPolyPolygonStripedAndFilled() override; // change geometry const basegfx::B2DPolyPolygon& getLinePolyPolygon() const { return maLinePolyPolygon; } diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx index 101e6a0c0352..2c0207b74c0a 100644 --- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx +++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx @@ -41,7 +41,7 @@ namespace sdr public: explicit OverlayPrimitive2DSequenceObject(const drawinglayer::primitive2d::Primitive2DContainer& rSequence); - virtual ~OverlayPrimitive2DSequenceObject(); + virtual ~OverlayPrimitive2DSequenceObject() override; // data read access const drawinglayer::primitive2d::Primitive2DContainer& getSequence() const { return maSequence; } diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx index b5ac1a8ca536..fe1c11e4d3f4 100644 --- a/include/svx/sdr/overlay/overlayselection.hxx +++ b/include/svx/sdr/overlay/overlayselection.hxx @@ -62,7 +62,7 @@ namespace sdr const Color& rColor, const std::vector< basegfx::B2DRange >& rRanges, bool bBorder); - virtual ~OverlaySelection(); + virtual ~OverlaySelection() override; // data read access const std::vector< basegfx::B2DRange >& getRanges() const { return maRanges; } diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx index 3dcbc52f1151..5ef25d56426d 100644 --- a/include/svx/sdr/overlay/overlaytriangle.hxx +++ b/include/svx/sdr/overlay/overlaytriangle.hxx @@ -42,7 +42,7 @@ namespace sdr const basegfx::B2DPoint& rSecondPos, const basegfx::B2DPoint& rThirdPos, Color aTriangleColor); - virtual ~OverlayTriangle(); + virtual ~OverlayTriangle() override; // get second position const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; } diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx index 0a8e4e5682e2..5864f0e75f00 100644 --- a/include/svx/sdr/properties/defaultproperties.hxx +++ b/include/svx/sdr/properties/defaultproperties.hxx @@ -58,7 +58,7 @@ namespace sdr DefaultProperties(const DefaultProperties& rProps, SdrObject& rObj); // destructor - virtual ~DefaultProperties(); + virtual ~DefaultProperties() override; void dumpAsXml(struct _xmlTextWriter * pWriter) const; diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 76a7d338e0ed..a6759e1854b0 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -43,7 +43,7 @@ class SVX_DLLPUBLIC SvxTableController: public sdr::SelectionController { public: SVX_DLLPRIVATE SvxTableController( SdrObjEditView* pView, const SdrObject* pObj ); - SVX_DLLPRIVATE virtual ~SvxTableController(); + SVX_DLLPRIVATE virtual ~SvxTableController() override; // from sdr::SelectionController SVX_DLLPRIVATE virtual bool onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) override; diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx index 14f05b7ce8e1..2add5cac9553 100644 --- a/include/svx/sdrundomanager.hxx +++ b/include/svx/sdrundomanager.hxx @@ -40,7 +40,7 @@ protected: public: SdrUndoManager(sal_uInt16 nMaxUndoActionCount = 20); - virtual ~SdrUndoManager(); + virtual ~SdrUndoManager() override; /// react depending on edit mode and if no more undo is possible virtual bool Undo() override; diff --git a/include/svx/sdtaiitm.hxx b/include/svx/sdtaiitm.hxx index 4a61fdf56e0e..37e6a8002d43 100644 --- a/include/svx/sdtaiitm.hxx +++ b/include/svx/sdtaiitm.hxx @@ -25,14 +25,14 @@ class SVX_DLLPUBLIC SdrTextAniStartInsideItem: public SdrYesNoItem { public: SdrTextAniStartInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {} - virtual ~SdrTextAniStartInsideItem(); + virtual ~SdrTextAniStartInsideItem() override; virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; }; class SVX_DLLPUBLIC SdrTextAniStopInsideItem: public SdrYesNoItem { public: SdrTextAniStopInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {} - virtual ~SdrTextAniStopInsideItem(); + virtual ~SdrTextAniStopInsideItem() override; virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; }; diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx index a30bf7328ebf..f6827b54612e 100644 --- a/include/svx/sidebar/AreaPropertyPanelBase.hxx +++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx @@ -89,7 +89,7 @@ public: vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame); - virtual ~AreaPropertyPanelBase(); + virtual ~AreaPropertyPanelBase() override; virtual void setFillTransparence(const XFillTransparenceItem& rItem) = 0; virtual void setFillFloatTransparence(const XFillFloatTransparenceItem& rItem) = 0; diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx index 8c74dff80a62..c7aee94b6f48 100644 --- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx +++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx @@ -36,7 +36,7 @@ public: AreaTransparencyGradientPopup ( vcl::Window* pParent, ::std::function<PopupControl*(PopupContainer*)> const& rControlCreator); - virtual ~AreaTransparencyGradientPopup(); + virtual ~AreaTransparencyGradientPopup() override; void Rearrange (XFillFloatTransparenceItem* pItem); }; diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index 91d963221c8d..0d173380c527 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -68,7 +68,7 @@ namespace sidebar class SVX_DLLPUBLIC LinePropertyPanelBase : public PanelLayout { public: - virtual ~LinePropertyPanelBase(); + virtual ~LinePropertyPanelBase() override; virtual void dispose() override; virtual void DataChanged( diff --git a/include/svx/sidebar/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx index c24ce65e9031..bdeeebe6c50f 100644 --- a/include/svx/sidebar/LineWidthPopup.hxx +++ b/include/svx/sidebar/LineWidthPopup.hxx @@ -37,7 +37,7 @@ class LineWidthPopup : public FloatingWindow public: LineWidthPopup(LinePropertyPanelBase& rParent); virtual void dispose() override; - virtual ~LineWidthPopup(); + virtual ~LineWidthPopup() override; void SetWidthSelect (long lValue, bool bValuable, MapUnit eMapUnit); diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx index ddc2a0e5e084..7b1c15cdb853 100644 --- a/include/svx/sidebar/PanelLayout.hxx +++ b/include/svx/sidebar/PanelLayout.hxx @@ -34,7 +34,7 @@ private: public: PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame); - virtual ~PanelLayout(); + virtual ~PanelLayout() override; virtual void dispose() override; virtual Size GetOptimalSize() const override; diff --git a/include/svx/sidebar/PopupContainer.hxx b/include/svx/sidebar/PopupContainer.hxx index 851c38fa62fd..f46e77eddbe9 100644 --- a/include/svx/sidebar/PopupContainer.hxx +++ b/include/svx/sidebar/PopupContainer.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC PopupContainer { public: PopupContainer (vcl::Window* pParent); - virtual ~PopupContainer(); + virtual ~PopupContainer() override; virtual bool Notify (NotifyEvent& rNEvt) override; }; diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx index 38d72ab2cca4..d0c4d460e90d 100644 --- a/include/svx/sidebar/SelectionChangeHandler.hxx +++ b/include/svx/sidebar/SelectionChangeHandler.hxx @@ -51,7 +51,7 @@ public: const std::function<rtl::OUString ()>& rSelectionChangeCallback, const css::uno::Reference<css::frame::XController>& rxController, const vcl::EnumContext::Context eDefaultContext); - virtual ~SelectionChangeHandler(); + virtual ~SelectionChangeHandler() override; virtual void SAL_CALL selectionChanged (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index f77f3f55fcab..89a5ee728017 100755 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -95,7 +95,7 @@ public: SvxSearchDialogWrapper( vcl::Window*pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); - virtual ~SvxSearchDialogWrapper (); + virtual ~SvxSearchDialogWrapper () override; SvxSearchDialog *getDialog () { return dialog;} static void SetSearchLabel(const SearchLabel& rSL); static void SetSearchLabel(const OUString& sStr); @@ -121,7 +121,7 @@ friend class SvxJSearchOptionsDialog; public: SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind ); - virtual ~SvxSearchDialog(); + virtual ~SvxSearchDialog() override; virtual void dispose() override; virtual bool Close() override; diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index 085f235ea6aa..47e4dc9c6b37 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -70,7 +70,7 @@ protected: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView SdrCreateView(SdrModel* pModel1, OutputDevice* pOut = nullptr); - virtual ~SdrCreateView(); + virtual ~SdrCreateView() override; public: virtual bool IsAction() const override; diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index ab6bb5c59bc9..3eefaa79bec1 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -54,7 +54,7 @@ private: public: SdrDragEntryPolyPolygon(const basegfx::B2DPolyPolygon& rOriginalPolyPolygon); - virtual ~SdrDragEntryPolyPolygon(); + virtual ~SdrDragEntryPolyPolygon() override; virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; }; @@ -70,7 +70,7 @@ private: public: SdrDragEntrySdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify); - virtual ~SdrDragEntrySdrObject(); + virtual ~SdrDragEntrySdrObject() override; // #i54102# Split createPrimitive2DSequenceInCurrentState in prepareCurrentState and processing, // added accessors to original and clone @@ -90,7 +90,7 @@ private: public: SdrDragEntryPrimitive2DSequence( const drawinglayer::primitive2d::Primitive2DContainer& rSequence); - virtual ~SdrDragEntryPrimitive2DSequence(); + virtual ~SdrDragEntryPrimitive2DSequence() override; virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; }; @@ -104,7 +104,7 @@ private: public: SdrDragEntryPointGlueDrag(const std::vector< basegfx::B2DPoint >& rPositions, bool bIsPointDrag); - virtual ~SdrDragEntryPointGlueDrag(); + virtual ~SdrDragEntryPointGlueDrag() override; virtual drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; }; @@ -280,7 +280,7 @@ protected: public: SdrDragObjOwn(SdrDragView& rNewView); - virtual ~SdrDragObjOwn(); + virtual ~SdrDragObjOwn() override; virtual void TakeSdrDragComment(OUString& rStr) const override; virtual bool BeginSdrDrag() override; diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx index 3a84ee644bb7..2bdda05b4b74 100644 --- a/include/svx/svddrgv.hxx +++ b/include/svx/svddrgv.hxx @@ -69,7 +69,7 @@ protected: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView SdrDragView(SdrModel* pModel1, OutputDevice* pOut = nullptr); - virtual ~SdrDragView(); + virtual ~SdrDragView() override; public: virtual bool IsAction() const override; diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index aefeb0c0e87e..bdf7f00747f7 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -169,7 +169,7 @@ protected: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView SdrEditView(SdrModel* pModel1, OutputDevice* pOut = nullptr); - virtual ~SdrEditView(); + virtual ~SdrEditView() override; public: // each call of an undo-capable method from its view, generates an undo action. diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index a22f5b5c1f21..d293e3afb356 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -141,7 +141,7 @@ protected: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView SdrObjEditView(SdrModel* pModel1, OutputDevice* pOut = nullptr); - virtual ~SdrObjEditView(); + virtual ~SdrObjEditView() override; public: diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx index a1f84c0c24e6..b920d248ab0f 100644 --- a/include/svx/svdglev.hxx +++ b/include/svx/svdglev.hxx @@ -41,7 +41,7 @@ class SVX_DLLPUBLIC SdrGlueEditView: public SdrPolyEditView protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView SdrGlueEditView(SdrModel* pModel1, OutputDevice* pOut = nullptr); - virtual ~SdrGlueEditView(); + virtual ~SdrGlueEditView() override; public: // the parameter nThisEsc is used to hand over the direction, diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 399a009b3ea7..43fc5568ee0c 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -265,7 +265,7 @@ private: public: explicit SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), bool bLum = false); - virtual ~SdrHdlColor(); + virtual ~SdrHdlColor() override; bool IsUseLuminance() const { return bUseLuminance; } @@ -300,7 +300,7 @@ private: public: SdrHdlGradient(const Point& rRef1, const Point& rRef2, bool bGrad = true); - virtual ~SdrHdlGradient(); + virtual ~SdrHdlGradient() override; bool IsGradient() const { return bGradient; } @@ -338,7 +338,7 @@ protected: public: SdrHdlLine(SdrHdl& rHdl1, SdrHdl& rHdl2, SdrHdlKind eNewKind=SdrHdlKind::MirrorAxis) { eKind=eNewKind; pHdl1=&rHdl1; pHdl2=&rHdl2; } - virtual ~SdrHdlLine(); + virtual ~SdrHdlLine() override; virtual Pointer GetPointer() const override; }; @@ -357,7 +357,7 @@ protected: public: // this is not a Copy-Ctor!!! SdrHdlBezWgt(const SdrHdl* pRefHdl1, SdrHdlKind eNewKind=SdrHdlKind::BezierWeight) { eKind=eNewKind; pHdl1=pRefHdl1; } - virtual ~SdrHdlBezWgt(); + virtual ~SdrHdlBezWgt() override; }; @@ -382,7 +382,7 @@ class ImpEdgeHdl: public SdrHdl public: ImpEdgeHdl(const Point& rPnt, SdrHdlKind eNewKind): SdrHdl(rPnt,eNewKind),eLineCode(SdrEdgeLineCode::MiddleLine) {} - virtual ~ImpEdgeHdl(); + virtual ~ImpEdgeHdl() override; void SetLineCode(SdrEdgeLineCode eCode); SdrEdgeLineCode GetLineCode() const { return eLineCode; } @@ -398,7 +398,7 @@ class ImpMeasureHdl: public SdrHdl public: ImpMeasureHdl(const Point& rPnt, SdrHdlKind eNewKind): SdrHdl(rPnt,eNewKind) {} - virtual ~ImpMeasureHdl(); + virtual ~ImpMeasureHdl() override; virtual Pointer GetPointer() const override; }; diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 63c75f46f05c..5a49fee76568 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -261,7 +261,7 @@ public: explicit SdrModel(); explicit SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers); explicit SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable); - virtual ~SdrModel(); + virtual ~SdrModel() override; void ClearModel(bool bCalledFromDestructor); // Override this to enable the Swap/LoadOnDemand of graphics. diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index ae49ba2344be..e58ff885a8c7 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -170,7 +170,7 @@ protected: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView SdrMarkView(SdrModel* pModel1, OutputDevice* pOut = nullptr); - virtual ~SdrMarkView(); + virtual ~SdrMarkView() override; public: virtual bool IsAction() const override; diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index 8166a9cc2218..faba91a5b207 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -161,7 +161,7 @@ public: double GetExtraTextRotation( const bool bPreRotation = false ) const; SdrObjCustomShape(); - virtual ~SdrObjCustomShape(); + virtual ~SdrObjCustomShape() override; /* is merging default attributes from type-shape into the SdrCustomShapeGeometryItem. If pType is NULL then the type is being taken from the "Type" property of the SdrCustomShapeGeometryItem. diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx index 543e67b3e698..8ec8673d5648 100644 --- a/include/svx/svdoattr.hxx +++ b/include/svx/svdoattr.hxx @@ -60,7 +60,7 @@ protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; SdrAttrObj(); - virtual ~SdrAttrObj(); + virtual ~SdrAttrObj() override; public: diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 7b3741c973f4..3e10abd7d6cf 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -404,7 +404,7 @@ protected: virtual void RestGeoData(const SdrObjGeoData& rGeo); protected: - virtual ~SdrObject(); + virtual ~SdrObject() override; public: SdrObject(); diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index 34093992a884..7e08a905a031 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -76,7 +76,7 @@ private: public: SdrCaptionObj(); SdrCaptionObj(const Rectangle& rRect, const Point& rTail); - virtual ~SdrCaptionObj(); + virtual ~SdrCaptionObj() override; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx index 0245fdca7cfc..a713586ad70f 100644 --- a/include/svx/svdocirc.hxx +++ b/include/svx/svdocirc.hxx @@ -76,7 +76,7 @@ public: // If nNewStartAngle==nNewEndWink, then arc has an angle of 0 degrees. // If nNewStartAngle+36000==nNewEndWink, then the arc has angle of 360 degrees. SdrCircObj(SdrObjKind eNewKind, const Rectangle& rRect, long nNewStartAngle, long nNewEndWink); - virtual ~SdrCircObj(); + virtual ~SdrCircObj() override; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 0851689c5971..96f5d3287ae1 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -133,7 +133,7 @@ public: public: SdrEdgeObjGeoData(); - virtual ~SdrEdgeObjGeoData(); + virtual ~SdrEdgeObjGeoData() override; }; @@ -204,7 +204,7 @@ protected: public: SdrEdgeObj(); - virtual ~SdrEdgeObj(); + virtual ~SdrEdgeObj() override; SdrObjConnection& GetConnection(bool bTail1) { return *(bTail1 ? &aCon1 : &aCon2); } virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index f52ef362f374..81c7969e4bc8 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -119,7 +119,7 @@ public: SdrGrafObj(); SdrGrafObj(const Graphic& rGrf); SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect); - virtual ~SdrGrafObj(); + virtual ~SdrGrafObj() override; void SetGraphicObject( const GraphicObject& rGrfObj ); const GraphicObject& GetGraphicObject(bool bForceSwapIn = false) const; diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx index 7ebcc8ea0d8f..b1694272d9e9 100644 --- a/include/svx/svdogrp.hxx +++ b/include/svx/svdogrp.hxx @@ -47,7 +47,7 @@ protected: public: SdrObjGroup(); - virtual ~SdrObjGroup(); + virtual ~SdrObjGroup() override; virtual void SetBoundRectDirty() override; virtual sal_uInt16 GetObjIdentifier() const override; diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index c095545ff9bc..f6c4169fd80c 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -48,7 +48,7 @@ public: public: SdrMeasureObjGeoData(); - virtual ~SdrMeasureObjGeoData(); + virtual ~SdrMeasureObjGeoData() override; }; @@ -87,7 +87,7 @@ protected: public: SdrMeasureObj(); SdrMeasureObj(const Point& rPt1, const Point& rPt2); - virtual ~SdrMeasureObj(); + virtual ~SdrMeasureObj() override; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index 9ea8d917d521..28d94c9a668e 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -39,7 +39,7 @@ public: SdrMediaObj(); SdrMediaObj( const Rectangle& rRect ); - virtual ~SdrMediaObj(); + virtual ~SdrMediaObj() override; virtual bool HasTextEdit() const override; diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 39c7507df7be..3d78224af842 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -68,7 +68,7 @@ public: SdrOle2Obj( bool bFrame_ = false ); SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect ); - virtual ~SdrOle2Obj(); + virtual ~SdrOle2Obj() override; const svt::EmbeddedObjectRef& getEmbeddedObjectRef() const; diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx index 3b1ca61ad0bb..5f2947fc0702 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -43,7 +43,7 @@ protected: public: SdrPageObj(SdrPage* pNewPage = nullptr); SdrPageObj(const Rectangle& rRect, SdrPage* pNewPage = nullptr); - virtual ~SdrPageObj(); + virtual ~SdrPageObj() override; SdrPage* GetReferencedPage() const { return mpShownPage;} void SetReferencedPage(SdrPage* pNewPage); diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx index ccdb218aaf8c..91b5bfe925ad 100644 --- a/include/svx/svdopath.hxx +++ b/include/svx/svdopath.hxx @@ -37,7 +37,7 @@ public: SdrObjKind meKind; SdrPathObjGeoData(); - virtual ~SdrPathObjGeoData(); + virtual ~SdrPathObjGeoData() override; }; @@ -71,7 +71,7 @@ public: SdrPathObj(SdrObjKind eNewKind); SdrPathObj(SdrObjKind eNewKind, const basegfx::B2DPolyPolygon& rPathPoly, double dBrightness = 1.0); - virtual ~SdrPathObj(); + virtual ~SdrPathObj() override; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx index e7e4c734715a..0934c6f42b65 100644 --- a/include/svx/svdorect.hxx +++ b/include/svx/svdorect.hxx @@ -73,7 +73,7 @@ public: // Constructor of a text frame SdrRectObj(SdrObjKind eNewTextKind); SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect); - virtual ~SdrRectObj(); + virtual ~SdrRectObj() override; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override; virtual sal_uInt16 GetObjIdentifier() const override; diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index dc0b5a6dec3d..71edde822018 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -100,7 +100,7 @@ class SVX_DLLPUBLIC SdrTableObj : public ::SdrTextObj public: SdrTableObj(SdrModel* _pModel); SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int32 nColumns, sal_Int32 nRows); - virtual ~SdrTableObj(); + virtual ~SdrTableObj() override; // Table stuff diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index cb8abe4ae063..1a4e35ed717c 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -110,7 +110,7 @@ class ImpSdrObjTextLinkUserData : public SdrObjUserData public: ImpSdrObjTextLinkUserData(); - virtual ~ImpSdrObjTextLinkUserData(); + virtual ~ImpSdrObjTextLinkUserData() override; virtual SdrObjUserData* Clone(SdrObject* pObj1) const override; }; @@ -315,7 +315,7 @@ protected: SdrTextObj(SdrObjKind eNewTextKind); SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect); - virtual ~SdrTextObj(); + virtual ~SdrTextObj() override; public: diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index 0c6852924b2c..ea39a18a69d3 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -64,7 +64,7 @@ public: explicit SdrUnoObj(const OUString& rModelName); SdrUnoObj(const OUString& rModelName, const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSFac); - virtual ~SdrUnoObj(); + virtual ~SdrUnoObj() override; virtual void SetPage(SdrPage* pNewPage) override; virtual void SetModel(SdrModel* pModel) override; diff --git a/include/svx/svdoutl.hxx b/include/svx/svdoutl.hxx index c76fbb9c2345..a9a885f68fac 100644 --- a/include/svx/svdoutl.hxx +++ b/include/svx/svdoutl.hxx @@ -35,7 +35,7 @@ protected: public: SdrOutliner( SfxItemPool* pItemPool, OutlinerMode nMode ); - virtual ~SdrOutliner() ; + virtual ~SdrOutliner() override ; void SetTextObj( const SdrTextObj* pObj ); void SetTextObjNoInit( const SdrTextObj* pObj ); diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index 64f5caf13778..d81732e863fb 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -48,7 +48,7 @@ protected: public: SdrVirtObj(SdrObject& rNewObj); - virtual ~SdrVirtObj(); + virtual ~SdrVirtObj() override; SdrObject& ReferencedObj(); const SdrObject& GetReferencedObj() const; virtual void NbcSetAnchorPos(const Point& rAnchorPos) override; diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 4dcf9b45d9df..98c53cfe3150 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -342,7 +342,7 @@ private: public: // construct/destruct SdrPageProperties(SdrPage& rSdrPage); - virtual ~SdrPageProperties(); + virtual ~SdrPageProperties() override; // Notify(...) from baseclass SfxListener virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; @@ -447,7 +447,7 @@ protected: public: explicit SdrPage(SdrModel& rNewModel, bool bMasterPage=false); - virtual ~SdrPage(); + virtual ~SdrPage() override; virtual SdrPage* Clone() const override; virtual SdrPage* Clone(SdrModel* pNewModel) const; bool IsMasterPage() const { return mbMaster; } @@ -541,7 +541,7 @@ class SVX_DLLPUBLIC StandardCheckVisisbilityRedirector : public sdr::contact::Vi { public: StandardCheckVisisbilityRedirector(); - virtual ~StandardCheckVisisbilityRedirector(); + virtual ~StandardCheckVisisbilityRedirector() override; // all default implementations just call the same methods at the original. To do something // different, override the method and at least do what the method does. diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index e7245bbb7b63..158111542f3d 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -252,7 +252,7 @@ protected: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView SdrPaintView(SdrModel* pModel1, OutputDevice* pOut = nullptr); - virtual ~SdrPaintView(); + virtual ~SdrPaintView() override; public: diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx index 7cb2e95bb42e..a4c2d948778d 100644 --- a/include/svx/svdpoev.hxx +++ b/include/svx/svdpoev.hxx @@ -47,7 +47,7 @@ private: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView SdrPolyEditView(SdrModel* pModel1, OutputDevice* pOut = nullptr); - virtual ~SdrPolyEditView(); + virtual ~SdrPolyEditView() override; public: bool IsSetMarkedPointsSmoothPossible() const override; diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index cbbe980f3926..7605fb50c879 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -34,7 +34,7 @@ public: SdrItemPool(SfxItemPool* pMaster = nullptr, bool bLoadRefCounts = true); SdrItemPool(const SdrItemPool& rPool); protected: - virtual ~SdrItemPool(); + virtual ~SdrItemPool() override; public: virtual SfxItemPool* Clone() const override; diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index 621b03f63826..47e001ab1c56 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -128,7 +128,7 @@ protected: protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView SdrSnapView(SdrModel* pModel1, OutputDevice* pOut = nullptr); - virtual ~SdrSnapView(); + virtual ~SdrSnapView() override; public: virtual bool IsAction() const override; diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 906f565d2d14..504dc818f4f1 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -61,7 +61,7 @@ protected: SdrUndoAction(SdrModel& rNewMod); public: - virtual ~SdrUndoAction(); + virtual ~SdrUndoAction() override; virtual bool CanRepeat(SfxRepeatTarget& rView) const override; virtual void Repeat(SfxRepeatTarget& rView) override; @@ -96,7 +96,7 @@ protected: public: SdrUndoGroup(SdrModel& rNewMod); - virtual ~SdrUndoGroup(); + virtual ~SdrUndoGroup() override; void Clear(); sal_uIntPtr GetActionCount() const { return aBuf.size(); } @@ -169,7 +169,7 @@ protected: public: SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1 = false, bool bSaveText = false); - virtual ~SdrUndoAttrObj(); + virtual ~SdrUndoAttrObj() override; virtual void Undo() override; virtual void Redo() override; @@ -193,7 +193,7 @@ protected: public: SdrUndoMoveObj(SdrObject& rNewObj): SdrUndoObj(rNewObj) {} SdrUndoMoveObj(SdrObject& rNewObj, const Size& rDist): SdrUndoObj(rNewObj),aDistance(rDist) {} - virtual ~SdrUndoMoveObj(); + virtual ~SdrUndoMoveObj() override; virtual void Undo() override; virtual void Redo() override; @@ -222,7 +222,7 @@ protected: public: SdrUndoGeoObj(SdrObject& rNewObj); - virtual ~SdrUndoGeoObj(); + virtual ~SdrUndoGeoObj() override; virtual void Undo() override; virtual void Redo() override; @@ -249,7 +249,7 @@ protected: protected: SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect = false); - virtual ~SdrUndoObjList(); + virtual ~SdrUndoObjList() override; bool IsOwner() { return bOwner; } void SetOwner(bool bNew); @@ -271,7 +271,7 @@ public: virtual void Undo() override; virtual void Redo() override; - virtual ~SdrUndoRemoveObj(); + virtual ~SdrUndoRemoveObj() override; }; /** @@ -346,7 +346,7 @@ protected: public: SdrUndoReplaceObj(SdrObject& rOldObj1, SdrObject& rNewObj1, bool bOrdNumDirect = false); - virtual ~SdrUndoReplaceObj(); + virtual ~SdrUndoReplaceObj() override; virtual void Undo() override; virtual void Redo() override; @@ -414,7 +414,7 @@ protected: public: SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText ); - virtual ~SdrUndoObjSetText(); + virtual ~SdrUndoObjSetText() override; bool IsDifferent() const { return pOldText!=pNewText; } void AfterSetText(); @@ -479,7 +479,7 @@ protected: protected: SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); - virtual ~SdrUndoLayer(); + virtual ~SdrUndoLayer() override; }; /** @@ -575,7 +575,7 @@ protected: protected: SdrUndoPageList(SdrPage& rNewPg); - virtual ~SdrUndoPageList(); + virtual ~SdrUndoPageList() override; }; /** @@ -594,7 +594,7 @@ class SVX_DLLPUBLIC SdrUndoDelPage : public SdrUndoPageList public: SdrUndoDelPage(SdrPage& rNewPg, bool bSoleOwnerOfFillBitmapProps); - virtual ~SdrUndoDelPage(); + virtual ~SdrUndoDelPage() override; virtual void Undo() override; virtual void Redo() override; @@ -686,7 +686,7 @@ protected: SdrUndoPageMasterPage(SdrPage& rChangedPage); public: - SVX_DLLPUBLIC virtual ~SdrUndoPageMasterPage(); + SVX_DLLPUBLIC virtual ~SdrUndoPageMasterPage() override; }; /** diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index d4b39affa197..11d69b1e484f 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -169,7 +169,7 @@ protected: public: explicit SdrView(SdrModel* pModel1, OutputDevice* pOut = nullptr); - virtual ~SdrView(); + virtual ~SdrView() override; // The default value for all dispatchers is activated. If the app for example // wants to intervene in MouseDispatcher for special treatment, you have to diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index 9131821778ec..20b6b9dfddea 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -274,7 +274,7 @@ class SVX_DLLPUBLIC SvxAbstractDialogFactory : public SfxAbstractDialogFactory, public: static SvxAbstractDialogFactory* Create(); - virtual ~SvxAbstractDialogFactory(); + virtual ~SvxAbstractDialogFactory() override; virtual SfxAbstractTabDialog* CreateTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttrSet, diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index a307d5099e51..4d8acea0f382 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -52,7 +52,7 @@ public: class SVX_DLLPUBLIC SdrCaptionEscIsRelItem: public SdrYesNoItem { public: SdrCaptionEscIsRelItem(bool bRel=true): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {} - virtual ~SdrCaptionEscIsRelItem(); + virtual ~SdrCaptionEscIsRelItem() override; virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; }; @@ -66,7 +66,7 @@ public: class SVX_DLLPUBLIC SdrCaptionEscRelItem: public SfxInt32Item { public: SdrCaptionEscRelItem(long nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL,nEscRel) {} - virtual ~SdrCaptionEscRelItem(); + virtual ~SdrCaptionEscRelItem() override; virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; }; diff --git a/include/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx index 8090e17fd67e..2b3dae33f370 100644 --- a/include/svx/sxcllitm.hxx +++ b/include/svx/sxcllitm.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC SdrCaptionLineLenItem: public SdrMetricItem { public: SdrCaptionLineLenItem(long nLineLen=0): SdrMetricItem(SDRATTR_CAPTIONLINELEN,nLineLen) {} - virtual ~SdrCaptionLineLenItem(); + virtual ~SdrCaptionLineLenItem() override; virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; }; @@ -42,7 +42,7 @@ public: class SVX_DLLPUBLIC SdrCaptionFitLineLenItem: public SdrYesNoItem { public: SdrCaptionFitLineLenItem(bool bBestFit=true): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {} - virtual ~SdrCaptionFitLineLenItem(); + virtual ~SdrCaptionFitLineLenItem() override; virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; }; diff --git a/include/svx/sxmbritm.hxx b/include/svx/sxmbritm.hxx index bd3343d3d5e0..f1f3310ed26e 100644 --- a/include/svx/sxmbritm.hxx +++ b/include/svx/sxmbritm.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrMeasureBelowRefEdgeItem: public SdrYesNoItem { public: SdrMeasureBelowRefEdgeItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASUREBELOWREFEDGE,bOn) {} - virtual ~SdrMeasureBelowRefEdgeItem(); + virtual ~SdrMeasureBelowRefEdgeItem() override; virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; }; diff --git a/include/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx index 1fb2b3debc5f..525e9e72bbae 100644 --- a/include/svx/sxmtfitm.hxx +++ b/include/svx/sxmtfitm.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SdrMeasureTextIsFixedAngleItem: public SdrYesNoItem { public: SdrMeasureTextIsFixedAngleItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,bOn) {} - virtual ~SdrMeasureTextIsFixedAngleItem(); + virtual ~SdrMeasureTextIsFixedAngleItem() override; virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; }; @@ -38,7 +38,7 @@ public: class SVX_DLLPUBLIC SdrMeasureTextFixedAngleItem: public SdrAngleItem { public: SdrMeasureTextFixedAngleItem(long nVal=0): SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,nVal) {} - virtual ~SdrMeasureTextFixedAngleItem(); + virtual ~SdrMeasureTextFixedAngleItem() override; virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; }; @@ -46,7 +46,7 @@ public: class SVX_DLLPUBLIC SdrMeasureDecimalPlacesItem: public SfxInt16Item { public: SdrMeasureDecimalPlacesItem(sal_Int16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal) {} - virtual ~SdrMeasureDecimalPlacesItem(); + virtual ~SdrMeasureDecimalPlacesItem() override; virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; }; diff --git a/include/svx/sxmtritm.hxx b/include/svx/sxmtritm.hxx index 07d33a18c0b7..690f2ea4cea7 100644 --- a/include/svx/sxmtritm.hxx +++ b/include/svx/sxmtritm.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC SdrMeasureTextRota90Item: public SdrYesNoItem { public: SdrMeasureTextRota90Item(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTROTA90,bOn) {} - virtual ~SdrMeasureTextRota90Item(); + virtual ~SdrMeasureTextRota90Item() override; virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; }; @@ -35,7 +35,7 @@ public: class SVX_DLLPUBLIC SdrMeasureTextUpsideDownItem: public SdrYesNoItem { public: SdrMeasureTextUpsideDownItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTUPSIDEDOWN,bOn) {} - virtual ~SdrMeasureTextUpsideDownItem(); + virtual ~SdrMeasureTextUpsideDownItem() override; virtual SfxPoolItem* Clone(SfxItemPool* pPool=nullptr) const override; }; diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 5e96b22fc040..a1505473cc5c 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -162,7 +162,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxStyleToolBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rToolBox); - virtual ~SvxStyleToolBoxControl(); + virtual ~SvxStyleToolBoxControl() override; virtual VclPtr<vcl::Window> CreateItemWindow(vcl::Window* pParent) override; @@ -240,7 +240,7 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); SvxColorToolBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rToolBox); - virtual ~SvxColorToolBoxControl(); + virtual ~SvxColorToolBoxControl() override; virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; @@ -284,7 +284,7 @@ private: public: SFX_DECL_TOOLBOX_CONTROL(); SvxSimpleUndoRedoController(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rToolBox); - virtual ~SvxSimpleUndoRedoController(); + virtual ~SvxSimpleUndoRedoController() override; virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; @@ -301,7 +301,7 @@ public: std::vector<sal_uInt16>& rCurrencyList ); SFX_DECL_TOOLBOX_CONTROL(); SvxCurrencyToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); - virtual ~SvxCurrencyToolBoxControl(); + virtual ~SvxCurrencyToolBoxControl() override; virtual void Select( sal_uInt16 nSelectModifier ) override; virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; diff --git a/include/svx/tbxctl.hxx b/include/svx/tbxctl.hxx index fb18d8baddc6..5aa9e102b674 100644 --- a/include/svx/tbxctl.hxx +++ b/include/svx/tbxctl.hxx @@ -41,7 +41,7 @@ public: SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual ~SvxTbxCtlDraw() {} + virtual ~SvxTbxCtlDraw() override {} SFX_DECL_TOOLBOX_CONTROL(); diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx index 5b1c0143c4d1..dc86c1626f0a 100644 --- a/include/svx/txencbox.hxx +++ b/include/svx/txencbox.hxx @@ -34,7 +34,7 @@ private: public: SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits ); - virtual ~SvxTextEncodingBox(); + virtual ~SvxTextEncodingBox() override; virtual void dispose() override; /** Fill with all known encodings but exclude those matching one or more diff --git a/include/svx/unomodel.hxx b/include/svx/unomodel.hxx index 17d857bf9083..f771b8bdb908 100644 --- a/include/svx/unomodel.hxx +++ b/include/svx/unomodel.hxx @@ -55,7 +55,7 @@ private: public: SvxUnoDrawingModel( SdrModel* pDoc ) throw(); - virtual ~SvxUnoDrawingModel() throw(); + virtual ~SvxUnoDrawingModel() throw() override; SdrModel* GetDoc() const { return mpDoc; } diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx index 3ce80c5f9d8e..cf2d1b6bdf7a 100644 --- a/include/svx/unopage.hxx +++ b/include/svx/unopage.hxx @@ -79,7 +79,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< css::drawin public: SvxDrawPage( SdrPage* pPage ) throw(); - virtual ~SvxDrawPage() throw(); + virtual ~SvxDrawPage() throw() override; // Internals SdrPage* GetSdrPage() const { return mpPage; } diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx index 99b5199bb3d5..c890d6faf5b6 100644 --- a/include/svx/unopool.hxx +++ b/include/svx/unopool.hxx @@ -44,7 +44,7 @@ public: /** deprecated */ SvxUnoDrawPool(SdrModel* pModel); - virtual ~SvxUnoDrawPool() throw(); + virtual ~SvxUnoDrawPool() throw() override; /** This returns the item pool from the given model, or the default pool if there is no model and bReadOnly is true. If bReadOnly is false and there is no model the default implementation returns NULL. diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 15690c016779..749ff00baf2d 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -169,7 +169,7 @@ public: SvxShape( SdrObject* pObj ) throw (css::uno::RuntimeException); SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) throw (css::uno::RuntimeException); SvxShape() throw (css::uno::RuntimeException); - virtual ~SvxShape() throw (); + virtual ~SvxShape() throw () override; // Internals void ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet); @@ -335,7 +335,7 @@ protected: public: SvxShapeText( SdrObject* pObj ) throw (); SvxShapeText( SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet ) throw (); - virtual ~SvxShapeText() throw (); + virtual ~SvxShapeText() throw () override; virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override; @@ -368,7 +368,7 @@ class SvxShapeRect : public SvxShapeText { public: SvxShapeRect( SdrObject* pObj ) throw (); - virtual ~SvxShapeRect() throw (); + virtual ~SvxShapeRect() throw () override; // XInterface virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -395,7 +395,7 @@ private: public: SvxShapeGroup( SdrObject* pObj,SvxDrawPage* pDrawPage ) throw (); - virtual ~SvxShapeGroup() throw (); + virtual ~SvxShapeGroup() throw () override; virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override; @@ -447,7 +447,7 @@ class SvxShapeConnector : public css::drawing::XConnectorShape, { public: SvxShapeConnector( SdrObject* pObj ) throw(); - virtual ~SvxShapeConnector() throw(); + virtual ~SvxShapeConnector() throw() override; // XInterface virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -487,7 +487,7 @@ protected: public: SvxShapeControl( SdrObject* pObj ) throw(); - virtual ~SvxShapeControl() throw(); + virtual ~SvxShapeControl() throw() override; // XInterface virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -529,7 +529,7 @@ class SvxShapeDimensioning : public SvxShapeText { public: SvxShapeDimensioning( SdrObject* pObj ) throw(); - virtual ~SvxShapeDimensioning() throw(); + virtual ~SvxShapeDimensioning() throw() override; }; /*********************************************************************** @@ -539,7 +539,7 @@ class SvxShapeCircle : public SvxShapeText { public: SvxShapeCircle( SdrObject* pObj ) throw (); - virtual ~SvxShapeCircle() throw (); + virtual ~SvxShapeCircle() throw () override; }; /*********************************************************************** @@ -560,7 +560,7 @@ protected: public: SvxOle2Shape( SdrObject* pObj ) throw(); SvxOle2Shape( SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet ) throw (); - virtual ~SvxOle2Shape() throw(); + virtual ~SvxOle2Shape() throw() override; bool createObject( const SvGlobalName &aClassName ); @@ -591,7 +591,7 @@ protected: public: SvxShapePolyPolygon( SdrObject* pObj , css::drawing::PolygonKind eNew = css::drawing::PolygonKind_LINE ) throw(css::lang::IllegalArgumentException, css::beans::PropertyVetoException); - virtual ~SvxShapePolyPolygon() throw(); + virtual ~SvxShapePolyPolygon() throw() override; // Local support functions css::drawing::PolygonKind GetPolygonKind() const throw() { return mePolygonKind;} @@ -618,7 +618,7 @@ public: virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; SvxShapePolyPolygonBezier( SdrObject* pObj , css::drawing::PolygonKind eNew = css::drawing::PolygonKind_PATHLINE) throw(); - virtual ~SvxShapePolyPolygonBezier() throw(); + virtual ~SvxShapePolyPolygonBezier() throw() override; // Local support functions css::drawing::PolygonKind GetPolygonKind() const throw() { return mePolygonKind;} @@ -641,7 +641,7 @@ protected: public: SvxGraphicObject( SdrObject* pObj, OUString const & referer ) throw(); - virtual ~SvxGraphicObject() throw(); + virtual ~SvxGraphicObject() throw() override; private: OUString referer_; @@ -668,7 +668,7 @@ public: throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual ~Svx3DSceneObject() throw(); + virtual ~Svx3DSceneObject() throw() override; virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override; @@ -709,7 +709,7 @@ protected: public: Svx3DCubeObject( SdrObject* pObj ) throw(); - virtual ~Svx3DCubeObject() throw(); + virtual ~Svx3DCubeObject() throw() override; // XServiceInfo virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; @@ -727,7 +727,7 @@ protected: virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual ~Svx3DSphereObject() throw(); + virtual ~Svx3DSphereObject() throw() override; // XServiceInfo virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; @@ -745,7 +745,7 @@ protected: public: Svx3DLatheObject( SdrObject* pObj ) throw(); - virtual ~Svx3DLatheObject() throw(); + virtual ~Svx3DLatheObject() throw() override; // XServiceInfo virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; @@ -763,7 +763,7 @@ protected: virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual ~Svx3DExtrudeObject() throw(); + virtual ~Svx3DExtrudeObject() throw() override; // XServiceInfo virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; @@ -781,7 +781,7 @@ protected: public: Svx3DPolygonObject( SdrObject* pObj ) throw(); - virtual ~Svx3DPolygonObject() throw(); + virtual ~Svx3DPolygonObject() throw() override; // XServiceInfo virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; @@ -806,7 +806,7 @@ public: virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual ~SvxCustomShape() throw (); + virtual ~SvxCustomShape() throw () override; virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override; @@ -844,7 +844,7 @@ class SvxMediaShape : public SvxShape { public: SvxMediaShape( SdrObject* pObj, OUString const & referer ) throw(); - virtual ~SvxMediaShape() throw(); + virtual ~SvxMediaShape() throw() override; protected: // override these for special property handling in subcasses. Return true if property is handled @@ -871,7 +871,7 @@ private: public: SvxDummyShapeContainer( css::uno::Reference< css::drawing::XShapes > const & xWrappedObject ); - virtual ~SvxDummyShapeContainer() throw(); + virtual ~SvxDummyShapeContainer() throw() override; const css::uno::Reference< css::drawing::XShapes >& getWrappedShape() { return m_xDummyObject; } diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx index f9163141b9f9..fbd214df6cf7 100644 --- a/include/svx/unoshtxt.hxx +++ b/include/svx/unoshtxt.hxx @@ -54,7 +54,7 @@ public: SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const vcl::Window& rViewWindow ); SvxTextEditSource(const SvxTextEditSource&) = delete; SvxTextEditSource& operator=(const SvxTextEditSource&) = delete; - virtual ~SvxTextEditSource(); + virtual ~SvxTextEditSource() override; virtual SvxEditSource* Clone() const override; virtual SvxTextForwarder* GetTextForwarder() override; diff --git a/include/svx/verttexttbxctrl.hxx b/include/svx/verttexttbxctrl.hxx index 7eb930f16376..06a4aafa26df 100644 --- a/include/svx/verttexttbxctrl.hxx +++ b/include/svx/verttexttbxctrl.hxx @@ -29,7 +29,7 @@ class SvxVertCTLTextTbxCtrl : public SfxToolBoxControl { public: SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual ~SvxVertCTLTextTbxCtrl(); + virtual ~SvxVertCTLTextTbxCtrl() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx index c6bf49bfda8c..20b951d3ebf4 100644 --- a/include/svx/view3d.hxx +++ b/include/svx/view3d.hxx @@ -76,7 +76,7 @@ protected: public: E3dView(SdrModel* pModel, OutputDevice* pOut = nullptr); - virtual ~E3dView(); + virtual ~E3dView() override; // Output all marked Objects on the given OutputDevice. virtual void DrawMarkedObj(OutputDevice& rOut) const override; diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx index de0c0a57a901..978accfdf96d 100644 --- a/include/svx/viewlayoutitem.hxx +++ b/include/svx/viewlayoutitem.hxx @@ -33,7 +33,7 @@ public: SvxViewLayoutItem( sal_uInt16 nColumns = 0, bool bBookMode = false, sal_uInt16 nWhich = SID_ATTR_VIEWLAYOUT ); SvxViewLayoutItem( const SvxViewLayoutItem& ); - virtual ~SvxViewLayoutItem(); + virtual ~SvxViewLayoutItem() override; void SetBookMode( bool bNew ) {mbBookMode = bNew; } bool IsBookMode() const {return mbBookMode; } diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx index 170368f6ebb1..e4df90144d80 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -49,7 +49,7 @@ public: const OUString& rName = OUString()); NameOrIndex(sal_uInt16 nWhich, SvStream& rIn); NameOrIndex(const NameOrIndex& rNameOrIndex); - virtual ~NameOrIndex() {}; + virtual ~NameOrIndex() override {}; virtual bool operator==(const SfxPoolItem& rItem) const override; virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index eb39c5e48971..c76b4468869b 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -89,7 +89,7 @@ private: protected: SvXMLEmbeddedObjectHelper(); - virtual ~SvXMLEmbeddedObjectHelper(); + virtual ~SvXMLEmbeddedObjectHelper() override; void Init( const css::uno::Reference < css::embed::XStorage >&, ::comphelper::IEmbeddedHelper& rDocPersist, SvXMLEmbeddedObjectHelperMode eCreateMode ); diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx index 631d91ae73ba..64b8e4929222 100644 --- a/include/svx/xmlgrhlp.hxx +++ b/include/svx/xmlgrhlp.hxx @@ -82,7 +82,7 @@ private: protected: SvXMLGraphicHelper(); - virtual ~SvXMLGraphicHelper(); + virtual ~SvXMLGraphicHelper() override; void Init( const css::uno::Reference < css::embed::XStorage >& xXMLStorage, SvXMLGraphicHelperMode eCreateMode, bool bDirect ); diff --git a/include/svx/xmlsecctrl.hxx b/include/svx/xmlsecctrl.hxx index 776b30adb9fe..8389c6e5fcc2 100644 --- a/include/svx/xmlsecctrl.hxx +++ b/include/svx/xmlsecctrl.hxx @@ -38,7 +38,7 @@ public: SFX_DECL_STATUSBAR_CONTROL(); XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ); - virtual ~XmlSecStatusBarControl(); + virtual ~XmlSecStatusBarControl() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; virtual void Paint( const UserDrawEvent& rEvt ) override; diff --git a/include/svx/xpool.hxx b/include/svx/xpool.hxx index 7233f919c041..e2a27cf3f6d9 100644 --- a/include/svx/xpool.hxx +++ b/include/svx/xpool.hxx @@ -44,7 +44,7 @@ public: virtual SfxItemPool* Clone() const override; protected: - virtual ~XOutdevItemPool(); + virtual ~XOutdevItemPool() override; }; #endif // INCLUDED_SVX_XPOOL_HXX diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx index 359ad4318ed6..d8c1b2f136a1 100644 --- a/include/svx/xtable.hxx +++ b/include/svx/xtable.hxx @@ -192,7 +192,7 @@ protected: public: XPropertyList(const XPropertyList&) = delete; XPropertyList& operator=(const XPropertyList&) = delete; - virtual ~XPropertyList(); + virtual ~XPropertyList() override; XPropertyListType Type() const { return meType; } long Count() const; @@ -283,7 +283,7 @@ protected: public: XLineEndList(const OUString& rPath, const OUString& rReferer); - virtual ~XLineEndList(); + virtual ~XLineEndList() override; XLineEndEntry* GetLineEnd(long nIndex) const; @@ -304,7 +304,7 @@ protected: public: XDashList(const OUString& rPath, const OUString& rReferer); - virtual ~XDashList(); + virtual ~XDashList() override; void Replace(std::unique_ptr<XDashEntry> pEntry, long nIndex); XDashEntry* GetDash(long nIndex) const; @@ -331,7 +331,7 @@ protected: virtual Bitmap CreateBitmapForUI(long nIndex) override; public: XHatchList(const OUString& rPath, const OUString& rReferer); - virtual ~XHatchList(); + virtual ~XHatchList() override; void Replace(std::unique_ptr<XHatchEntry> pEntry, long nIndex); XHatchEntry* GetHatch(long nIndex) const; @@ -351,7 +351,7 @@ protected: public: XGradientList(const OUString& rPath, const OUString& rReferer); - virtual ~XGradientList(); + virtual ~XGradientList() override; void Replace(std::unique_ptr<XGradientEntry> pEntry, long nIndex); XGradientEntry* GetGradient(long nIndex) const; diff --git a/include/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx index 0ffba28dbf01..aea330b44fb5 100644 --- a/include/svx/zoomsliderctrl.hxx +++ b/include/svx/zoomsliderctrl.hxx @@ -43,7 +43,7 @@ public: SFX_DECL_STATUSBAR_CONTROL(); SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ); - virtual ~SvxZoomSliderControl(); + virtual ~SvxZoomSliderControl() override; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; virtual void Paint( const UserDrawEvent& rEvt ) override; diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx index ca23d3f7736f..bc618fa51644 100644 --- a/include/svx/zoomslideritem.hxx +++ b/include/svx/zoomslideritem.hxx @@ -36,7 +36,7 @@ public: SvxZoomSliderItem( sal_uInt16 nCurrentZoom = 100, sal_uInt16 nMinZoom = 20, sal_uInt16 nMaxZoom = 600, sal_uInt16 nWhich = SID_ATTR_ZOOMSLIDER ); SvxZoomSliderItem( const SvxZoomSliderItem& ); - virtual ~SvxZoomSliderItem(); + virtual ~SvxZoomSliderItem() override; void AddSnappingPoint( sal_Int32 nNew ); const css::uno::Sequence < sal_Int32 >& GetSnappingPoints() const { return maValues;} |