[Libreoffice-commits] .: vcl/source

[Caolán McNamara]

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

New commits:
commit 19b51185c4458c777b1a8f5c78096da7e9e1a5a4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 11 10:15:49 2011 +0000

    WaE: ambiguous && ||

diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index c4053c2..d27769b 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -700,7 +700,10 @@ int GraphiteLayout::GetTextBreak(long maxmnWidth, long char_extra, int factor) c
         if (nWidth > maxmnWidth) break;
         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))
+            if (
+                (mvCharBreaks[i] > -25 || (mvCharBreaks[i-1] > 0 && mvCharBreaks[i-1] < 25)) &&
+                (mvCharBreaks[i-1] < 25 || (mvCharBreaks[i] < 0 && mvCharBreaks[i] > -25))
+               )
             {
                 nLastBreak = static_cast<int>(i);
                 wLastBreak = nWidth;