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>
This commit is contained in:
parent
3f3181522b
commit
e61c97f08e
@ -215,29 +215,4 @@ float LwpBorderStuff::GetSideWidth(sal_uInt16 side)
|
|||||||
return 0;
|
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: */
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||||
|
@ -86,7 +86,6 @@ public:
|
|||||||
sal_uInt16 GetSideType(sal_uInt16 side);
|
sal_uInt16 GetSideType(sal_uInt16 side);
|
||||||
LwpColor GetSideColor(sal_uInt16 side);
|
LwpColor GetSideColor(sal_uInt16 side);
|
||||||
float GetSideWidth(sal_uInt16 side);
|
float GetSideWidth(sal_uInt16 side);
|
||||||
LwpBorderStuff& operator = (const LwpBorderStuff& rOther);
|
|
||||||
friend class LwpParaBorderOverride;
|
friend class LwpParaBorderOverride;
|
||||||
private:
|
private:
|
||||||
sal_uInt16 m_nSides;
|
sal_uInt16 m_nSides;
|
||||||
|
@ -78,7 +78,6 @@ public:
|
|||||||
m_nBottom = pStrm->QuickReadInt32();
|
m_nBottom = pStrm->QuickReadInt32();
|
||||||
pStrm->SkipExtra();
|
pStrm->SkipExtra();
|
||||||
}
|
}
|
||||||
inline LwpMargins& operator = (const LwpMargins& rOther);
|
|
||||||
inline double GetMarginsValue(sal_uInt8 nWhichSide);
|
inline double GetMarginsValue(sal_uInt8 nWhichSide);
|
||||||
private:
|
private:
|
||||||
sal_Int32 m_nLeft;
|
sal_Int32 m_nLeft;
|
||||||
@ -87,15 +86,6 @@ private:
|
|||||||
sal_Int32 m_nBottom;
|
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)
|
inline double LwpMargins::GetMarginsValue(sal_uInt8 nWhichSide)
|
||||||
{
|
{
|
||||||
switch (nWhichSide)
|
switch (nWhichSide)
|
||||||
|
@ -82,8 +82,6 @@ public:
|
|||||||
|
|
||||||
const LwpColor& GetColor();
|
const LwpColor& GetColor();
|
||||||
|
|
||||||
inline LwpShadow& operator = (const LwpShadow& rOther);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
LwpColor m_aColor;
|
LwpColor m_aColor;
|
||||||
sal_Int32 m_nDirX;
|
sal_Int32 m_nDirX;
|
||||||
@ -106,13 +104,6 @@ inline const LwpColor& LwpShadow::GetColor()
|
|||||||
return m_aColor;
|
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
|
#endif
|
||||||
|
|
||||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||||
|
@ -114,14 +114,5 @@ bool operator!=(XFMargins& indent1, XFMargins& indent2)
|
|||||||
return !(indent1==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: */
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||||
|
@ -85,7 +85,6 @@ public:
|
|||||||
|
|
||||||
friend bool operator==(XFMargins& indent1, XFMargins& indent2);
|
friend bool operator==(XFMargins& indent1, XFMargins& indent2);
|
||||||
friend bool operator!=(XFMargins& indent1, XFMargins& indent2);
|
friend bool operator!=(XFMargins& indent1, XFMargins& indent2);
|
||||||
XFMargins& operator=(const XFMargins& other);
|
|
||||||
private:
|
private:
|
||||||
double m_fLeft;
|
double m_fLeft;
|
||||||
double m_fRight;
|
double m_fRight;
|
||||||
|
@ -97,15 +97,4 @@ void XFRowStyle::ToXml(IXFStream *pStrm)
|
|||||||
pStrm->EndElement( "style:style" );
|
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: */
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||||
|
@ -69,7 +69,6 @@ class XFRowStyle : public XFStyle
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
XFRowStyle();
|
XFRowStyle();
|
||||||
XFRowStyle& operator=(XFRowStyle const &other);
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void SetRowHeight(double height);
|
void SetRowHeight(double height);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user