[Libreoffice-commits] core.git: svtools/source
Jochen Nitschke
j.nitschke+logerrit at ok.de
Tue Jun 27 11:32:26 UTC 2017
svtools/source/control/ruler.cxx | 65 ---------------------------------------
1 file changed, 65 deletions(-)
New commits:
commit a679ae4c8782720379f70e9beed8f8d7eaebe58f
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Mon Jun 26 15:07:34 2017 +0200
svtools: use implicit defined copy assignment
Change-Id: Iea061bbcf0bf6e894f1bb6028de75eb0f8e2c8f0
Reviewed-on: https://gerrit.libreoffice.org/39294
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index a6687938cf6c..b50b96db4388 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -88,8 +88,6 @@ private:
public:
ImplRulerData();
-
- ImplRulerData& operator=( const ImplRulerData& rData );
};
ImplRulerData::ImplRulerData() :
@@ -110,69 +108,6 @@ ImplRulerData::ImplRulerData() :
{
}
-ImplRulerData& ImplRulerData::operator=( const ImplRulerData& rData )
-{
- if( this == &rData )
- return *this;
-
- nNullVirOff = rData.nNullVirOff;
- nRulVirOff = rData.nRulVirOff;
- nRulWidth = rData.nRulWidth;
- nPageOff = rData.nPageOff;
- nPageWidth = rData.nPageWidth;
- nNullOff = rData.nNullOff;
- nMargin1 = rData.nMargin1;
- nMargin2 = rData.nMargin2;
- nLeftFrameMargin = rData.nLeftFrameMargin;
- nRightFrameMargin = rData.nRightFrameMargin;
- nMargin1Style = rData.nMargin1Style;
- nMargin2Style = rData.nMargin2Style;
- bAutoPageWidth = rData.bAutoPageWidth;
- bTextRTL = rData.bTextRTL;
-
- if ( !rData.pLines.empty() )
- {
- pLines.resize(rData.pLines.size());
- std::copy(rData.pLines.begin(), rData.pLines.end(), pLines.begin());
- }
- else
- {
- pLines.clear();
- }
-
- if ( !rData.pBorders.empty() )
- {
- pBorders.resize(rData.pBorders.size());
- std::copy(rData.pBorders.begin(), rData.pBorders.end(), pBorders.begin());
- }
- else
- {
- pBorders.clear();
- }
-
- if ( !rData.pIndents.empty() )
- {
- pIndents.resize(rData.pIndents.size());
- std::copy(rData.pIndents.begin(), rData.pIndents.end(), pIndents.begin());
- }
- else
- {
- pIndents.clear();
- }
-
- if ( !rData.pTabs.empty() )
- {
- pTabs.resize(rData.pTabs.size());
- std::copy(rData.pTabs.begin(), rData.pTabs.end(), pTabs.begin());
- }
- else
- {
- pTabs.clear();
- }
-
- return *this;
-}
-
static const RulerUnitData aImplRulerUnitTab[RULER_UNIT_COUNT] =
{
{ MapUnit::Map100thMM, 100, 25.0, 25.0, 50.0, 100.0, " mm" }, // MM
More information about the Libreoffice-commits
mailing list