summaryrefslogtreecommitdiff
path: root/sc/inc
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 /sc/inc
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 'sc/inc')
-rw-r--r--sc/inc/attrib.hxx14
-rw-r--r--sc/inc/chartlis.hxx2
-rw-r--r--sc/inc/dbdata.hxx2
-rw-r--r--sc/inc/defaultsoptions.hxx2
-rw-r--r--sc/inc/docoptio.hxx2
-rw-r--r--sc/inc/drawpage.hxx2
-rw-r--r--sc/inc/drwlayer.hxx2
-rw-r--r--sc/inc/formulacell.hxx2
-rw-r--r--sc/inc/formulaopt.hxx2
-rw-r--r--sc/inc/hints.hxx14
-rw-r--r--sc/inc/linkuno.hxx6
-rw-r--r--sc/inc/patattr.hxx2
-rw-r--r--sc/inc/printopt.hxx2
-rw-r--r--sc/inc/unoreflist.hxx2
-rw-r--r--sc/inc/viewopti.hxx2
15 files changed, 29 insertions, 29 deletions
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index be187a6f5aa9..a3d29a6cf698 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -54,7 +54,7 @@ public:
ScMergeAttr();
ScMergeAttr( SCsCOL nCol, SCsROW nRow = 0);
ScMergeAttr( const ScMergeAttr& );
- ~ScMergeAttr();
+ virtual ~ScMergeAttr();
virtual OUString GetValueText() const;
@@ -80,7 +80,7 @@ class SC_DLLPUBLIC ScMergeFlagAttr: public SfxInt16Item
public:
ScMergeFlagAttr();
ScMergeFlagAttr(sal_Int16 nFlags);
- ~ScMergeFlagAttr();
+ virtual ~ScMergeFlagAttr();
bool IsHorOverlapped() const { return ( GetValue() & SC_MF_HOR ) != 0; }
bool IsVerOverlapped() const { return ( GetValue() & SC_MF_VER ) != 0; }
@@ -108,7 +108,7 @@ public:
bool bHCell = false,
bool bHPrint = false);
ScProtectionAttr( const ScProtectionAttr& );
- ~ScProtectionAttr();
+ virtual ~ScProtectionAttr();
virtual OUString GetValueText() const;
virtual SfxItemPresentation GetPresentation(
@@ -213,7 +213,7 @@ public:
inline ScTableListItem( const sal_uInt16 nWhich );
ScTableListItem( const ScTableListItem& rCpy );
- ~ScTableListItem();
+ virtual ~ScTableListItem();
ScTableListItem& operator=( const ScTableListItem &rCpy );
@@ -251,7 +251,7 @@ public:
TYPEINFO_OVERRIDE();
ScPageHFItem( sal_uInt16 nWhich );
ScPageHFItem( const ScPageHFItem& rItem );
- ~ScPageHFItem();
+ virtual ~ScPageHFItem();
virtual OUString GetValueText() const;
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -283,7 +283,7 @@ public:
ScViewObjectModeItem( sal_uInt16 nWhich );
ScViewObjectModeItem( sal_uInt16 nWhich, ScVObjMode eMode );
- ~ScViewObjectModeItem();
+ virtual ~ScViewObjectModeItem();
virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE;
virtual OUString GetValueText( sal_uInt16 nVal ) const;
@@ -305,7 +305,7 @@ public:
TYPEINFO_OVERRIDE();
ScDoubleItem( sal_uInt16 nWhich, double nVal=0 );
ScDoubleItem( const ScDoubleItem& rItem );
- ~ScDoubleItem();
+ virtual ~ScDoubleItem();
virtual OUString GetValueText() const;
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index b8715e21df45..c9f10bb2d46f 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -81,7 +81,7 @@ public:
ScChartListener( const OUString& rName, ScDocument* pDoc,
::std::vector<ScTokenRef>* pTokens );
ScChartListener( const ScChartListener& );
- ~ScChartListener();
+ virtual ~ScChartListener();
const OUString& GetName() const;
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 50ec53c486b1..49a68e6327be 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -81,7 +81,7 @@ public:
bool bByR = true, bool bHasH = true);
ScDBData(const ScDBData& rData);
ScDBData(const OUString& rName, const ScDBData& rData);
- ~ScDBData();
+ virtual ~ScDBData();
ScDBData& operator= (const ScDBData& rData);
diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx
index 7dfef1525ec2..420194049ca1 100644
--- a/sc/inc/defaultsoptions.hxx
+++ b/sc/inc/defaultsoptions.hxx
@@ -49,7 +49,7 @@ public:
ScTpDefaultsItem( sal_uInt16 nWhich,
const ScDefaultsOptions& rOpt );
ScTpDefaultsItem( const ScTpDefaultsItem& rItem );
- ~ScTpDefaultsItem();
+ virtual ~ScTpDefaultsItem();
virtual OUString GetValueText() const;
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index f6582599d4ea..a5bd10dc5c99 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -149,7 +149,7 @@ public:
ScTpCalcItem( sal_uInt16 nWhich,
const ScDocOptions& rOpt );
ScTpCalcItem( const ScTpCalcItem& rItem );
- ~ScTpCalcItem();
+ virtual ~ScTpCalcItem();
virtual OUString GetValueText() const;
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx
index 50a53cc81222..aeda08a21069 100644
--- a/sc/inc/drawpage.hxx
+++ b/sc/inc/drawpage.hxx
@@ -29,7 +29,7 @@ class ScDrawPage: public FmFormPage
{
public:
ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage = false);
- ~ScDrawPage();
+ virtual ~ScDrawPage();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() SAL_OVERRIDE;
};
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 538c1fca63e4..cc8c8f4c407e 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -72,7 +72,7 @@ private:
public:
ScUndoObjData( SdrObject* pObj, const ScAddress& rOS, const ScAddress& rOE,
const ScAddress& rNS, const ScAddress& rNE );
- ~ScUndoObjData();
+ virtual ~ScUndoObjData();
virtual void Undo() SAL_OVERRIDE;
virtual void Redo() SAL_OVERRIDE;
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index e750e5496b94..15b5adbac7c8 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -156,7 +156,7 @@ public:
ScAddress aPos;
- ~ScFormulaCell();
+ virtual ~ScFormulaCell();
ScFormulaCell* Clone() const;
diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index 5db5ad963772..43104aa23713 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -85,7 +85,7 @@ public:
ScTpFormulaItem( sal_uInt16 nWhich,
const ScFormulaOptions& rOpt );
ScTpFormulaItem( const ScTpFormulaItem& rItem );
- ~ScTpFormulaItem();
+ virtual ~ScTpFormulaItem();
virtual OUString GetValueText() const;
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index 5829a410d428..ecfe6b920614 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -35,7 +35,7 @@ class ScPaintHint : public SfxHint
public:
TYPEINFO_OVERRIDE();
ScPaintHint( const ScRange& rRng, sal_uInt16 nPaint = PAINT_ALL );
- ~ScPaintHint();
+ virtual ~ScPaintHint();
void SetPrintFlag(bool bSet) { bPrint = bSet; }
@@ -63,7 +63,7 @@ public:
ScUpdateRefHint( UpdateRefMode eMode, const ScRange& rR,
SCsCOL nX, SCsROW nY, SCsTAB nZ );
- ~ScUpdateRefHint();
+ virtual ~ScUpdateRefHint();
UpdateRefMode GetMode() const { return eUpdateRefMode; }
const ScRange& GetRange() const { return aRange; }
@@ -81,7 +81,7 @@ class ScPointerChangedHint : public SfxHint
public:
TYPEINFO_OVERRIDE();
- ~ScPointerChangedHint();
+ virtual ~ScPointerChangedHint();
sal_uInt16 GetFlags() const { return nFlags; }
};
@@ -107,7 +107,7 @@ class ScLinkRefreshedHint : public SfxHint
public:
TYPEINFO_OVERRIDE();
ScLinkRefreshedHint();
- ~ScLinkRefreshedHint();
+ virtual ~ScLinkRefreshedHint();
void SetSheetLink( const OUString& rSourceUrl );
void SetDdeLink( const OUString& rA, const OUString& rT, const OUString& rI, sal_uInt8 nM );
@@ -135,7 +135,7 @@ public:
TYPEINFO_OVERRIDE();
ScAutoStyleHint( const ScRange& rR, const OUString& rSt1,
sal_uLong nT, const OUString& rSt2 );
- ~ScAutoStyleHint();
+ virtual ~ScAutoStyleHint();
const ScRange& GetRange() const { return aRange; }
const OUString& GetStyle1() const { return aStyle1; }
@@ -150,7 +150,7 @@ class ScDBRangeRefreshedHint : public SfxHint
public:
TYPEINFO_OVERRIDE();
ScDBRangeRefreshedHint( const ScImportParam& rP );
- ~ScDBRangeRefreshedHint();
+ virtual ~ScDBRangeRefreshedHint();
const ScImportParam& GetImportParam() const { return aParam; }
};
@@ -162,7 +162,7 @@ class ScDataPilotModifiedHint : public SfxHint
public:
TYPEINFO_OVERRIDE();
ScDataPilotModifiedHint( const OUString& rName );
- ~ScDataPilotModifiedHint();
+ virtual ~ScDataPilotModifiedHint();
const OUString& GetName() const { return maName; }
};
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index 1d9c90b9ad2f..9444c0a01c9b 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -503,7 +503,7 @@ class ScExternalSheetCacheObj : public cppu::WeakImplHelper1< ::com::sun::star::
{
public:
explicit ScExternalSheetCacheObj(ScDocShell* pDocShell, ScExternalRefCache::TableTypeRef pTable, size_t nIndex);
- ~ScExternalSheetCacheObj();
+ virtual ~ScExternalSheetCacheObj();
// XExternalSheetCache
virtual void SAL_CALL setCellValue(
@@ -537,7 +537,7 @@ class ScExternalDocLinkObj : public cppu::WeakImplHelper1< ::com::sun::star::she
{
public:
ScExternalDocLinkObj(ScDocShell* pDocShell, ScExternalRefManager* pRefMgr, sal_uInt16 nFileId);
- ~ScExternalDocLinkObj();
+ virtual ~ScExternalDocLinkObj();
// XExternalDocLink
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalSheetCache >
@@ -585,7 +585,7 @@ class ScExternalDocLinksObj : public cppu::WeakImplHelper1< ::com::sun::star::sh
{
public:
ScExternalDocLinksObj(ScDocShell* pDocShell);
- ~ScExternalDocLinksObj();
+ virtual ~ScExternalDocLinksObj();
// XExternalDocLinks
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalDocLink >
diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx
index c7574dea5add..c076fd9e24d4 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -59,7 +59,7 @@ public:
ScPatternAttr(SfxItemPool* pItemPool);
ScPatternAttr(const ScPatternAttr& rPatternAttr);
- ~ScPatternAttr();
+ virtual ~ScPatternAttr();
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const SAL_OVERRIDE;
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index 331b564a813b..0c236dbcfea3 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -59,7 +59,7 @@ public:
ScTpPrintItem( sal_uInt16 nWhich,
const ScPrintOptions& rOpt );
ScTpPrintItem( const ScTpPrintItem& rItem );
- ~ScTpPrintItem();
+ virtual ~ScTpPrintItem();
virtual OUString GetValueText() const;
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
diff --git a/sc/inc/unoreflist.hxx b/sc/inc/unoreflist.hxx
index dab538fc5f93..940865c3f1a4 100644
--- a/sc/inc/unoreflist.hxx
+++ b/sc/inc/unoreflist.hxx
@@ -65,7 +65,7 @@ class ScUnoRefUndoHint : public SfxHint
public:
TYPEINFO_OVERRIDE();
ScUnoRefUndoHint( const ScUnoRefEntry& rRefEntry );
- ~ScUnoRefUndoHint();
+ virtual ~ScUnoRefUndoHint();
sal_Int64 GetObjectId() const { return aEntry.nObjectId; }
const ScRangeList& GetRanges() const { return aEntry.aRanges; }
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 470549bf42e7..af15e1ecbf73 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -118,7 +118,7 @@ public:
TYPEINFO_OVERRIDE();
ScTpViewItem( sal_uInt16 nWhich, const ScViewOptions& rOpt );
ScTpViewItem( const ScTpViewItem& rItem );
- ~ScTpViewItem();
+ virtual ~ScTpViewItem();
virtual OUString GetValueText() const;
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;