summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2016-11-01 23:34:29 +0200
committerKhaled Hosny <khaledhosny@eglug.org>2016-11-01 23:37:39 +0200
commit8d192b66e36576af4033d34ea895602a0c7a41ae (patch)
tree1bdcf13b7aa8be67270e1be6f6dd70a562b5ac6a
parent1476c299b6f02cd49efbd2abb19a6dfdcdc271d3 (diff)
Misplaced #if ENABLE_GRAPHITE
Change-Id: I2af3fdf100f6aaf435d8ed33d781ea0ca4ec21ec
-rw-r--r--vcl/win/gdi/winlayout.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 3aed82d2e6ac..3f051d706053 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -3326,14 +3326,6 @@ bool UniscribeLayout::IsKashidaPosValid ( int nCharPos ) const
return true;
}
-#if ENABLE_GRAPHITE
-
-sal_GlyphId GraphiteLayoutWinImpl::getKashidaGlyph(int & rWidth)
-{
- rWidth = mrFont.GetMinKashidaWidth();
- return mrFont.GetMinKashidaGlyph();
-}
-
HINSTANCE D2DWriteTextOutRenderer::mmD2d1 = nullptr,
D2DWriteTextOutRenderer::mmDWrite = nullptr;
D2DWriteTextOutRenderer::pD2D1CreateFactory_t D2DWriteTextOutRenderer::D2D1CreateFactory = nullptr;
@@ -3708,6 +3700,14 @@ bool D2DWriteTextOutRenderer::GetDWriteInkBox(SalLayout const &rLayout, Rectangl
return true;
}
+#if ENABLE_GRAPHITE
+
+sal_GlyphId GraphiteLayoutWinImpl::getKashidaGlyph(int & rWidth)
+{
+ rWidth = mrFont.GetMinKashidaWidth();
+ return mrFont.GetMinKashidaGlyph();
+}
+
float gr_fontAdvance(const void* appFontHandle, gr_uint16 glyphId)
{
HDC hDC = static_cast<HDC>(const_cast<void*>(appFontHandle));