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 /include/editeng | |
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 'include/editeng')
-rw-r--r-- | include/editeng/UnoForbiddenCharsTable.hxx | 2 | ||||
-rw-r--r-- | include/editeng/acorrcfg.hxx | 4 | ||||
-rw-r--r-- | include/editeng/boxitem.hxx | 4 | ||||
-rw-r--r-- | include/editeng/brushitem.hxx | 2 | ||||
-rw-r--r-- | include/editeng/bulletitem.hxx | 2 | ||||
-rw-r--r-- | include/editeng/colritem.hxx | 2 | ||||
-rw-r--r-- | include/editeng/flditem.hxx | 2 | ||||
-rw-r--r-- | include/editeng/forbiddencharacterstable.hxx | 2 | ||||
-rw-r--r-- | include/editeng/lcolitem.hxx | 2 | ||||
-rw-r--r-- | include/editeng/lineitem.hxx | 2 | ||||
-rw-r--r-- | include/editeng/spltitem.hxx | 2 | ||||
-rw-r--r-- | include/editeng/unoedprx.hxx | 2 |
12 files changed, 14 insertions, 14 deletions
diff --git a/include/editeng/UnoForbiddenCharsTable.hxx b/include/editeng/UnoForbiddenCharsTable.hxx index d073c4ee6855..45ef28ed1eb8 100644 --- a/include/editeng/UnoForbiddenCharsTable.hxx +++ b/include/editeng/UnoForbiddenCharsTable.hxx @@ -41,7 +41,7 @@ protected: public: SvxUnoForbiddenCharsTable(rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars); - ~SvxUnoForbiddenCharsTable(); + virtual ~SvxUnoForbiddenCharsTable(); // XForbiddenCharacters virtual com::sun::star::i18n::ForbiddenCharacters SAL_CALL getForbiddenCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::container::NoSuchElementException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx index 73ab582e7551..14e2b69d808d 100644 --- a/include/editeng/acorrcfg.hxx +++ b/include/editeng/acorrcfg.hxx @@ -31,7 +31,7 @@ class EDITENG_DLLPUBLIC SvxBaseAutoCorrCfg : public utl::ConfigItem public: SvxBaseAutoCorrCfg(SvxAutoCorrCfg& rParent); - ~SvxBaseAutoCorrCfg(); + virtual ~SvxBaseAutoCorrCfg(); void Load(bool bInit); virtual void Commit() SAL_OVERRIDE; @@ -46,7 +46,7 @@ class EDITENG_DLLPUBLIC SvxSwAutoCorrCfg : public utl::ConfigItem public: SvxSwAutoCorrCfg(SvxAutoCorrCfg& rParent); - ~SvxSwAutoCorrCfg(); + virtual ~SvxSwAutoCorrCfg(); void Load(bool bInit); virtual void Commit() SAL_OVERRIDE; diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index d0fde67ab107..37c2d8f4aab0 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -66,7 +66,7 @@ public: explicit SvxBoxItem( const sal_uInt16 nId ); SvxBoxItem( const SvxBoxItem &rCpy ); - ~SvxBoxItem(); + virtual ~SvxBoxItem(); SvxBoxItem &operator=( const SvxBoxItem& rBox ); // "pure virtual Methods" from SfxPoolItem @@ -176,7 +176,7 @@ public: explicit SvxBoxInfoItem( const sal_uInt16 nId ); SvxBoxInfoItem( const SvxBoxInfoItem &rCpy ); - ~SvxBoxInfoItem(); + virtual ~SvxBoxInfoItem(); SvxBoxInfoItem &operator=( const SvxBoxInfoItem &rCpy ); // "pure virtual Methods" from SfxPoolItem diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 61397f16b0e6..12cb66657cea 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -76,7 +76,7 @@ public: SvxBrushItem( const SvxBrushItem& ); SvxBrushItem( const CntWallpaperItem&, sal_uInt16 nWhich ); - ~SvxBrushItem(); + virtual ~SvxBrushItem(); public: diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index 2dc62288f39d..42cbf2ce2eda 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -83,7 +83,7 @@ public: explicit SvxBulletItem( sal_uInt16 nWhich = 0 ); explicit SvxBulletItem( SvStream& rStrm, sal_uInt16 nWhich = 0 ); SvxBulletItem( const SvxBulletItem& ); - ~SvxBulletItem(); + virtual ~SvxBulletItem(); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const SAL_OVERRIDE; diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index 08801f5b07d4..fc82bd282935 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -46,7 +46,7 @@ public: SvxColorItem( const Color& aColor, const sal_uInt16 nId ); SvxColorItem( SvStream& rStrm, const sal_uInt16 nId ); SvxColorItem( const SvxColorItem& rCopy ); - ~SvxColorItem(); + virtual ~SvxColorItem(); // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index d91fc1d59f0d..50a7f81b6878 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -79,7 +79,7 @@ public: SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ); SvxFieldItem( const SvxFieldItem& rItem ); - ~SvxFieldItem(); + virtual ~SvxFieldItem(); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/forbiddencharacterstable.hxx b/include/editeng/forbiddencharacterstable.hxx index d5fbc90290a5..88a685e6b54c 100644 --- a/include/editeng/forbiddencharacterstable.hxx +++ b/include/editeng/forbiddencharacterstable.hxx @@ -43,7 +43,7 @@ private: public: SvxForbiddenCharactersTable( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext); - ~SvxForbiddenCharactersTable() {} + virtual ~SvxForbiddenCharactersTable() {} Map& GetMap() { return maMap; } const com::sun::star::i18n::ForbiddenCharacters* GetForbiddenCharacters( sal_uInt16 nLanguage, bool bGetDefault ); diff --git a/include/editeng/lcolitem.hxx b/include/editeng/lcolitem.hxx index a4cd049d8cf9..35488265c1b1 100644 --- a/include/editeng/lcolitem.hxx +++ b/include/editeng/lcolitem.hxx @@ -34,7 +34,7 @@ public: explicit SvxLineColorItem( const sal_uInt16 nId ); SvxLineColorItem( const SvxLineColorItem& rCopy ); - ~SvxLineColorItem(); + virtual ~SvxLineColorItem(); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx index 92fd26d43706..ce2819c4edb7 100644 --- a/include/editeng/lineitem.hxx +++ b/include/editeng/lineitem.hxx @@ -43,7 +43,7 @@ public: explicit SvxLineItem( const sal_uInt16 nId ); SvxLineItem( const SvxLineItem& rCpy ); - ~SvxLineItem(); + virtual ~SvxLineItem(); SvxLineItem &operator=( const SvxLineItem& rLine ); virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx index 5207d7e00e9d..35b728bb1bd9 100644 --- a/include/editeng/spltitem.hxx +++ b/include/editeng/spltitem.hxx @@ -35,7 +35,7 @@ class EDITENG_DLLPUBLIC SvxFmtSplitItem : public SfxBoolItem { public: TYPEINFO_OVERRIDE(); - ~SvxFmtSplitItem(); + virtual ~SvxFmtSplitItem(); inline SvxFmtSplitItem( const bool bSplit /*= true*/, const sal_uInt16 nWh ); diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx index 770cec8ca115..34ca35f6df76 100644 --- a/include/editeng/unoedprx.hxx +++ b/include/editeng/unoedprx.hxx @@ -140,7 +140,7 @@ class EDITENG_DLLPUBLIC SvxEditSourceAdapter : public SvxEditSource { public: SvxEditSourceAdapter(); - ~SvxEditSourceAdapter(); + virtual ~SvxEditSourceAdapter(); virtual SvxEditSource* Clone() const SAL_OVERRIDE; virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; |