summaryrefslogtreecommitdiff
path: root/hwpfilter
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 /hwpfilter
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 'hwpfilter')
-rw-r--r--hwpfilter/source/attributes.hxx2
-rw-r--r--hwpfilter/source/hbox.h18
-rw-r--r--hwpfilter/source/hiodev.h4
-rw-r--r--hwpfilter/source/hwpreader.hxx4
4 files changed, 14 insertions, 14 deletions
diff --git a/hwpfilter/source/attributes.hxx b/hwpfilter/source/attributes.hxx
index a23058e66256..8d4c0cdce768 100644
--- a/hwpfilter/source/attributes.hxx
+++ b/hwpfilter/source/attributes.hxx
@@ -33,7 +33,7 @@ struct AttributeListImpl_impl;
class AttributeListImpl : public WeakImplHelper< XAttributeList >
{
protected:
- virtual ~AttributeListImpl();
+ virtual ~AttributeListImpl() override;
public:
AttributeListImpl();
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index fd4b22a566d6..064521925f51 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -76,7 +76,7 @@ struct SkipData: public HBox
char *data_block;
explicit SkipData(hchar);
- virtual ~SkipData();
+ virtual ~SkipData() override;
virtual bool Read(HWPFile &hwpf) override;
};
struct DateCode;
@@ -94,7 +94,7 @@ struct FieldCode : public HBox
DateCode *m_pDate;
FieldCode();
- virtual ~FieldCode();
+ virtual ~FieldCode() override;
virtual bool Read(HWPFile &hwpf) override;
};
/**
@@ -119,7 +119,7 @@ struct Bookmark: public HBox
unsigned short type;
Bookmark();
- virtual ~Bookmark();
+ virtual ~Bookmark() override;
virtual bool Read(HWPFile &hwpf) override;
};
@@ -322,7 +322,7 @@ struct FBox: public HBox
FBox *prev, *next;
explicit FBox( hchar hch );
- virtual ~FBox();
+ virtual ~FBox() override;
};
struct Table;
@@ -374,7 +374,7 @@ struct TxtBox: public FBox
std::list<HWPPara*> caption;
TxtBox();
- virtual ~TxtBox();
+ virtual ~TxtBox() override;
/**
* @returns Count of cell.
@@ -647,7 +647,7 @@ struct Picture: public FBox
bool ishyper;
Picture();
- virtual ~Picture();
+ virtual ~Picture() override;
virtual bool Read (HWPFile &hwpf) override;
};
@@ -684,7 +684,7 @@ struct Hidden: public HBox
std::list<HWPPara*> plist;
Hidden();
- virtual ~Hidden();
+ virtual ~Hidden() override;
virtual bool Read(HWPFile &hwpf) override;
};
@@ -713,7 +713,7 @@ struct HeaderFooter: public HBox
std::list<HWPPara*> plist;
HeaderFooter();
- virtual ~HeaderFooter();
+ virtual ~HeaderFooter() override;
virtual bool Read(HWPFile &hwpf) override;
};
@@ -746,7 +746,7 @@ struct Footnote: public HBox
std::list<HWPPara*> plist;
Footnote();
- virtual ~Footnote();
+ virtual ~Footnote() override;
virtual bool Read(HWPFile &hwpf) override;
};
diff --git a/hwpfilter/source/hiodev.h b/hwpfilter/source/hiodev.h
index 0a43d44763d6..b30a79f843c4 100644
--- a/hwpfilter/source/hiodev.h
+++ b/hwpfilter/source/hiodev.h
@@ -81,7 +81,7 @@ class HStreamIODev : public HIODev
gz_stream *_gzfp;
public:
explicit HStreamIODev(HStream* stream);
- virtual ~HStreamIODev();
+ virtual ~HStreamIODev() override;
/**
* Check whether the stream is available
*/
@@ -145,7 +145,7 @@ class HMemIODev : public HIODev
int pos, length;
public:
HMemIODev(char *s, int len);
- virtual ~HMemIODev();
+ virtual ~HMemIODev() override;
virtual bool open() override;
virtual void close() override;
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 82efdd40b4fe..73d4378f5435 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -76,7 +76,7 @@ class HwpReader : public WeakImplHelper<XFilter>
public:
HwpReader();
- virtual ~HwpReader();
+ virtual ~HwpReader() override;
public:
/**
@@ -153,7 +153,7 @@ class HwpImportFilter : public WeakImplHelper< XFilter, XImporter, XServiceInfo,
{
public:
explicit HwpImportFilter(const Reference< XMultiServiceFactory >& rFact);
- virtual ~HwpImportFilter();
+ virtual ~HwpImportFilter() override;
public:
static Sequence< OUString > getSupportedServiceNames_Static() throw();