[Libreoffice-commits] core.git: vcl/win
Tor Lillqvist
tml at collabora.com
Mon Mar 14 17:59:22 UTC 2016
vcl/win/gdi/winlayout.cxx | 22 ----------------------
1 file changed, 22 deletions(-)
New commits:
commit 9082f204a91324523287dabe9e288c1fa0d43aa1
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 14 19:58:51 2016 +0200
Bin leftover #if 0 snippet
Change-Id: I848a5dca6d18c3df57f563bb137efaed2e000461
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index c8856dc..ffa0b3f 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -3752,27 +3752,6 @@ bool D2DWriteTextOutRenderer::operator ()(WinLayout const &rLayout, HDC hDC,
if (!BindFont(hDC))
return false;
-#if 0
- // Gather glyph positioning data.
- std::vector<uint16_t> indices;
- std::vector<float> advances;
- std::vector<Point> offsets;
- sal_GlyphId nLGlyph;
- DeviceCoordinate nAdv;
- while (rLayout.GetNextGlyphs(1, &nLGlyph, *pPos, *pGetNextGlypInfo, &nAdv) == 1)
- {
- indices.push_back(nLGlyph);
- advances.push_back(nAdv);
- offsets.push_back(Point(0,pPos->Y()));
- }
-
- // Find the bounds
- DrawGlyphs(rLayout.DrawBase(), indices.data(), indices.data()+indices.size(), advances.data(), offsets.data());
-
- ReleaseFont();
-
- return false;
-#else
Rectangle bounds;
bool succeeded = GetDWriteInkBox(*mpFontFace, rLayout, mlfEmHeight, bounds);
if (pRectToErase)
@@ -3834,7 +3813,6 @@ bool D2DWriteTextOutRenderer::operator ()(WinLayout const &rLayout, HDC hDC,
CreateRenderTarget();
return (succeeded && nGlyphs >= 1 && pRectToErase);
-#endif
}
bool D2DWriteTextOutRenderer::BindFont(HDC hDC)
More information about the Libreoffice-commits
mailing list