[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/source

Michael Stahl mst at kemper.freedesktop.org
Thu Jul 5 14:27:28 PDT 2012


 vcl/source/glyphs/graphite_layout.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e30425b674034824bff78d40192776eee1bc23cd
Author: Martin Hosken <martin_hosken at sil.org>
Date:   Thu Jul 5 23:10:23 2012 +0200

    fdo#49486: fix graphite2 hyphenation regression
    
    Change-Id: I6d5901f28b66c8edc0c16e7ec04d574a5d59dedc
    (cherry picked from commit b25385a671ed43580a360570981ac1d52446a615)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index fd46d22..d9deb5a 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -711,8 +711,8 @@ int GraphiteLayout::GetTextBreak(long maxmnWidth, long char_extra, int factor) c
         if (mvChar2BaseGlyph[i] != -1)
         {
             if (
-                (mvCharBreaks[i] > -25 || (mvCharBreaks[i-1] > 0 && mvCharBreaks[i-1] < 25)) &&
-                (mvCharBreaks[i-1] < 25 || (mvCharBreaks[i] < 0 && mvCharBreaks[i] > -25))
+                (mvCharBreaks[i] > -35 || (mvCharBreaks[i-1] > 0 && mvCharBreaks[i-1] < 35)) &&
+                (mvCharBreaks[i-1] < 35 || (mvCharBreaks[i] < 0 && mvCharBreaks[i] > -35))
                )
             {
                 nLastBreak = static_cast<int>(i);


More information about the Libreoffice-commits mailing list