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 /sd/source/filter | |
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 'sd/source/filter')
-rw-r--r-- | sd/source/filter/eppt/eppt.hxx | 2 | ||||
-rw-r--r-- | sd/source/filter/eppt/epptooxml.hxx | 2 | ||||
-rw-r--r-- | sd/source/filter/eppt/escherex.hxx | 2 | ||||
-rw-r--r-- | sd/source/filter/grf/sdgrffilter.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/html/HtmlOptionsDialog.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/html/htmlattr.hxx | 2 | ||||
-rw-r--r-- | sd/source/filter/html/htmlex.hxx | 2 | ||||
-rw-r--r-- | sd/source/filter/ppt/pptin.hxx | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 1b8023faf5b8..dc9f1d10f89e 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -277,7 +277,7 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rStatInd, SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ); - ~PPTWriter(); + virtual ~PPTWriter(); sal_Bool IsValid() const { return mbStatus; }; diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx index 519db4d21681..6f47adf1e43f 100644 --- a/sd/source/filter/eppt/epptooxml.hxx +++ b/sd/source/filter/eppt/epptooxml.hxx @@ -67,7 +67,7 @@ public: PowerPointExport( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxCtxt ); - ~PowerPointExport(); + virtual ~PowerPointExport(); // from FilterBase virtual bool importDocument() throw() SAL_OVERRIDE; diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx index 9ef08c3f55b4..c3fd22a57d31 100644 --- a/sd/source/filter/eppt/escherex.hxx +++ b/sd/source/filter/eppt/escherex.hxx @@ -49,7 +49,7 @@ class PptEscherEx : public EscherEx public: PptEscherEx( SvStream& rOut, const OUString& ); - ~PptEscherEx(); + virtual ~PptEscherEx(); void OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance = 0 ) SAL_OVERRIDE; void CloseContainer() SAL_OVERRIDE; diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index bffc54efd364..e23b97c0d52f 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -103,7 +103,7 @@ class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper1< com::sun: nFilterError( GRFILTER_OK ) {} - ~SdGRFFilter_ImplInteractionHdl(); + virtual ~SdGRFFilter_ImplInteractionHdl(); sal_uInt16 GetErrorCode() const { return nFilterError; }; diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx index 5d3d4431f714..af23e387da16 100644 --- a/sd/source/filter/html/HtmlOptionsDialog.cxx +++ b/sd/source/filter/html/HtmlOptionsDialog.cxx @@ -61,7 +61,7 @@ class SdHtmlOptionsDialog : public cppu::WeakImplHelper5 public: SdHtmlOptionsDialog(); - ~SdHtmlOptionsDialog(); + virtual ~SdHtmlOptionsDialog(); // XInterface virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/sd/source/filter/html/htmlattr.hxx b/sd/source/filter/html/htmlattr.hxx index 5274632da254..868175594934 100644 --- a/sd/source/filter/html/htmlattr.hxx +++ b/sd/source/filter/html/htmlattr.hxx @@ -32,7 +32,7 @@ protected: public: SdHtmlAttrPreview( Window* pParent, const ResId& rResId ); - ~SdHtmlAttrPreview(); + virtual ~SdHtmlAttrPreview(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 1912e007bae8..56f9e153dec4 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -68,7 +68,7 @@ private: public: HtmlErrorContext(Window *pWin=0); - ~HtmlErrorContext() {}; + virtual ~HtmlErrorContext() {}; virtual bool GetString( sal_uLong nErrId, OUString& rCtxStr ) SAL_OVERRIDE; diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx index 003699ee6878..2de8fd608ccf 100644 --- a/sd/source/filter/ppt/pptin.hxx +++ b/sd/source/filter/ppt/pptin.hxx @@ -75,7 +75,7 @@ public: OUString ReadMedia( sal_uInt32 nMediaRef ) const; ImplSdPPTImport( SdDrawDocument* pDoc, SvStorage& rStorage, SfxMedium& rMed, PowerPointImportParam& ); - ~ImplSdPPTImport(); + virtual ~ImplSdPPTImport(); sal_Bool Import(); virtual bool ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rFormComp ) const SAL_OVERRIDE; |