summaryrefslogtreecommitdiff
path: root/svx/source/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 /svx/source/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 'svx/source/xml')
-rw-r--r--svx/source/xml/xmleohlp.cxx2
-rw-r--r--svx/source/xml/xmlgrhlp.cxx4
-rw-r--r--svx/source/xml/xmlxtexp.cxx12
-rw-r--r--svx/source/xml/xmlxtimp.cxx2
4 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 3762d5ed6047..99b7016cf850 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -73,7 +73,7 @@ class OutputStorageWrapper_Impl : public ::cppu::WeakImplHelper<XOutputStream>
public:
OutputStorageWrapper_Impl();
- virtual ~OutputStorageWrapper_Impl();
+ virtual ~OutputStorageWrapper_Impl() override;
// css::io::XOutputStream
virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override;
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index cc8bb484fde5..22df739dda91 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -89,7 +89,7 @@ private:
public:
explicit SvXMLGraphicInputStream( const OUString& rGraphicId );
- virtual ~SvXMLGraphicInputStream();
+ virtual ~SvXMLGraphicInputStream() override;
SvXMLGraphicInputStream(const SvXMLGraphicInputStream&) = delete;
SvXMLGraphicInputStream& operator=(const SvXMLGraphicInputStream&) = delete;
@@ -219,7 +219,7 @@ private:
public:
SvXMLGraphicOutputStream();
- virtual ~SvXMLGraphicOutputStream();
+ virtual ~SvXMLGraphicOutputStream() override;
SvXMLGraphicOutputStream(const SvXMLGraphicOutputStream&) = delete;
SvXMLGraphicOutputStream& operator=(const SvXMLGraphicOutputStream&) = delete;
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 1e2192d2a51b..0b7cf51dd5ff 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -79,7 +79,7 @@ class SvxXMLColorEntryExporter : public SvxXMLTableEntryExporter
{
public:
explicit SvxXMLColorEntryExporter( SvXMLExport& rExport );
- virtual ~SvxXMLColorEntryExporter();
+ virtual ~SvxXMLColorEntryExporter() override;
virtual void exportEntry( const OUString& rStrName, const Any& rValue ) override;
};
@@ -88,7 +88,7 @@ class SvxXMLLineEndEntryExporter : public SvxXMLTableEntryExporter
{
public:
explicit SvxXMLLineEndEntryExporter( SvXMLExport& rExport );
- virtual ~SvxXMLLineEndEntryExporter();
+ virtual ~SvxXMLLineEndEntryExporter() override;
virtual void exportEntry( const OUString& rStrName, const Any& rValue ) override;
private:
@@ -99,7 +99,7 @@ class SvxXMLDashEntryExporter : public SvxXMLTableEntryExporter
{
public:
explicit SvxXMLDashEntryExporter( SvXMLExport& rExport );
- virtual ~SvxXMLDashEntryExporter();
+ virtual ~SvxXMLDashEntryExporter() override;
virtual void exportEntry( const OUString& rStrName, const Any& rValue ) override;
@@ -111,7 +111,7 @@ class SvxXMLHatchEntryExporter : public SvxXMLTableEntryExporter
{
public:
explicit SvxXMLHatchEntryExporter( SvXMLExport& rExport );
- virtual ~SvxXMLHatchEntryExporter();
+ virtual ~SvxXMLHatchEntryExporter() override;
virtual void exportEntry( const OUString& rStrName, const Any& rValue ) override;
private:
@@ -122,7 +122,7 @@ class SvxXMLGradientEntryExporter : public SvxXMLTableEntryExporter
{
public:
explicit SvxXMLGradientEntryExporter( SvXMLExport& rExport );
- virtual ~SvxXMLGradientEntryExporter();
+ virtual ~SvxXMLGradientEntryExporter() override;
virtual void exportEntry( const OUString& rStrName, const Any& rValue ) override;
private:
@@ -133,7 +133,7 @@ class SvxXMLBitmapEntryExporter : public SvxXMLTableEntryExporter
{
public:
explicit SvxXMLBitmapEntryExporter( SvXMLExport& rExport );
- virtual ~SvxXMLBitmapEntryExporter();
+ virtual ~SvxXMLBitmapEntryExporter() override;
virtual void exportEntry( const OUString& rStrName, const Any& rValue ) override;
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 874d37c3f7f6..2307e6929f13 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -73,7 +73,7 @@ class SvxXMLTableImportContext : public SvXMLImportContext
public:
SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable,
bool bOOoFormat );
- virtual ~SvxXMLTableImportContext();
+ virtual ~SvxXMLTableImportContext() override;
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) override;