Kaydet (Commit) aa84f145 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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: 's avatarStephan Bergmann <sbergman@redhat.com>
üst f1a10d4f
...@@ -66,7 +66,6 @@ class LwpAtomHolder ...@@ -66,7 +66,6 @@ class LwpAtomHolder
{ {
public: public:
LwpAtomHolder(); LwpAtomHolder();
~LwpAtomHolder();
private: private:
sal_Int32 m_nAtom; sal_Int32 m_nAtom;
sal_Int32 m_nAssocAtom; sal_Int32 m_nAssocAtom;
......
...@@ -68,6 +68,12 @@ ...@@ -68,6 +68,12 @@
class IXFStyle class IXFStyle
{ {
public: public:
IXFStyle() = default;
IXFStyle(IXFStyle const &) = default;
IXFStyle(IXFStyle &&) = default;
IXFStyle & operator =(IXFStyle const &) = default;
IXFStyle & operator =(IXFStyle &&) = default;
virtual ~IXFStyle(){} virtual ~IXFStyle(){}
/** /**
* @descr: return the style name. * @descr: return the style name.
......
...@@ -88,6 +88,11 @@ public: ...@@ -88,6 +88,11 @@ public:
virtual ~XFListLevel(){} virtual ~XFListLevel(){}
XFListLevel(XFListLevel const &) = default;
XFListLevel(XFListLevel &&) = default;
XFListLevel & operator =(XFListLevel const &) = default;
XFListLevel & operator =(XFListLevel &&) = default;
void SetListlevelType(enumXFListLevel type); void SetListlevelType(enumXFListLevel type);
void SetLevel(sal_Int16 level); void SetLevel(sal_Int16 level);
......
...@@ -73,6 +73,11 @@ public: ...@@ -73,6 +73,11 @@ public:
virtual ~XFStyle() override; virtual ~XFStyle() override;
XFStyle(XFStyle const &) = default;
XFStyle(XFStyle &&) = default;
XFStyle & operator =(XFStyle const &) = default;
XFStyle & operator =(XFStyle &&) = default;
public: public:
/** /**
* @descr get style name. * @descr get style name.
......
...@@ -78,6 +78,11 @@ public: ...@@ -78,6 +78,11 @@ public:
virtual ~XFTextStyle() override; virtual ~XFTextStyle() override;
XFTextStyle(XFTextStyle const &) = default;
XFTextStyle(XFTextStyle &&) = default;
XFTextStyle & operator =(XFTextStyle const &) = default;
XFTextStyle & operator =(XFTextStyle &&) = default;
public: public:
/** /**
* @descr: set the font for the text span. * @descr: set the font for the text span.
......
...@@ -62,8 +62,6 @@ LwpAtomHolder::LwpAtomHolder() ...@@ -62,8 +62,6 @@ LwpAtomHolder::LwpAtomHolder()
: m_nAtom(0), m_nAssocAtom(0) : m_nAtom(0), m_nAssocAtom(0)
{} {}
LwpAtomHolder::~LwpAtomHolder()
{}
/** /**
* @descr read atomholder from object stream * @descr read atomholder from object stream
* the default encoding used in Word Pro is 1252 * the default encoding used in Word Pro is 1252
......
...@@ -117,9 +117,6 @@ LwpColor LwpNumericFormatSubset::GetColor() ...@@ -117,9 +117,6 @@ LwpColor LwpNumericFormatSubset::GetColor()
LwpNumericFormatSubset::LwpNumericFormatSubset():cSubFlags(0) LwpNumericFormatSubset::LwpNumericFormatSubset():cSubFlags(0)
{ {
} }
LwpNumericFormatSubset::~LwpNumericFormatSubset()
{
}
LwpNumericFormat::LwpNumericFormat(LwpObjectStream * pStrm) LwpNumericFormat::LwpNumericFormat(LwpObjectStream * pStrm)
: m_pObjStrm(pStrm) : m_pObjStrm(pStrm)
......
...@@ -75,7 +75,6 @@ class LwpNumericFormatSubset final ...@@ -75,7 +75,6 @@ class LwpNumericFormatSubset final
{ {
public: public:
LwpNumericFormatSubset(); LwpNumericFormatSubset();
~LwpNumericFormatSubset();
void QuickRead(LwpObjectStream* pStrm); void QuickRead(LwpObjectStream* pStrm);
OUString const & GetPrefix(){ return cPrefix.str();} OUString const & GetPrefix(){ return cPrefix.str();}
OUString const & GetSuffix(){ return cSuffix.str();} OUString const & GetSuffix(){ return cSuffix.str();}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment