summaryrefslogtreecommitdiff
path: root/include/svl
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 /include/svl
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 'include/svl')
-rw-r--r--include/svl/aeitem.hxx2
-rw-r--r--include/svl/cntwall.hxx2
-rw-r--r--include/svl/flagitem.hxx2
-rw-r--r--include/svl/globalnameitem.hxx2
-rw-r--r--include/svl/grabbagitem.hxx2
-rw-r--r--include/svl/hint.hxx2
-rw-r--r--include/svl/ilstitem.hxx2
-rw-r--r--include/svl/languageoptions.hxx4
-rw-r--r--include/svl/lckbitem.hxx2
-rw-r--r--include/svl/metitem.hxx2
-rw-r--r--include/svl/poolitem.hxx4
-rw-r--r--include/svl/ptitem.hxx2
-rw-r--r--include/svl/rectitem.hxx2
-rw-r--r--include/svl/slstitm.hxx2
-rw-r--r--include/svl/smplhint.hxx2
-rw-r--r--include/svl/szitem.hxx2
-rw-r--r--include/svl/undo.hxx2
17 files changed, 19 insertions, 19 deletions
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx
index 26e2a8b5b05c..6a34c2ea0ea5 100644
--- a/include/svl/aeitem.hxx
+++ b/include/svl/aeitem.hxx
@@ -41,7 +41,7 @@ public:
SfxAllEnumItem( sal_uInt16 nWhich, sal_uInt16 nVal );
SfxAllEnumItem( sal_uInt16 nWhich, SvStream &rStream );
SfxAllEnumItem( const SfxAllEnumItem & );
- ~SfxAllEnumItem();
+ virtual ~SfxAllEnumItem();
void InsertValue( sal_uInt16 nValue );
void InsertValue( sal_uInt16 nValue, const OUString &rText );
diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx
index 4214c57228f7..9d6f32c36c36 100644
--- a/include/svl/cntwall.hxx
+++ b/include/svl/cntwall.hxx
@@ -41,7 +41,7 @@ public:
CntWallpaperItem( sal_uInt16 nWhich );
CntWallpaperItem( sal_uInt16 nWhich, SvStream& rStream, sal_uInt16 nVersion );
CntWallpaperItem( const CntWallpaperItem& rCpy );
- ~CntWallpaperItem();
+ virtual ~CntWallpaperItem();
virtual sal_uInt16 GetVersion(sal_uInt16) const SAL_OVERRIDE;
diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx
index 2ff5ad002ac8..24e38627cce4 100644
--- a/include/svl/flagitem.hxx
+++ b/include/svl/flagitem.hxx
@@ -35,7 +35,7 @@ public:
explicit SfxFlagItem( sal_uInt16 nWhich = 0, sal_uInt16 nValue = 0 );
SfxFlagItem( const SfxFlagItem& );
- ~SfxFlagItem() {}
+ virtual ~SfxFlagItem() {}
virtual sal_uInt8 GetFlagCount() const;
diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx
index 764bf0e15b55..8ff2b10ff242 100644
--- a/include/svl/globalnameitem.hxx
+++ b/include/svl/globalnameitem.hxx
@@ -32,7 +32,7 @@ public:
TYPEINFO_OVERRIDE();
SfxGlobalNameItem();
SfxGlobalNameItem( sal_uInt16 nWhich, const SvGlobalName& );
- ~SfxGlobalNameItem();
+ virtual ~SfxGlobalNameItem();
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx
index 0d70b9662cb5..d7606199fc4f 100644
--- a/include/svl/grabbagitem.hxx
+++ b/include/svl/grabbagitem.hxx
@@ -28,7 +28,7 @@ public:
SfxGrabBagItem();
SfxGrabBagItem(sal_uInt16 nWhich, const std::map<OUString, com::sun::star::uno::Any>* pMap = 0);
SfxGrabBagItem(const SfxGrabBagItem& rItem);
- ~SfxGrabBagItem();
+ virtual ~SfxGrabBagItem();
const std::map<OUString, com::sun::star::uno::Any>& GetGrabBag() const;
diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index 3191e4cfe2ea..f47dbc89a05d 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -41,7 +41,7 @@ public:
public: \
TYPEINFO_OVERRIDE(); \
explicit Name( Type* Object, bool bOwnedByHint = false ); \
- ~Name(); \
+ virtual ~Name(); \
\
Type* GetObject() const { return pObj; } \
bool IsOwner() const { return bIsOwner; } \
diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx
index 1f581f363409..0842a13119ae 100644
--- a/include/svl/ilstitem.hxx
+++ b/include/svl/ilstitem.hxx
@@ -36,7 +36,7 @@ public:
SfxIntegerListItem( sal_uInt16 nWhich, const ::std::vector < sal_Int32 >& rList );
SfxIntegerListItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Sequence < sal_Int32 >& rList );
SfxIntegerListItem( const SfxIntegerListItem& rItem );
- ~SfxIntegerListItem();
+ virtual ~SfxIntegerListItem();
::com::sun::star::uno::Sequence < sal_Int32 > GetSequence()
{ return m_aList; }
diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx
index a804ad82594a..17d8767906e0 100644
--- a/include/svl/languageoptions.hxx
+++ b/include/svl/languageoptions.hxx
@@ -66,7 +66,7 @@ public:
// bDontLoad is for referencing purposes only
SvtLanguageOptions( bool _bDontLoad = false );
- ~SvtLanguageOptions();
+ virtual ~SvtLanguageOptions();
// CJK options
bool IsCJKFontEnabled() const;
@@ -102,7 +102,7 @@ private:
public:
SvtSystemLanguageOptions();
- ~SvtSystemLanguageOptions();
+ virtual ~SvtSystemLanguageOptions();
virtual void Commit() SAL_OVERRIDE;
virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) SAL_OVERRIDE;
diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx
index 748deba0d986..cbdd88beab07 100644
--- a/include/svl/lckbitem.hxx
+++ b/include/svl/lckbitem.hxx
@@ -33,7 +33,7 @@ public:
SfxLockBytesItem();
SfxLockBytesItem( sal_uInt16 nWhich, SvStream & );
SfxLockBytesItem( const SfxLockBytesItem& );
- ~SfxLockBytesItem();
+ virtual ~SfxLockBytesItem();
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx
index cac661e5d328..070b9319f3a6 100644
--- a/include/svl/metitem.hxx
+++ b/include/svl/metitem.hxx
@@ -29,7 +29,7 @@ public:
explicit SfxMetricItem( sal_uInt16 nWhich = 0, sal_uInt32 nValue = 0 );
SfxMetricItem( sal_uInt16 nWhich, SvStream & );
SfxMetricItem( const SfxMetricItem& );
- ~SfxMetricItem() {}
+ virtual ~SfxMetricItem() {}
virtual bool ScaleMetrics( long lMult, long lDiv ) SAL_OVERRIDE;
virtual bool HasMetrics() const SAL_OVERRIDE;
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index de5fea4ff83a..5a3157170889 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -324,7 +324,7 @@ public:
explicit SfxVoidItem( sal_uInt16 nWhich );
SfxVoidItem( sal_uInt16 nWhich, SvStream & );
SfxVoidItem( const SfxVoidItem& );
- ~SfxVoidItem();
+ virtual ~SfxVoidItem();
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -352,7 +352,7 @@ public:
SfxSetItem( sal_uInt16 nWhich, SfxItemSet *pSet );
SfxSetItem( sal_uInt16 nWhich, const SfxItemSet &rSet );
SfxSetItem( const SfxSetItem&, SfxItemPool *pPool = 0 );
- ~SfxSetItem();
+ virtual ~SfxSetItem();
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx
index e24912c40230..911a067fb3b4 100644
--- a/include/svl/ptitem.hxx
+++ b/include/svl/ptitem.hxx
@@ -34,7 +34,7 @@ public:
SfxPointItem();
SfxPointItem( sal_uInt16 nWhich, const Point& rVal );
SfxPointItem( const SfxPointItem& );
- ~SfxPointItem() {}
+ virtual ~SfxPointItem() {}
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx
index 2c05a76a51c9..129f17f7667f 100644
--- a/include/svl/rectitem.hxx
+++ b/include/svl/rectitem.hxx
@@ -35,7 +35,7 @@ public:
SfxRectangleItem();
SfxRectangleItem( sal_uInt16 nWhich, const Rectangle& rVal );
SfxRectangleItem( const SfxRectangleItem& );
- ~SfxRectangleItem() {}
+ virtual ~SfxRectangleItem() {}
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx
index c3d60f080ca3..80b81e44380b 100644
--- a/include/svl/slstitm.hxx
+++ b/include/svl/slstitm.hxx
@@ -40,7 +40,7 @@ public:
SfxStringListItem( sal_uInt16 nWhich, const std::vector<OUString> *pList=NULL );
SfxStringListItem( sal_uInt16 nWhich, SvStream& rStream );
SfxStringListItem( const SfxStringListItem& rItem );
- ~SfxStringListItem();
+ virtual ~SfxStringListItem();
std::vector<OUString>& GetList();
diff --git a/include/svl/smplhint.hxx b/include/svl/smplhint.hxx
index 5d70dfe14866..8189a005456b 100644
--- a/include/svl/smplhint.hxx
+++ b/include/svl/smplhint.hxx
@@ -77,7 +77,7 @@ public:
public: \
TYPEINFO_OVERRIDE(); \
Name( sal_uInt16 nId, const Type& rObject ); \
- ~Name(); \
+ virtual ~Name(); \
const Type& GetObject() const { return aObj; } \
}
diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx
index 1ee8228c54d2..690e3ee82899 100644
--- a/include/svl/szitem.hxx
+++ b/include/svl/szitem.hxx
@@ -35,7 +35,7 @@ public:
SfxSizeItem();
SfxSizeItem( sal_uInt16 nWhich, const Size& rVal );
SfxSizeItem( const SfxSizeItem& );
- ~SfxSizeItem() {}
+ virtual ~SfxSizeItem() {}
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index 0555ab4fd80d..2a53e4750db7 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -455,7 +455,7 @@ private:
public:
TYPEINFO_OVERRIDE();
SfxLinkUndoAction(::svl::IUndoManager *pManager);
- ~SfxLinkUndoAction();
+ virtual ~SfxLinkUndoAction();
virtual void Undo() SAL_OVERRIDE;
virtual void Redo() SAL_OVERRIDE;