diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-06-25 23:40:03 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-26 09:03:15 +0200 |
commit | e61c97f08e5472b64ba33fc64a595ad48de4b357 (patch) | |
tree | 2b26c4b2d0dd55a5c096f18922424d3fae9ef6cb /lotuswordpro/source | |
parent | 3f3181522bd5fa7cd32dc81c624ef260b29cfc9c (diff) |
lotuswordpro: remove trivial copy assignment operators
Those will be implicitly-defined by compiler and a move assignment
operator should be implicitly-defined now too.
Change-Id: I03c4bb3b95e76c706b606a170ed02c2a39862b36
Reviewed-on: https://gerrit.libreoffice.org/39246
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'lotuswordpro/source')
-rw-r--r-- | lotuswordpro/source/filter/lwpborderstuff.cxx | 25 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpborderstuff.hxx | 1 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpmargins.hxx | 10 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpshadow.hxx | 9 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfmargins.cxx | 9 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfmargins.hxx | 1 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfrowstyle.cxx | 11 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfrowstyle.hxx | 1 |
8 files changed, 0 insertions, 67 deletions
diff --git a/lotuswordpro/source/filter/lwpborderstuff.cxx b/lotuswordpro/source/filter/lwpborderstuff.cxx index 7c099e820a29..06cfa6e1d511 100644 --- a/lotuswordpro/source/filter/lwpborderstuff.cxx +++ b/lotuswordpro/source/filter/lwpborderstuff.cxx @@ -215,29 +215,4 @@ float LwpBorderStuff::GetSideWidth(sal_uInt16 side) return 0; } -LwpBorderStuff& LwpBorderStuff::operator = (const LwpBorderStuff& rOther) -{ - m_nSides = rOther.m_nSides; - m_nValid = rOther.m_nValid; - - m_nBorderGroupIDLeft = rOther.m_nBorderGroupIDLeft; - m_nBorderGroupIDRight = rOther.m_nBorderGroupIDRight; - m_nBorderGroupIDTop = rOther.m_nBorderGroupIDTop; - m_nBorderGroupIDBottom = rOther.m_nBorderGroupIDBottom; - - m_nGroupIndent = rOther.m_nGroupIndent; - - m_nWidthLeft = rOther.m_nWidthLeft; - m_nWidthTop = rOther.m_nWidthTop; - m_nWidthRight = rOther.m_nWidthRight; - m_nWidthBottom = rOther.m_nWidthBottom; - - m_aColorLeft = rOther.m_aColorLeft; - m_aColorRight = rOther.m_aColorRight; - m_aColorTop = rOther.m_aColorTop; - m_aColorBottom = rOther.m_aColorBottom; - - return *this; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpborderstuff.hxx b/lotuswordpro/source/filter/lwpborderstuff.hxx index d98682161add..f59abffca7e7 100644 --- a/lotuswordpro/source/filter/lwpborderstuff.hxx +++ b/lotuswordpro/source/filter/lwpborderstuff.hxx @@ -86,7 +86,6 @@ public: sal_uInt16 GetSideType(sal_uInt16 side); LwpColor GetSideColor(sal_uInt16 side); float GetSideWidth(sal_uInt16 side); - LwpBorderStuff& operator = (const LwpBorderStuff& rOther); friend class LwpParaBorderOverride; private: sal_uInt16 m_nSides; diff --git a/lotuswordpro/source/filter/lwpmargins.hxx b/lotuswordpro/source/filter/lwpmargins.hxx index e836617b8ec4..eb3e8617cf75 100644 --- a/lotuswordpro/source/filter/lwpmargins.hxx +++ b/lotuswordpro/source/filter/lwpmargins.hxx @@ -78,7 +78,6 @@ public: m_nBottom = pStrm->QuickReadInt32(); pStrm->SkipExtra(); } - inline LwpMargins& operator = (const LwpMargins& rOther); inline double GetMarginsValue(sal_uInt8 nWhichSide); private: sal_Int32 m_nLeft; @@ -87,15 +86,6 @@ private: sal_Int32 m_nBottom; }; -inline LwpMargins& LwpMargins::operator = (const LwpMargins& rOther) -{ - m_nLeft = rOther.m_nLeft; - m_nTop = rOther.m_nTop; - m_nRight = rOther.m_nRight; - m_nBottom = rOther.m_nBottom; - return *this; -} - inline double LwpMargins::GetMarginsValue(sal_uInt8 nWhichSide) { switch (nWhichSide) diff --git a/lotuswordpro/source/filter/lwpshadow.hxx b/lotuswordpro/source/filter/lwpshadow.hxx index b3a773ff05e7..6a2e496df336 100644 --- a/lotuswordpro/source/filter/lwpshadow.hxx +++ b/lotuswordpro/source/filter/lwpshadow.hxx @@ -82,8 +82,6 @@ public: const LwpColor& GetColor(); - inline LwpShadow& operator = (const LwpShadow& rOther); - private: LwpColor m_aColor; sal_Int32 m_nDirX; @@ -106,13 +104,6 @@ inline const LwpColor& LwpShadow::GetColor() return m_aColor; } -inline LwpShadow& LwpShadow::operator = (const LwpShadow& rOther) -{ - m_aColor = rOther.m_aColor; - m_nDirX = rOther.m_nDirX; - m_nDirY = rOther.m_nDirY; - return *this; -} #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfmargins.cxx b/lotuswordpro/source/filter/xfilter/xfmargins.cxx index ca3fd5b4e184..31e410abca43 100644 --- a/lotuswordpro/source/filter/xfilter/xfmargins.cxx +++ b/lotuswordpro/source/filter/xfilter/xfmargins.cxx @@ -114,14 +114,5 @@ bool operator!=(XFMargins& indent1, XFMargins& indent2) return !(indent1==indent2); } -XFMargins& XFMargins::operator=(const XFMargins& other) -{ - m_nFlag = other.m_nFlag; - m_fLeft = other.m_fLeft; - m_fRight = other.m_fRight; - m_fTop = other.m_fTop; - m_fBottom = other.m_fBottom; - return *this; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfmargins.hxx b/lotuswordpro/source/filter/xfilter/xfmargins.hxx index a79a682990d6..4238b5fa9a28 100644 --- a/lotuswordpro/source/filter/xfilter/xfmargins.hxx +++ b/lotuswordpro/source/filter/xfilter/xfmargins.hxx @@ -85,7 +85,6 @@ public: friend bool operator==(XFMargins& indent1, XFMargins& indent2); friend bool operator!=(XFMargins& indent1, XFMargins& indent2); - XFMargins& operator=(const XFMargins& other); private: double m_fLeft; double m_fRight; diff --git a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx index 3f576b51ef0b..d2aba0a8e4a4 100644 --- a/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfrowstyle.cxx @@ -97,15 +97,4 @@ void XFRowStyle::ToXml(IXFStream *pStrm) pStrm->EndElement( "style:style" ); } -XFRowStyle& XFRowStyle::operator=(XFRowStyle const &other) -{ - if (this != &other) - { - m_fHeight = other.m_fHeight; - m_fMinHeight = other.m_fMinHeight; - m_aBackColor = other.m_aBackColor; - } - return *this; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx b/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx index 8f2c3871171f..facbeb1970f8 100644 --- a/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfrowstyle.hxx @@ -69,7 +69,6 @@ class XFRowStyle : public XFStyle { public: XFRowStyle(); - XFRowStyle& operator=(XFRowStyle const &other); public: void SetRowHeight(double height); |