From 238de04de6c8b67f74c75514b86c08bf888feb48 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Thu, 27 Jul 2017 16:58:59 +0200 Subject: Ditch use of EditTextObject::Store() in ScGlobal::EETextObjEqual() This was the last incarnation of SfxItem binary stream serialization that is to be eliminated after clipboard use is gone. The "full" EditTextObject::operator==() in EditTextObjectImpl::operator==(), and via ContentInfo::operator==() in SfxItemSet::operator==(), also compare the SfxItemPool pointers which gets in the way here (not stored to stream hence didn't matter and maybe the reason for not having switched EETextObjEqual() to use operator==() back in the days). Introduce *::Equals() functions that do not compare pool pointers and let SfxItemSet::Equals() in that case not assume it would be operating on one pool only. Change-Id: Ifff939a92101c7f74695b676a45a7fdbb4f1d7f6 Reviewed-on: https://gerrit.libreoffice.org/40492 Reviewed-by: Eike Rathke Tested-by: Jenkins --- include/editeng/editobj.hxx | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include/editeng') diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx index 68aa86c7c20e..2807aa96a962 100644 --- a/include/editeng/editobj.hxx +++ b/include/editeng/editobj.hxx @@ -133,6 +133,13 @@ public: bool operator==( const EditTextObject& rCompare ) const; + /** Compare possibly ignoring SfxItemPool pointer. + @param bComparePool + if ignore SfxItemPool pointer, + if compare also SfxItemPool pointer (identical to operator==()) + */ + bool Equals( const EditTextObject& rCompare, bool bComparePool ) const; + // #i102062# bool isWrongListEqual(const EditTextObject& rCompare) const; -- cgit