summaryrefslogtreecommitdiff
path: root/writerperfect
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 /writerperfect
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 'writerperfect')
-rw-r--r--writerperfect/inc/DirectoryStream.hxx2
-rw-r--r--writerperfect/inc/ImportFilter.hxx2
-rw-r--r--writerperfect/inc/WPFTEncodingDialog.hxx2
-rw-r--r--writerperfect/inc/WPXSvInputStream.hxx2
-rw-r--r--writerperfect/source/impress/KeynoteImportFilter.hxx2
-rw-r--r--writerperfect/source/writer/WordPerfectImportFilter.hxx2
6 files changed, 6 insertions, 6 deletions
diff --git a/writerperfect/inc/DirectoryStream.hxx b/writerperfect/inc/DirectoryStream.hxx
index e02aab6f44bb..dce2a63a82f2 100644
--- a/writerperfect/inc/DirectoryStream.hxx
+++ b/writerperfect/inc/DirectoryStream.hxx
@@ -38,7 +38,7 @@ class WRITERPERFECT_DLLPUBLIC DirectoryStream : public librevenge::RVNGInputStre
public:
explicit DirectoryStream(const css::uno::Reference<css::ucb::XContent> &xContent);
- virtual ~DirectoryStream();
+ virtual ~DirectoryStream() override;
static bool isDirectory(const css::uno::Reference<css::ucb::XContent> &xContent);
diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx
index e7a27f4ee847..2b4b9bb5103b 100644
--- a/writerperfect/inc/ImportFilter.hxx
+++ b/writerperfect/inc/ImportFilter.hxx
@@ -60,7 +60,7 @@ public:
{
}
- virtual ~ImportFilterImpl()
+ virtual ~ImportFilterImpl() override
{
}
diff --git a/writerperfect/inc/WPFTEncodingDialog.hxx b/writerperfect/inc/WPFTEncodingDialog.hxx
index 9fc747d749ff..f6daaab89ebf 100644
--- a/writerperfect/inc/WPFTEncodingDialog.hxx
+++ b/writerperfect/inc/WPFTEncodingDialog.hxx
@@ -28,7 +28,7 @@ class WRITERPERFECT_DLLPUBLIC WPFTEncodingDialog : public ModalDialog
public:
WPFTEncodingDialog(const OUString &title, const OUString &defEncoding);
- virtual ~WPFTEncodingDialog();
+ virtual ~WPFTEncodingDialog() override;
OUString GetEncoding() const;
bool hasUserCalledCancel() const
diff --git a/writerperfect/inc/WPXSvInputStream.hxx b/writerperfect/inc/WPXSvInputStream.hxx
index 9bbefbb35bd6..c6b5d74406b5 100644
--- a/writerperfect/inc/WPXSvInputStream.hxx
+++ b/writerperfect/inc/WPXSvInputStream.hxx
@@ -39,7 +39,7 @@ class WRITERPERFECT_DLLPUBLIC WPXSvInputStream : public librevenge::RVNGInputStr
{
public:
WPXSvInputStream(css::uno::Reference< css::io::XInputStream > const &xStream);
- virtual ~WPXSvInputStream();
+ virtual ~WPXSvInputStream() override;
virtual bool isStructured() override;
virtual unsigned subStreamCount() override;
diff --git a/writerperfect/source/impress/KeynoteImportFilter.hxx b/writerperfect/source/impress/KeynoteImportFilter.hxx
index e4c88001c006..a56ffcc8b63c 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.hxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.hxx
@@ -22,7 +22,7 @@ class KeynoteImportFilter : public writerperfect::ImportFilter<OdpGenerator>
public:
explicit KeynoteImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdpGenerator>(rxContext) {}
- virtual ~KeynoteImportFilter() {}
+ virtual ~KeynoteImportFilter() override {}
//XExtendedFilterDetection
virtual OUString SAL_CALL detect(css::uno::Sequence< css::beans::PropertyValue > &Descriptor)
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx b/writerperfect/source/writer/WordPerfectImportFilter.hxx
index 7ebdf2633bd3..a8c30dfa6f41 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.hxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx
@@ -45,7 +45,7 @@ protected:
public:
explicit WordPerfectImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: mxContext(rxContext) {}
- virtual ~WordPerfectImportFilter() {}
+ virtual ~WordPerfectImportFilter() override {}
// XFilter
virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor)