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 /sw/inc/unostyle.hxx | |
parent | svx: fix SID_OFFER_IMPORT and SID_ATTR_CHAR_GRABBAG having the same SID (diff) | |
download | core-362d4f0cd4e50111edfae9d30c90602c37ed65a2.tar.gz core-362d4f0cd4e50111edfae9d30c90602c37ed65a2.zip |
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 'sw/inc/unostyle.hxx')
-rw-r--r-- | sw/inc/unostyle.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index bde8eba77cd0..deaf3aec1362 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -114,7 +114,7 @@ class SwXStyleFamily : public cppu::WeakImplHelper4 SwXStyle* _FindStyle(const OUString& rStyleName) const; public: SwXStyleFamily(SwDocShell* pDocShell, sal_uInt16 nFamily); - ~SwXStyleFamily(); + virtual ~SwXStyleFamily(); //XIndexAccess virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -204,7 +204,7 @@ public: SwDoc* pDoc, const OUString& rStyleName); - ~SwXStyle(); + virtual ~SwXStyle(); TYPEINFO_OVERRIDE(); @@ -282,7 +282,7 @@ public: const OUString& rStyleName) : SwXStyle(rPool, SFX_STYLE_FAMILY_FRAME, pDoc, rStyleName){} SwXFrameStyle( SwDoc *pDoc ); - ~SwXFrameStyle(); + virtual ~SwXFrameStyle(); virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE {SwXStyle::acquire();} virtual void SAL_CALL release( ) throw() SAL_OVERRIDE {SwXStyle::release();} @@ -311,7 +311,7 @@ public: SwXPageStyle(SfxStyleSheetBasePool& rPool, SwDocShell* pDocSh, SfxStyleFamily eFam, const OUString& rStyleName); SwXPageStyle(SwDocShell* pDocSh); - ~SwXPageStyle(); + virtual ~SwXPageStyle(); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; |