diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-21 17:05:09 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-11-23 08:13:56 +0000 |
| commit | a61b5cc0993b56fd1aa81e33d26e96a4c24415d7 (patch) | |
| tree | e3d3b1d892166856b458bcab14e5396de6528fc9 /editeng | |
| parent | 8479c32f7e31aa6e23ca776323fa8721f6faeed0 (diff) | |
Resolves: fdo#86392 the assert seems to just want the attrs to be sorted
i.e. two at the same position is ok
assert added in
commit 8220b70fe2dc270188751950ac6d872320db1aa2
Date: Sun Jul 27 00:21:50 2014 -0400
bnc#467459 - fix editeng text search with expanded fields.
Change-Id: Ifc65f3301a7d505a7d2d13e5914f53cbe263fc1f
(cherry picked from commit e37e8f38d1f5c6bc427965dc535f1a64f0c8649c)
Reviewed-on: https://gerrit.libreoffice.org/13024
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editdoc.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 8baa2147c304..e293425544f5 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -1724,7 +1724,7 @@ void ContentNode::UnExpandPosition( sal_Int32 &rPos, bool bBiasStart ) { const EditCharAttrib& rAttr = rAttrs[nAttr]; assert (!(nAttr < rAttrs.size() - 1) || - rAttrs[nAttr].GetStart() < rAttrs[nAttr + 1].GetStart()); + rAttrs[nAttr].GetStart() <= rAttrs[nAttr + 1].GetStart()); nOffset = rAttr.GetStart(); |