[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - editeng/source

[Caolán McNamara]

 editeng/source/editeng/impedit4.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 21770181089cdd4c42c5ef810c49439e7daede30
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 13 16:56:14 2016 +0100

    tdf#100880 editeng spellchecking doesn't work sometimes...
    
    believe to be a regression from
    
    commit 73f0b3bd5553c5d023d0a1dbfdc00836e2937961
    Author: Matteo Casalin <matteo.casalin at yahoo.com>
    Date:   Sat Dec 28 13:37:26 2013 +0100
    
        xub_StrLen to sal_Int32 + some const
    
    and lets fix it the same way
    
    commit 9705fbc1119da91e73c00a2ec848565929eeb483
    Author: Norbert Thiebaud <nthiebaud at gmail.com>
    Date:   Sun Mar 2 12:19:16 2014 -0600
    
        Fix editeng missing spellchecking redline on load
    
    (probably) fixed some other regression caused by that
    
    Change-Id: I52775aff50dcc634fd2f08eb685cc4ad9850c82c
    (cherry picked from commit 71ab1ee978a6da8edeabc7c65e9a34e679ec8e43)
    Reviewed-on: https://gerrit.libreoffice.org/27197
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 07ad13a..ec4a36a 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2282,8 +2282,8 @@ void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, bool bSpellAtC
         if (!pNode->GetWrongList()->IsValid())
         {
             WrongList* pWrongList = pNode->GetWrongList();
-            const sal_Int32 nInvStart = pWrongList->GetInvalidStart();
-            const sal_Int32 nInvEnd = pWrongList->GetInvalidEnd();
+            const size_t nInvStart = pWrongList->GetInvalidStart();
+            const size_t nInvEnd = pWrongList->GetInvalidEnd();
 
             sal_Int32 nPaintFrom = -1;
             sal_Int32 nPaintTo = 0;
@@ -2295,7 +2295,7 @@ void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, bool bSpellAtC
             EditSelection aSel( aPaM, aPaM );
             while ( ( aSel.Max().GetNode() == pNode ) /* && !bStop */ )
             {
-                if ( ( aSel.Min().GetIndex() > nInvEnd )
+                if ( ( static_cast<size_t>(aSel.Min().GetIndex()) > nInvEnd )
                         || ( ( aSel.Max().GetNode() == pLastNode ) && ( aSel.Max().GetIndex() >= pLastNode->Len() ) ) )
                     break;  // Document end or end of invalid region