[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - editeng/source

[Caolán McNamara]

 editeng/source/editeng/editdoc.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 068588ef8ca348968697fb7dbb80c9e5382e0ebb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 21 17:05:09 2014 +0000

    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/13025
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index ef16fb5..63caef9 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1738,7 +1738,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();