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

Caolán McNamara caolanm at redhat.com
Wed Jan 21 12:51:42 PST 2015


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

New commits:
commit 1d0433b809bdd32ba568d9683eeac72a7f0af709
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 14 16:29:24 2015 +0000

    classic draw rectangles "fit to contour" utterly broken
    
    regression from
    
    commit 3cbfcee36dd16e451d76c561eaaaee0ff29b01a5
    Date:   Sun Feb 2 22:16:48 2014 -0600
        xub_StrLen and tools/string.hxx final straw
    
        There is still some 0xffff limit left and possibly some
        less than gracefully handled overflow/error cases
    
    Change-Id: I82bdcb6951c42fdcaa68808a251f9b2f76f8ed0b
    (cherry picked from commit 9977cbba8a36d3e6365cf886630d213ec7c1240c)
    Reviewed-on: https://gerrit.libreoffice.org/13905
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index bcbe8dc..c68520d 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -844,7 +844,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
                 if ( pTextRanges->size() )
                 {
                     long nA = pTextRanges->at(0);
-                    long nB = pTextRanges->at(0);
+                    long nB = pTextRanges->at(1);
                     DBG_ASSERT( nA <= nB, "TextRange distorted?" );
                     long nW = nB - nA;
                     if ( nW > nMaxRangeWidth )


More information about the Libreoffice-commits mailing list