[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/source

[Caolán McNamara]

 sw/source/core/txtnode/fntcache.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 7a7116f2f570eb2d3bdc681a357046391efe9857
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 2 11:33:24 2018 +0000

    forcepoint #17 nTextBreak is an index into pKernArray of len rInf.GetLen()
    
    Change-Id: I3afeaf987cc5e75362560165fea7230904530933
    Reviewed-on: https://gerrit.libreoffice.org/50629
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index fbb4ee5f4951..a7484a5ac4a7 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -2347,9 +2347,8 @@ sal_Int32 SwFont::GetTextBreak( SwDrawTextInfo const & rInf, long nTextWidth )
             rInf.GetOut().GetTextArray( rInf.GetText(), pKernArray.get(),
                                             rInf.GetIdx(), rInf.GetLen() );
             long nCurrPos = pKernArray[nTextBreak] + nGridWidthAdd;
-            while( nTextBreak < rInf.GetLen() && nTextWidth >= nCurrPos)
+            while (++nTextBreak < rInf.GetLen() && nTextWidth >= nCurrPos)
             {
-                nTextBreak++;
                 nCurrPos = pKernArray[nTextBreak] + nGridWidthAdd * ( nTextBreak + 1 );
             }
             return nTextBreak + rInf.GetIdx();