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

Tor Lillqvist tml at collabora.com
Wed May 25 12:00:34 UTC 2016


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

New commits:
commit 5f459af600597d3508676252b23ff8b5e00427dd
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed May 25 14:58:27 2016 +0300

    tdf#98792: This assertion is not needed
    
    In some cases this assert() even prevents stuff from working
    nicely. (In a build where assertions are active, obviously, so this
    commit has no effect on "production" builds.) See bug report for some
    (fairly clueless) comments by me.
    
    Change-Id: Id1847f6e0a7dc30e63e6dd7d5800515c4229b9d1

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index d00a49e..7133a7c 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -2373,7 +2373,6 @@ int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos,
         if( mpGlyphs2Chars )  // unless explicitly requested+provided
         {
             nCharPos = mpGlyphs2Chars[ nStart ];
-            assert(-1 != nCharPos);
         }
 
         // inject kashida glyphs if needed


More information about the Libreoffice-commits mailing list