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

[Khaled Hosny]

 vcl/win/gdi/winlayout.cxx |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 8d192b66e36576af4033d34ea895602a0c7a41ae
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Tue Nov 1 23:34:29 2016 +0200

    Misplaced #if ENABLE_GRAPHITE
    
    Change-Id: I2af3fdf100f6aaf435d8ed33d781ea0ca4ec21ec

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 3aed82d..3f051d7 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));