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 /sdext/source | |
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 'sdext/source')
-rw-r--r-- | sdext/source/pdfimport/sax/emitcontext.hxx | 2 | ||||
-rw-r--r-- | sdext/source/pdfimport/test/tests.cxx | 2 | ||||
-rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterButton.hxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterController.hxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterTimer.hxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/sdext/source/pdfimport/sax/emitcontext.hxx b/sdext/source/pdfimport/sax/emitcontext.hxx index a54fa7a7da95..677952c47290 100644 --- a/sdext/source/pdfimport/sax/emitcontext.hxx +++ b/sdext/source/pdfimport/sax/emitcontext.hxx @@ -38,7 +38,7 @@ namespace pdfi public: explicit SaxEmitter( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xDocHdl ); - ~SaxEmitter(); + virtual ~SaxEmitter(); virtual void beginTag( const char* pTag, const PropertyMap& rProperties ) SAL_OVERRIDE; virtual void write( const OUString& rString ) SAL_OVERRIDE; diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index 5fe48aca521b..8bef0308adad 100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -82,7 +82,7 @@ namespace m_bImageSeen(false) {} - ~TestSink() + virtual ~TestSink() { CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "A4 page size (in 100th of points): Width", m_aPageSize.Width, 79400, 0.00000001); CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "A4 page size (in 100th of points): Height" , m_aPageSize.Height, 59500, 0.0000001 ); diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index 760bfe70c170..067a132f0be4 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -149,7 +149,7 @@ namespace pdfi public: explicit PDFOutDev( PDFDoc* pDoc ); - ~PDFOutDev(); + virtual ~PDFOutDev(); //----- get info about output device diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index a1abb4b3794c..f485df308c10 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -64,7 +64,7 @@ public: const css::uno::Reference<css::awt::XWindow>& rxParentWindow, const css::uno::Reference<css::rendering::XCanvas>& rxParentCanvas, const OUString& rsConfigurationName); - ~PresenterButton (void); + virtual ~PresenterButton (void); virtual void SAL_CALL disposing (void) SAL_OVERRIDE; diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index 6d9270b9f86d..669414899c77 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -87,7 +87,7 @@ public: const css::uno::Reference<css::presentation::XSlideShowController>& rxSlideShowController, const rtl::Reference<PresenterPaneContainer>& rpPaneContainer, const css::uno::Reference<css::drawing::framework::XResourceId>& rxMainPaneId); - ~PresenterController (void); + virtual ~PresenterController (void); virtual void SAL_CALL disposing (void) SAL_OVERRIDE; diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx index 14f19391811a..f4db79904f49 100644 --- a/sdext/source/presenter/PresenterTimer.hxx +++ b/sdext/source/presenter/PresenterTimer.hxx @@ -109,7 +109,7 @@ private: PresenterClockTimer ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - ~PresenterClockTimer (void); + virtual ~PresenterClockTimer (void); void CheckCurrentTime (const TimeValue& rCurrentTime); }; |