diff options
| author | Varun Dhall <varun.dhall@studentpartner.com> | 2017-08-15 21:27:43 +0530 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-08-16 00:11:55 +0200 |
| commit | 5be19d80f47cca8260cb46ac6e54ac19e5ea2705 (patch) | |
| tree | 88e104cd9ee6d3d34f1542b7096b21df2bf54337 /svx | |
| parent | 8aae35170281c8b8799f64db749d89155315cf7d (diff) | |
Replace stringify by Equals in SdrObject and SdPage
Change-Id: Ia4cf7a5382a05061ff98f423cf5640a51015236d
Reviewed-on: https://gerrit.libreoffice.org/41182
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 42 |
1 files changed, 12 insertions, 30 deletions
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 2a1881eb974d..a21af0f7f328 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1690,36 +1690,18 @@ bool SdrObject::HasTextEdit() const return false; } -OString SdrObject::stringify() const -{ - OStringBuffer aString(100); - aString.append(aAnchor.X()). - append(aAnchor.Y()). - append(aGridOffset.X()). - append(aGridOffset.Y()). - append((sal_Int32)nOrdNum). - append((sal_Int32)mnNavigationPosition). - append(mbSupportTextIndentingOnLineWidthChange). - append(mbLineIsOutsideGeometry). - append(bMarkProt). - append(bIs3DObj). - append(bIsEdge). - append(bClosedObj). - append(bNotVisibleAsMaster). - append(bEmptyPresObj). - append(mbVisible). - append(bNoPrint). - append(bSizProt). - append(bMovProt). - append(false). - append(bInserted). - append(false). - append(bVirtObj). - append(sal_uInt8(mnLayerID)); - - aString.append(GetMergedItemSet().stringify()); - - return aString.makeStringAndClear(); +bool SdrObject::Equals(const SdrObject& rOtherObj) const +{ + return (aAnchor.X() == rOtherObj.aAnchor.X() && aAnchor.Y() == rOtherObj.aAnchor.Y() && + aGridOffset.X() == rOtherObj.aGridOffset.X() && aGridOffset.Y() == rOtherObj.aGridOffset.Y() && + nOrdNum == rOtherObj.nOrdNum && mnNavigationPosition == rOtherObj.mnNavigationPosition && + mbSupportTextIndentingOnLineWidthChange == rOtherObj.mbSupportTextIndentingOnLineWidthChange && + mbLineIsOutsideGeometry == rOtherObj.mbLineIsOutsideGeometry && bMarkProt == rOtherObj.bMarkProt && + bIs3DObj == rOtherObj.bIs3DObj && bIsEdge == rOtherObj.bIsEdge && bClosedObj == rOtherObj.bClosedObj && + bNotVisibleAsMaster == rOtherObj.bNotVisibleAsMaster && bEmptyPresObj == rOtherObj.bEmptyPresObj && + mbVisible == rOtherObj.mbVisible && bNoPrint == rOtherObj.bNoPrint && bSizProt == rOtherObj.bSizProt && + bMovProt == rOtherObj.bMovProt && bInserted == rOtherObj.bInserted && bVirtObj == rOtherObj.bVirtObj && + mnLayerID == rOtherObj.mnLayerID && GetMergedItemSet().Equals(rOtherObj.GetMergedItemSet(), false) ); } void SdrObject::dumpAsXml(xmlTextWriterPtr pWriter) const |