diff options
| author | Adrien Ollier <adr.ollier@hotmail.fr> | 2019-07-28 19:06:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-08-28 08:35:53 +0200 |
| commit | a3b2c6b8b3ac67dca29605aa1ae856f663683c4b (patch) | |
| tree | b53b544643d08843f0233c5ac7af95e7c22bd4ab | |
| parent | e0d29fb937b0f423f151e0a504bfe326f4d8279e (diff) | |
ContentInfo::Equals uses std::equal
Change-Id: Ia99cd1cb9594d6398ff351f6ded7888a75c83dd6
Signed-off-by: Adrien Ollier <adr.ollier@hotmail.fr>
Reviewed-on: https://gerrit.libreoffice.org/76504
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | editeng/source/editeng/editobj.cxx | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index ad096dfa7f82..a0112468af5b 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -217,24 +217,16 @@ void ContentInfo::Dump() const } #endif -bool ContentInfo::Equals( const ContentInfo& rCompare, bool bComparePool ) const -{ - if( (maText == rCompare.maText) && - (aStyle == rCompare.aStyle ) && - (maCharAttribs.size() == rCompare.maCharAttribs.size()) && - (eFamily == rCompare.eFamily ) && - aParaAttribs.Equals( rCompare.aParaAttribs, bComparePool ) ) - { - for (size_t i = 0, n = maCharAttribs.size(); i < n; ++i) - { - if (!(*(maCharAttribs[i]) == *(rCompare.maCharAttribs[i]))) - return false; - } - - return true; - } - - return false; +bool ContentInfo::Equals(const ContentInfo& rCompare, bool bComparePool) const +{ + return maText == rCompare.maText && aStyle == rCompare.aStyle && eFamily == rCompare.eFamily + && aParaAttribs.Equals(rCompare.aParaAttribs, bComparePool) + && std::equal(maCharAttribs.cbegin(), maCharAttribs.cend(), + rCompare.maCharAttribs.cbegin(), rCompare.maCharAttribs.cend(), + [](const std::unique_ptr<XEditAttribute>& pAttribute1, + const std::unique_ptr<XEditAttribute>& pAttribute2) -> bool { + return *pAttribute1 == *pAttribute2; + }); } EditTextObject::EditTextObject( SfxItemPool* pPool ) : |