summaryrefslogtreecommitdiff
path: root/framework/inc/xml
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /framework/inc/xml
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff)
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'framework/inc/xml')
-rw-r--r--framework/inc/xml/acceleratorconfigurationreader.hxx2
-rw-r--r--framework/inc/xml/imagesdocumenthandler.hxx2
-rw-r--r--framework/inc/xml/menudocumenthandler.hxx10
-rw-r--r--framework/inc/xml/saxnamespacefilter.hxx2
-rw-r--r--framework/inc/xml/statusbardocumenthandler.hxx2
-rw-r--r--framework/inc/xml/toolboxdocumenthandler.hxx2
6 files changed, 10 insertions, 10 deletions
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx
index 55605bc1ebe0..cccdb1740286 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -98,7 +98,7 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper< css::xml::
AcceleratorConfigurationReader(AcceleratorCache& rContainer);
/** @short does nothing real ... */
- virtual ~AcceleratorConfigurationReader();
+ virtual ~AcceleratorConfigurationReader() override;
// XDocumentHandler
virtual void SAL_CALL startDocument()
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 16ffcbea0d65..8527642cab11 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -65,7 +65,7 @@ class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< css::xml::sax:
};
OReadImagesDocumentHandler( ImageListsDescriptor& aItems );
- virtual ~OReadImagesDocumentHandler();
+ virtual ~OReadImagesDocumentHandler() override;
// XDocumentHandler
virtual void SAL_CALL startDocument()
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index ce51a1d2ccc4..6a1d99a5dafd 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -39,7 +39,7 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase :
{
public:
ReadMenuDocumentHandlerBase();
- virtual ~ReadMenuDocumentHandlerBase();
+ virtual ~ReadMenuDocumentHandlerBase() override;
// XDocumentHandler
virtual void SAL_CALL startDocument()
@@ -100,7 +100,7 @@ class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBas
public:
OReadMenuDocumentHandler(
const css::uno::Reference< css::container::XIndexContainer >& rItemContainer );
- virtual ~OReadMenuDocumentHandler();
+ virtual ~OReadMenuDocumentHandler() override;
// XDocumentHandler
virtual void SAL_CALL startDocument()
@@ -139,7 +139,7 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
OReadMenuBarHandler(
const css::uno::Reference< css::container::XIndexContainer >& rMenuBarContainer,
const css::uno::Reference< css::lang::XSingleComponentFactory >& rContainerFactory );
- virtual ~OReadMenuBarHandler();
+ virtual ~OReadMenuBarHandler() override;
// XDocumentHandler
virtual void SAL_CALL startDocument()
@@ -176,7 +176,7 @@ class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase
public:
OReadMenuHandler( const css::uno::Reference< css::container::XIndexContainer >& rMenuContainer,
const css::uno::Reference< css::lang::XSingleComponentFactory >& rContainerFactory );
- virtual ~OReadMenuHandler();
+ virtual ~OReadMenuHandler() override;
// XDocumentHandler
virtual void SAL_CALL startDocument()
@@ -213,7 +213,7 @@ class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
public:
OReadMenuPopupHandler( const css::uno::Reference< css::container::XIndexContainer >& rMenuContainer,
const css::uno::Reference< css::lang::XSingleComponentFactory >& rContainerFactory );
- virtual ~OReadMenuPopupHandler();
+ virtual ~OReadMenuPopupHandler() override;
// XDocumentHandler
virtual void SAL_CALL startDocument()
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index cd4c30aa81b0..d137cf04db3c 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -37,7 +37,7 @@ class FWE_DLLPUBLIC SaxNamespaceFilter :
{
public:
SaxNamespaceFilter( css::uno::Reference< css::xml::sax::XDocumentHandler >& rSax1DocumentHandler );
- virtual ~SaxNamespaceFilter();
+ virtual ~SaxNamespaceFilter() override;
// XDocumentHandler
virtual void SAL_CALL startDocument()
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 1ad108fa0d91..0c1c3aaab854 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -62,7 +62,7 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler :
};
OReadStatusBarDocumentHandler( const css::uno::Reference< css::container::XIndexContainer >& aStatusBarItems );
- virtual ~OReadStatusBarDocumentHandler();
+ virtual ~OReadStatusBarDocumentHandler() override;
// XDocumentHandler
virtual void SAL_CALL startDocument()
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 514606118fd4..16d398679185 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -62,7 +62,7 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :
};
OReadToolBoxDocumentHandler( const css::uno::Reference< css::container::XIndexContainer >& rItemContainer );
- virtual ~OReadToolBoxDocumentHandler();
+ virtual ~OReadToolBoxDocumentHandler() override;
// XDocumentHandler
virtual void SAL_CALL startDocument()