summaryrefslogtreecommitdiff
path: root/include/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'include/sfx2')
-rw-r--r--include/sfx2/app.hxx2
-rw-r--r--include/sfx2/basedlgs.hxx6
-rw-r--r--include/sfx2/bindings.hxx2
-rw-r--r--include/sfx2/dinfdlg.hxx10
-rw-r--r--include/sfx2/docfile.hxx2
-rw-r--r--include/sfx2/dockwin.hxx2
-rw-r--r--include/sfx2/infobar.hxx4
-rw-r--r--include/sfx2/mgetempl.hxx2
-rw-r--r--include/sfx2/mnuitem.hxx6
-rw-r--r--include/sfx2/module.hxx2
-rw-r--r--include/sfx2/new.hxx2
-rw-r--r--include/sfx2/newstyle.hxx2
-rw-r--r--include/sfx2/printer.hxx2
-rw-r--r--include/sfx2/printopt.hxx2
-rw-r--r--include/sfx2/request.hxx2
-rw-r--r--include/sfx2/sfxbasecontroller.hxx2
-rw-r--r--include/sfx2/sfxhelp.hxx2
-rw-r--r--include/sfx2/styledlg.hxx2
-rw-r--r--include/sfx2/tabdlg.hxx2
-rw-r--r--include/sfx2/taskpane.hxx2
-rw-r--r--include/sfx2/tbxctrl.hxx4
-rw-r--r--include/sfx2/templateinfodlg.hxx2
-rw-r--r--include/sfx2/templdlg.hxx2
-rw-r--r--include/sfx2/unoctitm.hxx6
-rw-r--r--include/sfx2/zoomitem.hxx2
25 files changed, 37 insertions, 37 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 247ccface11c..f3b72cd54c98 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -141,7 +141,7 @@ public:
SFX_DECL_INTERFACE(SFX_INTERFACE_SFXAPP)
SfxApplication();
- ~SfxApplication();
+ virtual ~SfxApplication();
static SfxApplication* GetOrCreate();
// Resource Manager
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 4349a5be9b07..64e60d28ccdf 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -81,7 +81,7 @@ protected:
SfxItemSet* GetOutputSetImpl() { return pOutputSet; }
public:
- ~SfxModalDialog();
+ virtual ~SfxModalDialog();
const SfxItemSet* GetOutputItemSet() const { return pOutputSet; }
const SfxItemSet* GetInputItemSet() const { return pInputSet; }
};
@@ -104,7 +104,7 @@ protected:
Window*, const ResId& );
SfxModelessDialog( SfxBindings*, SfxChildWindow*,
Window*, const OString& rID, const OUString& rUIXMLDescription );
- ~SfxModelessDialog();
+ virtual ~SfxModelessDialog();
virtual bool Close() SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;
virtual void Move() SAL_OVERRIDE;
@@ -141,7 +141,7 @@ protected:
SfxChildWindow *pCW,
Window* pParent,
const ResId& rResId);
- ~SfxFloatingWindow();
+ virtual ~SfxFloatingWindow();
virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
virtual bool Close() SAL_OVERRIDE;
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index a45b7f52dfe8..9f03537a2b2a 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -125,7 +125,7 @@ private:
public:
SfxBindings();
- ~SfxBindings();
+ virtual ~SfxBindings();
void HidePopups( bool bHide = true );
SAL_DLLPRIVATE void HidePopupCtrls_Impl( bool bHide = true );
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index a0f65b7825ff..aab6bda0e1e3 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -329,7 +329,7 @@ protected:
virtual void RequestHelp(const HelpEvent& rEvt) SAL_OVERRIDE;
public:
CustomPropertiesDurationField( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine );
- ~CustomPropertiesDurationField();
+ virtual ~CustomPropertiesDurationField();
void SetDuration( const com::sun::star::util::Duration& rDuration );
const com::sun::star::util::Duration& GetDuration() const { return m_aDuration; }
@@ -341,7 +341,7 @@ class CustomPropertiesEditButton : public PushButton
public:
CustomPropertiesEditButton( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine );
- ~CustomPropertiesEditButton();
+ virtual ~CustomPropertiesEditButton();
DECL_LINK(ClickHdl, void *);
};
@@ -444,7 +444,7 @@ public:
const OUString &rHeaderAccName,
const OUString &rHeaderAccType,
const OUString &rHeaderAccValue);
- ~CustomPropertiesWindow();
+ virtual ~CustomPropertiesWindow();
void InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar );
sal_uInt16 GetVisibleLineCount() const;
@@ -479,7 +479,7 @@ private:
public:
CustomPropertiesControl(Window* pParent);
- ~CustomPropertiesControl();
+ virtual ~CustomPropertiesControl();
void AddLine( const OUString& sName, com::sun::star::uno::Any& rAny, bool bInteractive );
@@ -556,7 +556,7 @@ struct CmisPropertyLine : public VclBuilderContainer
sal_Int32 m_nNumValue;
long getItemHeight() const;
CmisPropertyLine( Window* pParent );
- ~CmisPropertyLine();
+ virtual ~CmisPropertyLine();
};
// class CmisPropertiesWindow ------------------------------------------
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index ef9ef9bdc6cf..2ed484a0e17c 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -100,7 +100,7 @@ public:
const SfxItemSet* pSet=0 );
SfxMedium( const css::uno::Sequence< css::beans::PropertyValue >& aArgs );
- ~SfxMedium();
+ virtual ~SfxMedium();
void UseInteractionHandler( bool );
css::uno::Reference< css::task::XInteractionHandler >
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 919e30111ce9..6675e84e8b53 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -79,7 +79,7 @@ public:
SfxChildWindow *pCW,
Window* pParent,
const ResId& rResId);
- ~SfxDockingWindow();
+ virtual ~SfxDockingWindow();
void Initialize (SfxChildWinInfo* pInfo);
virtual void FillInfo(SfxChildWinInfo&) const;
diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx
index 091b98134e22..383ebc868b59 100644
--- a/include/sfx2/infobar.hxx
+++ b/include/sfx2/infobar.hxx
@@ -50,7 +50,7 @@ class SfxInfoBarWindow : public Window
SfxInfoBarWindow( Window* parent, const OUString& sId,
const OUString& sMessage,
std::vector< PushButton* > aButtons );
- ~SfxInfoBarWindow( );
+ virtual ~SfxInfoBarWindow( );
virtual const OUString& getId() const { return m_sId; }
virtual void Paint( const Rectangle& ) SAL_OVERRIDE;
@@ -68,7 +68,7 @@ class SfxInfoBarContainerWindow : public Window
public:
SfxInfoBarContainerWindow( SfxInfoBarContainerChild* pChildWin );
- ~SfxInfoBarContainerWindow( );
+ virtual ~SfxInfoBarContainerWindow( );
void appendInfoBar( const OUString& sId, const OUString& sMessage, std::vector< PushButton* > aButtons );
SfxInfoBarWindow* getInfoBar( const OUString& sId );
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index 9b0e1093eb58..65ba7119bddb 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -74,7 +74,7 @@ friend class SfxStyleDialog;
void SetDescriptionText_Impl();
SfxManageStyleSheetPage(Window *pParent, const SfxItemSet &rAttrSet );
- ~SfxManageStyleSheetPage();
+ virtual ~SfxManageStyleSheetPage();
static SfxTabPage* Create(Window *pParent, const SfxItemSet &rAttrSet );
diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx
index 97892478c0c8..57e86382d00e 100644
--- a/include/sfx2/mnuitem.hxx
+++ b/include/sfx2/mnuitem.hxx
@@ -50,7 +50,7 @@ public:
static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings );
static void RegisterControl( sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL );
- ~SfxMenuControl();
+ virtual ~SfxMenuControl();
using SfxControllerItem::Bind;
void Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId,
@@ -79,7 +79,7 @@ public:
SfxUnoMenuControl( const OUString&, sal_uInt16 nId, Menu&,
const OUString&,
SfxBindings&, SfxVirtualMenu* );
- ~SfxUnoMenuControl();
+ virtual ~SfxUnoMenuControl();
};
typedef SfxMenuControl* (*SfxMenuControlCtor)( sal_uInt16 nId, Menu &, SfxBindings & );
@@ -131,7 +131,7 @@ protected:
public:
SFX_DECL_MENU_CONTROL();
SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings );
- ~SfxAppMenuControl_Impl();
+ virtual ~SfxAppMenuControl_Impl();
struct ExecuteInfo
{
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index a6a57fcf342a..a12bd1646641 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -71,7 +71,7 @@ public:
SfxModule( ResMgr* pMgrP, bool bDummy,
SfxObjectFactory* pFactoryP, ... );
- ~SfxModule();
+ virtual ~SfxModule();
ResMgr* GetResMgr() const { return SfxShell::GetResMgr(); }
virtual ResMgr* GetResMgr();
diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx
index c457562f3431..bc1a452d74a7 100644
--- a/include/sfx2/new.hxx
+++ b/include/sfx2/new.hxx
@@ -57,7 +57,7 @@ private:
public:
SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags = 0);
- ~SfxNewFileDialog();
+ virtual ~SfxNewFileDialog();
// Returns false, when '- No -' is set as Template
// Template names can only be obtained when IsTemplate() returns true.
diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx
index 368d154e9eee..6ced44ba5bb8 100644
--- a/include/sfx2/newstyle.hxx
+++ b/include/sfx2/newstyle.hxx
@@ -44,7 +44,7 @@ private:
public:
SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& );
- ~SfxNewStyleDlg();
+ virtual ~SfxNewStyleDlg();
OUString GetName() const { return comphelper::string::stripStart(m_pColBox->GetText(), ' '); }
};
diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx
index 6994cb58abcf..66dd4dcde747 100644
--- a/include/sfx2/printer.hxx
+++ b/include/sfx2/printer.hxx
@@ -53,7 +53,7 @@ public:
const OUString &rPrinterName,
const JobSetup &rTheOrigJobSetup );
SfxPrinter( const SfxPrinter &rPrinter );
- ~SfxPrinter();
+ virtual ~SfxPrinter();
SfxPrinter* Clone() const;
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index 03bb3a32f2db..b0d3c8f381b6 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -94,7 +94,7 @@ protected:
public:
SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
- ~SfxCommonPrintOptionsTabPage();
+ virtual ~SfxCommonPrintOptionsTabPage();
virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx
index 0512e6853d7a..35eb7b1a4cc9 100644
--- a/include/sfx2/request.hxx
+++ b/include/sfx2/request.hxx
@@ -65,7 +65,7 @@ public:
sal_uInt16 nCallMode, SfxItemPool &rPool );
SfxRequest( sal_uInt16 nSlot, sal_uInt16 nCallMode, const SfxAllItemSet& rSfxArgs );
SfxRequest( const SfxRequest& rOrig );
- ~SfxRequest();
+ virtual ~SfxRequest();
sal_uInt16 GetSlot() const { return nSlot; }
void SetSlot(sal_uInt16 nNewSlot) { nSlot = nNewSlot; }
diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx
index 5de5c26e7b91..13f1e61c01e9 100644
--- a/include/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
@@ -112,7 +112,7 @@ public:
@onerror -
*/
- ~SfxBaseController() ;
+ virtual ~SfxBaseController() ;
SAL_DLLPRIVATE void ReleaseShell_Impl();
SAL_DLLPRIVATE void BorderWidthsChanged_Impl();
diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx
index 5bfa02892fbb..d3ab2cec93bb 100644
--- a/include/sfx2/sfxhelp.hxx
+++ b/include/sfx2/sfxhelp.hxx
@@ -43,7 +43,7 @@ private:
public:
SfxHelp();
- ~SfxHelp();
+ virtual ~SfxHelp();
inline void SetTicket( const OUString& rTicket ) { aTicket = rTicket; }
inline void SetUser( const OUString& rUser ) { aUser = rUser; }
diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx
index 366703ea9bc9..fec8446742df 100644
--- a/include/sfx2/styledlg.hxx
+++ b/include/sfx2/styledlg.hxx
@@ -39,7 +39,7 @@ public:
SfxStyleDialog(Window* pParent, const OString& rID,
const OUString& rUIXMLDescription, SfxStyleSheetBase&);
- ~SfxStyleDialog();
+ virtual ~SfxStyleDialog();
SfxStyleSheetBase& GetStyleSheet() { return *pStyle; }
const SfxStyleSheetBase& GetStyleSheet() const { return *pStyle; }
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 1e91f7dab83e..4bc1138e71db 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -135,7 +135,7 @@ public:
SfxTabDialog( SfxViewFrame *pViewFrame, Window* pParent,
const OString& rID, const OUString& rUIXMLDescription,
const SfxItemSet * = 0, sal_Bool bEditFmt = sal_False );
- ~SfxTabDialog();
+ virtual ~SfxTabDialog();
sal_uInt16 AddTabPage( const OString& rName, // Name of the label for the page in the notebook .ui
CreateTabPage pCreateFunc, // != 0
diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx
index 9f4e42c7ca9d..f7b6ef0d455f 100644
--- a/include/sfx2/taskpane.hxx
+++ b/include/sfx2/taskpane.hxx
@@ -117,7 +117,7 @@ namespace sfx2
Window& i_rParentWindow,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocumentFrame
);
- ~ModuleTaskPane();
+ virtual ~ModuleTaskPane();
/** determines whether a given module has any registered tool panels
*/
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 5c40c48747a3..906d2271bf6e 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -149,7 +149,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
Window* pParentWindow,
const ResId &rId );
- ~SfxPopupWindow();
+ virtual ~SfxPopupWindow();
virtual SfxPopupWindow* Clone() const;
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -372,7 +372,7 @@ protected:
public:
SFX_DECL_TOOLBOX_CONTROL();
SfxAddonsToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
- ~SfxAddonsToolBoxControl_Impl();
+ virtual ~SfxAddonsToolBoxControl_Impl();
void RefreshMenuImages( Menu* pMenu );
};
diff --git a/include/sfx2/templateinfodlg.hxx b/include/sfx2/templateinfodlg.hxx
index d064109736c0..dd32e49dd6f3 100644
--- a/include/sfx2/templateinfodlg.hxx
+++ b/include/sfx2/templateinfodlg.hxx
@@ -26,7 +26,7 @@ public:
SfxTemplateInfoDlg (Window *pParent = NULL);
- ~SfxTemplateInfoDlg ();
+ virtual ~SfxTemplateInfoDlg ();
void loadDocument (const OUString &rURL);
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index 3633d86911bf..39a5de3df564 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -59,7 +59,7 @@ friend class SfxTemplateDialog_Impl;
public:
SfxTemplateDialog( SfxBindings*, SfxChildWindow*, Window* );
- ~SfxTemplateDialog();
+ virtual ~SfxTemplateDialog();
virtual void Update();
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index 26b47b615621..75d245721836 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -54,7 +54,7 @@ class SfxUnoControllerItem : public ::cppu::WeakImplHelper1< css::frame::XSta
public:
SfxUnoControllerItem( SfxControllerItem*, SfxBindings&, const OUString& );
- ~SfxUnoControllerItem();
+ virtual ~SfxUnoControllerItem();
const ::com::sun::star::util::URL& GetCommand() const
{ return aCommand; }
@@ -115,7 +115,7 @@ public:
SfxOfficeDispatch( SfxDispatcher* pDispat,
const SfxSlot* pSlot,
const ::com::sun::star::util::URL& rURL );
- ~SfxOfficeDispatch();
+ virtual ~SfxOfficeDispatch();
virtual void SAL_CALL dispatchWithNotification( const ::com::sun::star::util::URL& aURL,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs,
@@ -165,7 +165,7 @@ public:
SfxDispatcher* pDispat,
const SfxSlot* pSlot,
const ::com::sun::star::util::URL& rURL );
- ~SfxDispatchController_Impl();
+ virtual ~SfxDispatchController_Impl();
static OUString getSlaveCommand( const ::com::sun::star::util::URL& rURL );
diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx
index e36780fd32b4..90c51545a408 100644
--- a/include/sfx2/zoomitem.hxx
+++ b/include/sfx2/zoomitem.hxx
@@ -47,7 +47,7 @@ public:
SvxZoomItem( SvxZoomType eZoomType = SVX_ZOOM_PERCENT,
sal_uInt16 nVal = 0, sal_uInt16 nWhich = SID_ATTR_ZOOM );
SvxZoomItem( const SvxZoomItem& );
- ~SvxZoomItem();
+ virtual ~SvxZoomItem();
void SetValueSet( sal_uInt16 nValues ) { nValueSet = nValues; }
sal_uInt16 GetValueSet() const { return nValueSet; }