summaryrefslogtreecommitdiff
path: root/cui/source/options
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-04-01 19:18:35 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-04-01 19:22:54 +0200
commit362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch)
tree0b432c049d580dcac6130bca9fb028bab8af8fa8 /cui/source/options
parentb66d87086804460c1986df1b832fd6b2ea075a90 (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 'cui/source/options')
-rw-r--r--cui/source/options/certpath.hxx2
-rw-r--r--cui/source/options/fontsubs.hxx2
-rw-r--r--cui/source/options/optbasic.hxx2
-rw-r--r--cui/source/options/optcolor.cxx4
-rw-r--r--cui/source/options/optcolor.hxx2
-rw-r--r--cui/source/options/optgdlg.hxx6
-rw-r--r--cui/source/options/optinet2.hxx2
-rw-r--r--cui/source/options/optjava.hxx6
-rw-r--r--cui/source/options/optjsearch.hxx2
-rw-r--r--cui/source/options/optmemory.hxx2
-rw-r--r--cui/source/options/optupdt.hxx2
-rw-r--r--cui/source/options/personalization.hxx2
-rw-r--r--cui/source/options/securityoptions.hxx2
-rw-r--r--cui/source/options/webconninfo.hxx2
14 files changed, 19 insertions, 19 deletions
diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx
index a0630cf3663b..aa2128e29738 100644
--- a/cui/source/options/certpath.hxx
+++ b/cui/source/options/certpath.hxx
@@ -34,7 +34,7 @@ private:
void AddCertPath(const OUString &rProfile, const OUString &rPath);
public:
CertPathDialog(Window* pParent);
- ~CertPathDialog();
+ virtual ~CertPathDialog();
OUString getDirectory() const;
};
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index e299ed225bd5..c111689a01e9 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -92,7 +92,7 @@ class SvxFontSubstTabPage : public SfxTabPage
SvxFontSubstTabPage( Window* pParent, const SfxItemSet& rSet );
- ~SvxFontSubstTabPage();
+ virtual ~SvxFontSubstTabPage();
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index 3890ce1e26ba..ac46d81d1132 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -38,7 +38,7 @@ private:
public:
SvxBasicIDEOptionsPage( Window* pParent, const SfxItemSet& rSet );
- ~SvxBasicIDEOptionsPage();
+ virtual ~SvxBasicIDEOptionsPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 79ec9b289363..1fe8c0f2cf04 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -173,7 +173,7 @@ class ColorConfigWindow_Impl
{
public:
ColorConfigWindow_Impl(Window* pParent);
- ~ColorConfigWindow_Impl();
+ virtual ~ColorConfigWindow_Impl();
public:
void SetLinks (Link const&, Link const&, Link const&);
@@ -843,7 +843,7 @@ class ColorConfigCtrl_Impl : public VclVBox
virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE;
public:
ColorConfigCtrl_Impl(Window* pParent);
- ~ColorConfigCtrl_Impl();
+ virtual ~ColorConfigCtrl_Impl();
void InitHeaderBar(const OUString &rOn, const OUString &rUIElems,
const OUString &rColorSetting, const OUString &rPreview);
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index 580b535a694c..7d062095fd7c 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -48,7 +48,7 @@ class SvxColorOptionsTabPage : public SfxTabPage
public:
SvxColorOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
- ~SvxColorOptionsTabPage( );
+ virtual ~SvxColorOptionsTabPage( );
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index cd5fcd2ded2f..44130a772a1d 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -66,7 +66,7 @@ protected:
public:
OfaMiscTabPage( Window* pParent, const SfxItemSet& rSet );
- ~OfaMiscTabPage();
+ virtual ~OfaMiscTabPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
@@ -121,7 +121,7 @@ private:
public:
OfaViewTabPage( Window* pParent, const SfxItemSet& rSet );
- ~OfaViewTabPage();
+ virtual ~OfaViewTabPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
@@ -163,7 +163,7 @@ class OfaLanguagesTabPage : public SfxTabPage
public:
OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet );
- ~OfaLanguagesTabPage();
+ virtual ~OfaLanguagesTabPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index e02f3735e0a9..2d42cbf50d01 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -216,7 +216,7 @@ class SvxEMailTabPage : public SfxTabPage
public:
SvxEMailTabPage( Window* pParent, const SfxItemSet& rSet );
- ~SvxEMailTabPage();
+ virtual ~SvxEMailTabPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 1cf0f9657e84..a6b4d52c5923 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -105,7 +105,7 @@ private:
public:
SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet );
- ~SvxJavaOptionsPage();
+ virtual ~SvxJavaOptionsPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
@@ -139,7 +139,7 @@ private:
public:
SvxJavaParameterDlg( Window* pParent );
- ~SvxJavaParameterDlg();
+ virtual ~SvxJavaParameterDlg();
virtual short Execute() SAL_OVERRIDE;
@@ -171,7 +171,7 @@ private:
public:
SvxJavaClassPathDlg( Window* pParent );
- ~SvxJavaClassPathDlg();
+ virtual ~SvxJavaClassPathDlg();
inline const OUString& GetOldPath() const { return m_sOldPath; }
inline void SetFocus() { m_pPathList->GrabFocus(); }
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index b6fc3a39a3fe..6445b39bc55e 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -62,7 +62,7 @@ protected:
SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet );
public:
- ~SvxJSearchOptionsPage();
+ virtual ~SvxJSearchOptionsPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index 276cc1ea94d1..0e5fb8b1e147 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
@@ -57,7 +57,7 @@ protected:
public:
OfaMemoryOptionsPage( Window* pParent, const SfxItemSet& rSet );
- ~OfaMemoryOptionsPage();
+ virtual ~OfaMemoryOptionsPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index 6b3b261358ad..c0d61f72b1e4 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -52,7 +52,7 @@ private:
public:
SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSet& rSet );
- ~SvxOnlineUpdateTabPage();
+ virtual ~SvxOnlineUpdateTabPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index e7197f5ff375..40661f83e98a 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -27,7 +27,7 @@ private:
public:
SvxPersonalizationTabPage( Window *pParent, const SfxItemSet &rSet );
- ~SvxPersonalizationTabPage();
+ virtual ~SvxPersonalizationTabPage();
static SfxTabPage* Create( Window *pParent, const SfxItemSet &rSet );
diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx
index 33918c52927a..0838e2b39b69 100644
--- a/cui/source/options/securityoptions.hxx
+++ b/cui/source/options/securityoptions.hxx
@@ -49,7 +49,7 @@ namespace svx
public:
SecurityOptionsDialog( Window* pParent, SvtSecurityOptions* pOptions );
- ~SecurityOptionsDialog();
+ virtual ~SecurityOptionsDialog();
bool IsSaveOrSendDocsChecked() const { return m_pSaveOrSendDocsCB->IsChecked(); }
bool IsSignDocsChecked() const { return m_pSignDocsCB->IsChecked(); }
diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index 44dc8e3bbefa..0d8c278cabc4 100644
--- a/cui/source/options/webconninfo.hxx
+++ b/cui/source/options/webconninfo.hxx
@@ -63,7 +63,7 @@ namespace svx
public:
WebConnectionInfoDialog( Window* pParent );
- ~WebConnectionInfoDialog();
+ virtual ~WebConnectionInfoDialog();
};