summaryrefslogtreecommitdiff
path: root/include/editeng
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-07-27 16:58:59 +0200
committerEike Rathke <erack@redhat.com>2017-07-27 17:48:59 +0200
commit238de04de6c8b67f74c75514b86c08bf888feb48 (patch)
tree520fba3d64eca15c97ec04fd1d3a510348bd629d /include/editeng
parent221dae68df80298e81e6e6549636f3528f5c8bc3 (diff)
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 <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'include/editeng')
-rw-r--r--include/editeng/editobj.hxx7
1 files changed, 7 insertions, 0 deletions
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 <FALSE/> ignore SfxItemPool pointer,
+ if <TRUE/> compare also SfxItemPool pointer (identical to operator==())
+ */
+ bool Equals( const EditTextObject& rCompare, bool bComparePool ) const;
+
// #i102062#
bool isWrongListEqual(const EditTextObject& rCompare) const;