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

Stephan Bergmann sbergman at redhat.com
Thu Nov 17 16:05:48 UTC 2016


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

New commits:
commit 721cbf443744661c3c83a45186eb0b72d6e20e41
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 17 17:05:18 2016 +0100

    Silence -Werror,-Wlogical-op-parentheses
    
    Change-Id: I4d592ef4bd683ffe8d9d44b3d3b188f9d4ed63ba

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index e5b891d..4941ac7 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -413,7 +413,7 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs )
 
         int nGlyphWidth = 0;
         // Unicode variance selectors selects glyph of previous base character, do not have width itself.
-        if ( nCharCode >= 0xFE00 && nCharCode <= 0xFE0F || nCharCode >= 0xE0100 && nCharCode <= 0xE01EF )
+        if ( (nCharCode >= 0xFE00 && nCharCode <= 0xFE0F) || (nCharCode >= 0xE0100 && nCharCode <= 0xE01EF) )
         {
             mpOutGlyphs[ i ] = DROPPED_OUTGLYPH;
             mpGlyphAdvances[ i ] = 0;


More information about the Libreoffice-commits mailing list