diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-05-11 21:46:02 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-05-12 09:35:25 +0200 |
| commit | c7026059fcab70cac99eb776c50e260036a2f1d9 (patch) | |
| tree | f63b224ae455e2a46548b399a3f65a3c85b8af25 /sw/source/core/doc/tblafmt.cxx | |
| parent | 2ae92ea44ceea43004f7d98cc6c767c8b16455ac (diff) | |
sw: -Werror=deprecated-copy; restore SwBoxAutoFormat::operator=
Presumably 1e2682235cded9a7cd90e55f0bfc60a1285e9a46 assumed that it's
not called any more but evidently it is.
Change-Id: I5b7bad52d0a0c40494b33c3a604c8af1ace2b090
Reviewed-on: https://gerrit.libreoffice.org/72173
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'sw/source/core/doc/tblafmt.cxx')
| -rw-r--r-- | sw/source/core/doc/tblafmt.cxx | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index e9331971edc0..1cbe79762e49 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -268,6 +268,49 @@ SwBoxAutoFormat::~SwBoxAutoFormat() { } +SwBoxAutoFormat& SwBoxAutoFormat::operator=( const SwBoxAutoFormat& rNew ) +{ + m_aFont = rNew.m_aFont; + m_aHeight = rNew.m_aHeight; + m_aWeight = rNew.m_aWeight; + m_aPosture = rNew.m_aPosture; + m_aCJKFont = rNew.m_aCJKFont; + m_aCJKHeight = rNew.m_aCJKHeight; + m_aCJKWeight = rNew.m_aCJKWeight; + m_aCJKPosture = rNew.m_aCJKPosture; + m_aCTLFont = rNew.m_aCTLFont; + m_aCTLHeight = rNew.m_aCTLHeight; + m_aCTLWeight = rNew.m_aCTLWeight; + m_aCTLPosture = rNew.m_aCTLPosture; + m_aUnderline = rNew.m_aUnderline; + m_aOverline = rNew.m_aOverline; + m_aCrossedOut = rNew.m_aCrossedOut; + m_aContour = rNew.m_aContour; + m_aShadowed = rNew.m_aShadowed; + m_aColor = rNew.m_aColor; + SetAdjust( *rNew.m_aAdjust ); + m_aTextOrientation = rNew.m_aTextOrientation; + m_aVerticalAlignment = rNew.m_aVerticalAlignment; + m_aBox = rNew.m_aBox; + m_aTLBR = rNew.m_aTLBR; + m_aBLTR = rNew.m_aBLTR; + m_aBackground = rNew.m_aBackground; + + m_aHorJustify = rNew.m_aHorJustify; + m_aVerJustify = rNew.m_aVerJustify; + m_aStacked->SetValue( rNew.m_aStacked->GetValue() ); + m_aMargin = rNew.m_aMargin; + m_aLinebreak->SetValue( rNew.m_aLinebreak->GetValue() ); + m_aRotateAngle->SetValue( rNew.m_aRotateAngle->GetValue() ); + m_aRotateMode->SetValue( rNew.m_aRotateMode->GetValue() ); + + m_sNumFormatString = rNew.m_sNumFormatString; + m_eSysLanguage = rNew.m_eSysLanguage; + m_eNumFormatLanguage = rNew.m_eNumFormatLanguage; + + return *this; +} + bool SwBoxAutoFormat::operator==(const SwBoxAutoFormat& rRight) { return GetBackground().GetColor() == rRight.GetBackground().GetColor(); |