diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:18:35 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:22:54 +0200 |
commit | 362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch) | |
tree | 0b432c049d580dcac6130bca9fb028bab8af8fa8 /sd/source/ui/inc | |
parent | b66d87086804460c1986df1b832fd6b2ea075a90 (diff) |
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked
"override," but at least some MSVC versions complain about it, so at least make
sure such destructors are explicitly marked "virtual."
Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'sd/source/ui/inc')
31 files changed, 36 insertions, 36 deletions
diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index 6e719a6b358c..ca57b9f4a065 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -69,7 +69,7 @@ public: ::com::sun::star::accessibility::XAccessible >& rxParent, ::sd::slidesorter::SlideSorter& rSlideSorter, sal_uInt16 nPageNumber); - ~AccessibleSlideSorterObject (void); + virtual ~AccessibleSlideSorterObject (void); /** Return the page that is made accessible by the called object. */ diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 2a9ed09f2d66..57446826edf5 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -59,7 +59,7 @@ public: OutlineView (DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewShell& rOutlineViewSh); - ~OutlineView (void); + virtual ~OutlineView (void); /** This method is called by the view shell that owns the view to tell the view that it can safely connect to the application. diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index 9120fd075612..2f2755bf274b 100644 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -53,7 +53,7 @@ public: OutputDevice* pTemplate = NULL, const bool bPaintFrame = true); - ~PreviewRenderer (void); + virtual ~PreviewRenderer (void); /** Render a page with the given pixel size. Use this version when only the width of the preview is known to the diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx index 8cf1ad428611..f330fcefcfeb 100644 --- a/sd/source/ui/inc/RemoteServer.hxx +++ b/sd/source/ui/inc/RemoteServer.hxx @@ -77,7 +77,7 @@ namespace sd static void removeCommunicator( Communicator* pCommunicator ); private: RemoteServer(); - ~RemoteServer(); + virtual ~RemoteServer(); static RemoteServer *spServer; static ::osl::Mutex sDataMutex; static ::std::vector<Communicator*> sCommunicators; diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 9b9ecae46d3d..359b85535f76 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -70,7 +70,7 @@ private: public: SdDisplay( ::Window* pWin, SdResId Id ); - ~SdDisplay(); + virtual ~SdDisplay(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx index f1c929c48a5d..fb9d5fe61783 100644 --- a/sd/source/ui/inc/copydlg.hxx +++ b/sd/source/ui/inc/copydlg.hxx @@ -40,7 +40,7 @@ class CopyDlg public: CopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, const XColorListRef &pColList, ::sd::View* pView ); - ~CopyDlg(); + virtual ~CopyDlg(); void GetAttr( SfxItemSet& rOutAttrs ); void Reset(); diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 4f70008ead40..aec20d3ade36 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -59,7 +59,7 @@ private: public: SdCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc ); - ~SdCustomShowDlg(); + virtual ~SdCustomShowDlg(); sal_Bool IsModified() const { return( bModified ); } sal_Bool IsCustomShow() const; @@ -95,7 +95,7 @@ public: SdDefineCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ); - ~SdDefineCustomShowDlg(); + virtual ~SdDefineCustomShowDlg(); sal_Bool IsModified() const { return( bModified ); } }; diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index e058a19ebdf8..f4b83e6b7fa4 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -44,7 +44,7 @@ public: SdPagesField( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT ); - ~SdPagesField(); + virtual ~SdPagesField(); void UpdatePagesField( const SfxUInt16Item* pItem ); }; @@ -63,7 +63,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SdTbxCtlDiaPages( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SdTbxCtlDiaPages(); + virtual ~SdTbxCtlDiaPages(); }; #endif // INCLUDED_SD_SOURCE_UI_INC_DIACTRL_HXX diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx index 59ac70389b0c..a6d0eb8ab68b 100644 --- a/sd/source/ui/inc/dlg_char.hxx +++ b/sd/source/ui/inc/dlg_char.hxx @@ -45,7 +45,7 @@ public: SdCharDlg( Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell ); - ~SdCharDlg() {}; + virtual ~SdCharDlg() {}; }; #endif // INCLUDED_SD_SOURCE_UI_INC_DLG_CHAR_HXX diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx index 2983a5fc72c0..f89685ce0517 100644 --- a/sd/source/ui/inc/dlgass.hxx +++ b/sd/source/ui/inc/dlgass.hxx @@ -42,7 +42,7 @@ private: public: AssistentDlg(Window* pParent, sal_Bool bAutoPilot); - ~AssistentDlg(); + virtual ~AssistentDlg(); DECL_LINK( FinishHdl, void * ); diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx index 93a2ca31b707..0ec249b8afc3 100644 --- a/sd/source/ui/inc/dlgctrls.hxx +++ b/sd/source/ui/inc/dlgctrls.hxx @@ -37,7 +37,7 @@ class SD_DLLPUBLIC FadeEffectLB : public ListBox { public: FadeEffectLB( Window* pParent, SdResId Id ); - ~FadeEffectLB(); + virtual ~FadeEffectLB(); virtual void Fill(); /* void selectEffectFromPage( SdPage* pPage ); */ diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx index d65f9006f196..e0e82fff946b 100644 --- a/sd/source/ui/inc/dlgfield.hxx +++ b/sd/source/ui/inc/dlgfield.hxx @@ -51,7 +51,7 @@ private: public: SdModifyFieldDlg( Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); - ~SdModifyFieldDlg() {} + virtual ~SdModifyFieldDlg() {} SvxFieldData* GetField(); SfxItemSet GetItemSet(); diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx index 3578559f5216..e2fdc22d5e68 100644 --- a/sd/source/ui/inc/dlgpage.hxx +++ b/sd/source/ui/inc/dlgpage.hxx @@ -45,7 +45,7 @@ private: public: SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage = sal_True ); - ~SdPageDlg() {}; + virtual ~SdPageDlg() {}; virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; }; diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index e02eb0f40644..11171969f22b 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -62,7 +62,7 @@ protected: public: SdDocPreviewWin( Window* pParent, const ResId& rResId ); - ~SdDocPreviewWin(); + virtual ~SdDocPreviewWin(); void SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage = 0 ); virtual void Resize() SAL_OVERRIDE; void startPreview(); diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 437e69432c61..5f90237117c3 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -327,7 +327,7 @@ private: FrameworkHelper (ViewShellBase& rBase); FrameworkHelper (const FrameworkHelper& rHelper); // Not implemented. - ~FrameworkHelper (void); + virtual ~FrameworkHelper (void); class Deleter; friend class Deleter; FrameworkHelper& operator= (const FrameworkHelper& rHelper); // Not implemented. diff --git a/sd/source/ui/inc/fuhhconv.hxx b/sd/source/ui/inc/fuhhconv.hxx index 6606f11f9e65..637dbb917c67 100644 --- a/sd/source/ui/inc/fuhhconv.hxx +++ b/sd/source/ui/inc/fuhhconv.hxx @@ -44,7 +44,7 @@ class FuHangulHanjaConversion : public FuPoor Outliner* GetOutliner() const { return pSdOutliner; } protected: - ~FuHangulHanjaConversion(); + virtual ~FuHangulHanjaConversion(); Outliner* pSdOutliner; sal_Bool bOwnOutliner; diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index c9feba92a99f..fefe754006cf 100644 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -33,7 +33,7 @@ private: public: GlueEscDirLB( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); - ~GlueEscDirLB(); + virtual ~GlueEscDirLB(); virtual void Select() SAL_OVERRIDE; @@ -56,7 +56,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SdTbxCtlGlueEscDir( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SdTbxCtlGlueEscDir() {} + virtual ~SdTbxCtlGlueEscDir() {} }; #endif // INCLUDED_SD_SOURCE_UI_INC_GLUECTRL_HXX diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index 2887624ad2b0..4c2bb8979902 100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -68,7 +68,7 @@ private: public: HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); - ~HeaderFooterDialog(); + virtual ~HeaderFooterDialog(); void ApplyToAll(); void Apply(); diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index 70b6a89c6981..ad1c742b5241 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -47,7 +47,7 @@ public: const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ); - ~SdInsertPagesObjsDlg(); + virtual ~SdInsertPagesObjsDlg(); /** returns the list nType == 0 -> pages diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx index 4511537a9384..5acae8a6eea5 100644 --- a/sd/source/ui/inc/paragr.hxx +++ b/sd/source/ui/inc/paragr.hxx @@ -35,7 +35,7 @@ private: public: SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr ); - ~SdParagraphDlg() {}; + virtual ~SdParagraphDlg() {}; }; #endif // INCLUDED_SD_SOURCE_UI_INC_PARAGR_HXX diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index 1cf08519b7c4..5ae279856249 100644 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -87,7 +87,7 @@ private: public: SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); - ~SdPresLayoutTemplateDlg(); + virtual ~SdPresLayoutTemplateDlg(); const SfxItemSet* GetOutputItemSet() const; }; diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index 4966ad4c3b57..17ec12f4b3cf 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -62,7 +62,7 @@ private: using OutputDevice::SetDrawMode; public: SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs); - ~SdPrintOptions(); + virtual ~SdPrintOptions(); static SfxTabPage* Create( Window*, const SfxItemSet& ); diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 43ff34f686d4..574a6ff0f04b 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -193,7 +193,7 @@ private: public: SdPublishingDlg(Window* pWindow, DocumentType eDocType); - ~SdPublishingDlg(); + virtual ~SdPublishingDlg(); void GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams ); }; diff --git a/sd/source/ui/inc/sdpopup.hxx b/sd/source/ui/inc/sdpopup.hxx index 697da11849cd..f2a429e42a90 100644 --- a/sd/source/ui/inc/sdpopup.hxx +++ b/sd/source/ui/inc/sdpopup.hxx @@ -38,7 +38,7 @@ private: public: SdFieldPopup( const SvxFieldData* pInField, LanguageType eLanguage ); - ~SdFieldPopup(); + virtual ~SdFieldPopup(); //virtual void Select(); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index eaa3680815ff..2fb67165ee60 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -187,7 +187,7 @@ public: SdPageObjsTLB( Window* pParent, const SdResId& rSdResId ); SdPageObjsTLB( Window* pParent, WinBits nStyle ); - ~SdPageObjsTLB(); + virtual ~SdPageObjsTLB(); // helper function for GetEntryAltText and GetEntryLongDescription OUString getAltLongDescText( SvTreeListEntry* pEntry , sal_Bool isAltText) const; diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 592af02b3ea0..76f724c3dfd2 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -44,7 +44,7 @@ class SdTransferable : public TransferableHelper, public SfxListener public: SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, sal_Bool bInitOnGetData ); - ~SdTransferable(); + virtual ~SdTransferable(); void SetDocShell( const SfxObjectShellRef& rRef ) { maDocShellRef = rRef; } const SfxObjectShellRef& GetDocShell() const { return maDocShellRef; } diff --git a/sd/source/ui/inc/tbx_ww.hxx b/sd/source/ui/inc/tbx_ww.hxx index bfb3069360c6..3814dd2e3329 100644 --- a/sd/source/ui/inc/tbx_ww.hxx +++ b/sd/source/ui/inc/tbx_ww.hxx @@ -33,7 +33,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SdTbxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SdTbxControl() {} + virtual ~SdTbxControl() {} virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/tmplctrl.hxx b/sd/source/ui/inc/tmplctrl.hxx index def12f6c154e..559ffc7cf228 100644 --- a/sd/source/ui/inc/tmplctrl.hxx +++ b/sd/source/ui/inc/tmplctrl.hxx @@ -25,7 +25,7 @@ class SdTemplateControl : public SfxStatusBarControl { public: SdTemplateControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); - ~SdTemplateControl(); + virtual ~SdTemplateControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 9503425de8d4..fabd20a35b4f 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -99,7 +99,7 @@ private: public: SdTPAction( Window* pParent, const SfxItemSet& rInAttrs ); - ~SdTPAction(); + virtual ~SdTPAction(); static SfxTabPage* Create( Window*, const SfxItemSet& ); diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 1be402ecaca2..a83f416c244a 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -37,7 +37,7 @@ class SdTpOptionsSnap : public SvxGridTabPage { public: SdTpOptionsSnap( Window* pParent, const SfxItemSet& rInAttrs ); - ~SdTpOptionsSnap(); + virtual ~SdTpOptionsSnap(); static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; @@ -59,7 +59,7 @@ private: public: SdTpOptionsContents( Window* pParent, const SfxItemSet& rInAttrs ); - ~SdTpOptionsContents(); + virtual ~SdTpOptionsContents(); static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; @@ -132,7 +132,7 @@ protected: public: SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ); - ~SdTpOptionsMisc(); + virtual ~SdTpOptionsMisc(); static SfxTabPage* Create( Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index 3429dfd73cf9..4f0e3e745957 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -82,7 +82,7 @@ class SdVectorizeDlg : public ModalDialog public: SdVectorizeDlg( Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ); - ~SdVectorizeDlg(); + virtual ~SdVectorizeDlg(); const GDIMetaFile& GetGDIMetaFile() const { return aMtf; } }; |