From aa84f1458f422c1acf38b53a3e3138cd0e84e313 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 26 Jul 2018 13:49:35 +0200 Subject: lotuswordpro: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9) ...by explicitly defaulting the copy/move functions (and, where needed in turn, also a default ctor) for classes that have a user-declared dtor that does nothing other than an implicitly-defined one would do, but needs to be user- declared because it is virtual and potentially serves as a key function to emit the vtable, or is non-public, etc.; and by removing explicitly user- provided functions that do the same as their implicitly-defined counterparts, but may prevent implicitly declared copy functions from being defined as non- deleted in the future. (Even if such a user-provided function was declared non-inline in an include file, the apparently-used implicitly-defined copy functions are already include, so why bother with non-inline functions.) Change-Id: I725d60235b72e4eec59809e2d09bfab9a2f7c416 Reviewed-on: https://gerrit.libreoffice.org/58097 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- lotuswordpro/inc/lwpatomholder.hxx | 1 - lotuswordpro/inc/xfilter/ixfstyle.hxx | 6 ++++++ lotuswordpro/inc/xfilter/xfliststyle.hxx | 5 +++++ lotuswordpro/inc/xfilter/xfstyle.hxx | 5 +++++ lotuswordpro/inc/xfilter/xftextstyle.hxx | 5 +++++ lotuswordpro/source/filter/lwpatomholder.cxx | 2 -- lotuswordpro/source/filter/lwpnumericfmt.cxx | 3 --- lotuswordpro/source/filter/lwpnumericfmt.hxx | 1 - 8 files changed, 21 insertions(+), 7 deletions(-) (limited to 'lotuswordpro') diff --git a/lotuswordpro/inc/lwpatomholder.hxx b/lotuswordpro/inc/lwpatomholder.hxx index 3e373f7265b9..b038289a2d6b 100644 --- a/lotuswordpro/inc/lwpatomholder.hxx +++ b/lotuswordpro/inc/lwpatomholder.hxx @@ -66,7 +66,6 @@ class LwpAtomHolder { public: LwpAtomHolder(); - ~LwpAtomHolder(); private: sal_Int32 m_nAtom; sal_Int32 m_nAssocAtom; diff --git a/lotuswordpro/inc/xfilter/ixfstyle.hxx b/lotuswordpro/inc/xfilter/ixfstyle.hxx index defbc45471eb..2f5fabaf4cb4 100644 --- a/lotuswordpro/inc/xfilter/ixfstyle.hxx +++ b/lotuswordpro/inc/xfilter/ixfstyle.hxx @@ -68,6 +68,12 @@ class IXFStyle { public: + IXFStyle() = default; + IXFStyle(IXFStyle const &) = default; + IXFStyle(IXFStyle &&) = default; + IXFStyle & operator =(IXFStyle const &) = default; + IXFStyle & operator =(IXFStyle &&) = default; + virtual ~IXFStyle(){} /** * @descr: return the style name. diff --git a/lotuswordpro/inc/xfilter/xfliststyle.hxx b/lotuswordpro/inc/xfilter/xfliststyle.hxx index 24838063ae38..f4abb93a5b10 100644 --- a/lotuswordpro/inc/xfilter/xfliststyle.hxx +++ b/lotuswordpro/inc/xfilter/xfliststyle.hxx @@ -88,6 +88,11 @@ public: virtual ~XFListLevel(){} + XFListLevel(XFListLevel const &) = default; + XFListLevel(XFListLevel &&) = default; + XFListLevel & operator =(XFListLevel const &) = default; + XFListLevel & operator =(XFListLevel &&) = default; + void SetListlevelType(enumXFListLevel type); void SetLevel(sal_Int16 level); diff --git a/lotuswordpro/inc/xfilter/xfstyle.hxx b/lotuswordpro/inc/xfilter/xfstyle.hxx index 1e82c92e9642..493f000c60a7 100644 --- a/lotuswordpro/inc/xfilter/xfstyle.hxx +++ b/lotuswordpro/inc/xfilter/xfstyle.hxx @@ -73,6 +73,11 @@ public: virtual ~XFStyle() override; + XFStyle(XFStyle const &) = default; + XFStyle(XFStyle &&) = default; + XFStyle & operator =(XFStyle const &) = default; + XFStyle & operator =(XFStyle &&) = default; + public: /** * @descr get style name. diff --git a/lotuswordpro/inc/xfilter/xftextstyle.hxx b/lotuswordpro/inc/xfilter/xftextstyle.hxx index 24653ebbcf94..6b7711e5066e 100644 --- a/lotuswordpro/inc/xfilter/xftextstyle.hxx +++ b/lotuswordpro/inc/xfilter/xftextstyle.hxx @@ -78,6 +78,11 @@ public: virtual ~XFTextStyle() override; + XFTextStyle(XFTextStyle const &) = default; + XFTextStyle(XFTextStyle &&) = default; + XFTextStyle & operator =(XFTextStyle const &) = default; + XFTextStyle & operator =(XFTextStyle &&) = default; + public: /** * @descr: set the font for the text span. diff --git a/lotuswordpro/source/filter/lwpatomholder.cxx b/lotuswordpro/source/filter/lwpatomholder.cxx index a9a25173460c..582d8fee2780 100644 --- a/lotuswordpro/source/filter/lwpatomholder.cxx +++ b/lotuswordpro/source/filter/lwpatomholder.cxx @@ -62,8 +62,6 @@ LwpAtomHolder::LwpAtomHolder() : m_nAtom(0), m_nAssocAtom(0) {} -LwpAtomHolder::~LwpAtomHolder() -{} /** * @descr read atomholder from object stream * the default encoding used in Word Pro is 1252 diff --git a/lotuswordpro/source/filter/lwpnumericfmt.cxx b/lotuswordpro/source/filter/lwpnumericfmt.cxx index 5a8eed18d29f..2d41599f798f 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.cxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.cxx @@ -117,9 +117,6 @@ LwpColor LwpNumericFormatSubset::GetColor() LwpNumericFormatSubset::LwpNumericFormatSubset():cSubFlags(0) { } -LwpNumericFormatSubset::~LwpNumericFormatSubset() -{ -} LwpNumericFormat::LwpNumericFormat(LwpObjectStream * pStrm) : m_pObjStrm(pStrm) diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx index 3be0851ce452..65f7cba39833 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.hxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx @@ -75,7 +75,6 @@ class LwpNumericFormatSubset final { public: LwpNumericFormatSubset(); - ~LwpNumericFormatSubset(); void QuickRead(LwpObjectStream* pStrm); OUString const & GetPrefix(){ return cPrefix.str();} OUString const & GetSuffix(){ return cSuffix.str();} -- cgit