summaryrefslogtreecommitdiff
path: root/svx/source/sidebar
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 /svx/source/sidebar
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 'svx/source/sidebar')
-rw-r--r--svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaBulletsControl.hxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaBulletsPopup.hxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaNumberingControl.hxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaNumberingPopup.hxx2
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingPopup.hxx2
-rw-r--r--svx/source/sidebar/text/TextUnderlinePopup.hxx2
9 files changed, 9 insertions, 9 deletions
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx
index a4c8f178abc2..4c13f6475da2 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx
@@ -35,7 +35,7 @@ public :
AreaTransparencyGradientPopup (
Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator);
- ~AreaTransparencyGradientPopup (void);
+ virtual ~AreaTransparencyGradientPopup (void);
void Rearrange (XFillFloatTransparenceItem* pItem);
};
diff --git a/svx/source/sidebar/paragraph/ParaBulletsControl.hxx b/svx/source/sidebar/paragraph/ParaBulletsControl.hxx
index 4e7b42848daf..19dedfba0b84 100644
--- a/svx/source/sidebar/paragraph/ParaBulletsControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaBulletsControl.hxx
@@ -46,7 +46,7 @@ private:
public:
ParaBulletsControl(Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel);
- ~ParaBulletsControl();
+ virtual ~ParaBulletsControl();
void UpdateValueSet();
};
diff --git a/svx/source/sidebar/paragraph/ParaBulletsPopup.hxx b/svx/source/sidebar/paragraph/ParaBulletsPopup.hxx
index 7af0182b262c..b0cb01c63678 100644
--- a/svx/source/sidebar/paragraph/ParaBulletsPopup.hxx
+++ b/svx/source/sidebar/paragraph/ParaBulletsPopup.hxx
@@ -34,7 +34,7 @@ public :
ParaBulletsPopup (
Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator);
- ~ParaBulletsPopup (void);
+ virtual ~ParaBulletsPopup (void);
void UpdateValueSet ();
//private:
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
index 8954a41ae2e9..b9966b7dd665 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
@@ -39,7 +39,7 @@ class ParaLineSpacingControl:public svx::sidebar::PopupControl
{
public:
ParaLineSpacingControl(Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel);
- ~ParaLineSpacingControl();
+ virtual ~ParaLineSpacingControl();
void Rearrange(SfxItemState currSPState,FieldUnit currMetricUnit,SvxLineSpacingItem* currSPItem,const ::sfx2::sidebar::EnumContext currentContext);
//virtual void Paint(const Rectangle& rect);
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx
index 029a618f5b14..09ad9f271af0 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx
@@ -35,7 +35,7 @@ public :
ParaLineSpacingPopup (
Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator);
- ~ParaLineSpacingPopup (void);
+ virtual ~ParaLineSpacingPopup (void);
void Rearrange (SfxItemState currSPState,FieldUnit currMetricUnit,SvxLineSpacingItem* currSPItem ,const ::sfx2::sidebar::EnumContext currentContext);
private:
diff --git a/svx/source/sidebar/paragraph/ParaNumberingControl.hxx b/svx/source/sidebar/paragraph/ParaNumberingControl.hxx
index 136e91efdc79..42d8e9172974 100644
--- a/svx/source/sidebar/paragraph/ParaNumberingControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaNumberingControl.hxx
@@ -49,7 +49,7 @@ private:
public:
ParaNumberingControl( Window* pParent,
svx::sidebar::ParaPropertyPanel& rPanel);
- ~ParaNumberingControl();
+ virtual ~ParaNumberingControl();
void UpdateValueSet();
};
diff --git a/svx/source/sidebar/paragraph/ParaNumberingPopup.hxx b/svx/source/sidebar/paragraph/ParaNumberingPopup.hxx
index d56398b208ec..c3b24107ea0b 100644
--- a/svx/source/sidebar/paragraph/ParaNumberingPopup.hxx
+++ b/svx/source/sidebar/paragraph/ParaNumberingPopup.hxx
@@ -34,7 +34,7 @@ public :
ParaNumberingPopup (
Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator);
- ~ParaNumberingPopup (void);
+ virtual ~ParaNumberingPopup (void);
void UpdateValueSet ();
//private:
diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx
index 44861508dee5..fb27fdbd0170 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx
@@ -31,7 +31,7 @@ public :
TextCharacterSpacingPopup (
Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator);
- ~TextCharacterSpacingPopup (void);
+ virtual ~TextCharacterSpacingPopup (void);
void Rearrange (bool bLBAvailable,bool bAvailable, long nKerning);
private:
diff --git a/svx/source/sidebar/text/TextUnderlinePopup.hxx b/svx/source/sidebar/text/TextUnderlinePopup.hxx
index 626abf1be685..71cdf4637500 100644
--- a/svx/source/sidebar/text/TextUnderlinePopup.hxx
+++ b/svx/source/sidebar/text/TextUnderlinePopup.hxx
@@ -31,7 +31,7 @@ public :
TextUnderlinePopup (
Window* pParent,
const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator);
- ~TextUnderlinePopup (void);
+ virtual ~TextUnderlinePopup (void);
void Rearrange (FontUnderline eLine);
};