[Libreoffice-commits] core.git: Branch 'feature/fixes7' - vcl/win

[Tor Lillqvist]

 vcl/win/source/gdi/winlayout.cxx |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 32b8b33273764c64515f7fdf97e369fed6406876
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Aug 17 18:23:11 2015 +0300

    Add FIXME comment and bin an #if 0 snippet
    
    Change-Id: I0bbea4ef62c8e94d8b8f1bfb440712da5839e532

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 6f8b4ca..e32b8b5 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1579,6 +1579,8 @@ bool UniscribeLayout::DrawCachedGlyphs(SalGraphics& rGraphics) const
 
     pImpl->PreDraw();
 
+    // FIXME: This code snippet is mostly copied from the one in
+    // UniscribeLayout::DrawTextImpl. Should be factored out.
     int nBaseClusterOffset = 0;
     int nBaseGlyphPos = -1;
     for( int nItem = 0; nItem < mnItemCount; ++nItem )
@@ -1626,16 +1628,6 @@ bool UniscribeLayout::DrawCachedGlyphs(SalGraphics& rGraphics) const
             pImpl->DrawMask(*rChunk.mpTexture, salColor, a2Rects);
             nAdvance += mpGlyphAdvances[i];
         }
-#if 0
-        ScriptTextOut(hDC, &rScriptCache,
-            aPos.X(), aPos.Y(), 0, NULL,
-            &rVisualItem.mpScriptItem->a, NULL, 0,
-            mpOutGlyphs + nMinGlyphPos,
-            nEndGlyphPos - nMinGlyphPos,
-            mpGlyphAdvances + nMinGlyphPos,
-            mpJustifications ? mpJustifications + nMinGlyphPos : NULL,
-            mpGlyphOffsets + nMinGlyphPos);
-#endif
     }
     pImpl->PostDraw();