[Libreoffice-commits] core.git: vcl/source

[Chris Sherlock]

 vcl/source/gdi/sallayout.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b0786565dbe15fed3b58d00138a5788d5c22e0c1
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Tue Jan 13 01:33:00 2015 +1100

    vcl: possible regression introduced in fa1f37753d2826a0 as part of i99295
    
    I believe the intent was to "retarget unresolved pLogCluster[n] to a glyph inside the cluster".
    Unfortunately in the loop that detects clusters there was a typo and we are only indexing
    element 0 of the array:
    
        // retarget unresolved pLogCluster[n] to a glyph inside the cluster
        // TODO: better do it while the deleted-glyph markers are still there
        for( n = 0; n < nCharCount; ++n )
            if( (p = pLogCluster[0]) >= 0 )
                break;
    
    That just doesn't make any sense, I believe we should be accessing pLogCluster[n].
    If not, then why not just do:
    
        p = pLogCluster[0];
        n = nCharCount - 1;
    
    Change-Id: I9d8873541b5c794071d69c0f63df88f17a352904
    Reviewed-on: https://gerrit.libreoffice.org/13876
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index ad34efd..4ca12b9 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1020,7 +1020,7 @@ void GenericSalLayout::ApplyDXArray( ImplLayoutArgs& rArgs )
     // retarget unresolved pLogCluster[n] to a glyph inside the cluster
     // TODO: better do it while the deleted-glyph markers are still there
     for( n = 0; n < nCharCount; ++n )
-        if( (p = pLogCluster[0]) >= 0 )
+        if( (p = pLogCluster[n]) >= 0 )
             break;
     if( n >= nCharCount )
         return;