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

Khaled Hosny khaledhosny at eglug.org
Sun Oct 30 17:04:21 UTC 2016


 vcl/inc/CommonSalLayout.hxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 4814650c5021b72c81b4079f712a4c1baae0088b
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sun Oct 30 18:59:32 2016 +0200

    Minor
    
    Change-Id: I2bce822dd9f4c6b59a93e158ceced541ae52a01b

diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx
index 20130ee..298c4c5 100644
--- a/vcl/inc/CommonSalLayout.hxx
+++ b/vcl/inc/CommonSalLayout.hxx
@@ -42,10 +42,9 @@ class CommonSalLayout : public GenericSalLayout
     hb_font_t*              mpHbFont;
     const FontSelectPattern& mrFontSelData;
     css::uno::Reference<css::i18n::XBreakIterator> mxBreak;
-#ifdef _WIN32
-#elif defined(MACOSX) || defined(IOS)
+#if defined(MACOSX) || defined(IOS)
     const CoreTextStyle&    mrCoreTextStyle;
-#else
+#elif !defined(_WIN32)
     FreetypeFont&           mrFreetypeFont;
 #endif
 


More information about the Libreoffice-commits mailing list