summaryrefslogtreecommitdiffstats
path: root/lotuswordpro/source/filter/lwptablelayout.hxx
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 /lotuswordpro/source/filter/lwptablelayout.hxx
parentavoid loading all calendars of a locale (diff)
downloadcore-91dd2db17bd6cb9b357d1d69b187174e31eabef0.tar.gz
core-91dd2db17bd6cb9b357d1d69b187174e31eabef0.zip
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 'lotuswordpro/source/filter/lwptablelayout.hxx')
-rw-r--r--lotuswordpro/source/filter/lwptablelayout.hxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx
index d17f734d1bb4..16d3b09d3497 100644
--- a/lotuswordpro/source/filter/lwptablelayout.hxx
+++ b/lotuswordpro/source/filter/lwptablelayout.hxx
@@ -86,7 +86,7 @@ class LwpTableLayout: public LwpLayout
{
public:
LwpTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
- virtual ~LwpTableLayout();
+ virtual ~LwpTableLayout() override;
virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_TABLE_LAYOUT;}
LwpObjectID& GetColumnLayoutHead(){return m_ColumnLayout;}
void RegisterStyle() override;
@@ -158,7 +158,7 @@ class LwpSuperTableLayout: public LwpPlacableLayout
{
public:
LwpSuperTableLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
- virtual ~LwpSuperTableLayout();
+ virtual ~LwpSuperTableLayout() override;
virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_SUPERTABLE_LAYOUT;}
void RegisterNewStyle();
// for table style
@@ -193,7 +193,7 @@ class LwpColumnLayout : public LwpVirtualLayout
{
public:
LwpColumnLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
- virtual ~LwpColumnLayout();
+ virtual ~LwpColumnLayout() override;
virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_COLUMN_LAYOUT;}
sal_uInt32 GetColumnID(){return ccolid;}
double GetWidth() override {return LwpTools::ConvertFromUnitsToMetric(cwidth);}
@@ -214,7 +214,7 @@ class LwpTableHeadingLayout : public LwpTableLayout
{
public:
LwpTableHeadingLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
- virtual ~LwpTableHeadingLayout();
+ virtual ~LwpTableHeadingLayout() override;
virtual LWP_LAYOUT_TYPE GetLayoutType () override { return LWP_TABLE_HEADING_LAYOUT;}
void GetStartEndRow(sal_uInt16& nStartRow, sal_uInt16& nEndRow);
protected:
@@ -230,7 +230,7 @@ class LwpSuperParallelColumnLayout : public LwpSuperTableLayout
{
public:
LwpSuperParallelColumnLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
- virtual ~LwpSuperParallelColumnLayout();
+ virtual ~LwpSuperParallelColumnLayout() override;
protected:
void Read() override;
};
@@ -243,7 +243,7 @@ class LwpParallelColumnsLayout : public LwpTableLayout
{
public:
LwpParallelColumnsLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
- virtual ~LwpParallelColumnsLayout();
+ virtual ~LwpParallelColumnsLayout() override;
protected:
void Read() override;
};
@@ -252,7 +252,7 @@ class LwpSuperGlossaryLayout : public LwpSuperTableLayout
{
public:
LwpSuperGlossaryLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
- virtual ~LwpSuperGlossaryLayout();
+ virtual ~LwpSuperGlossaryLayout() override;
protected:
void Read() override;
};