vcl/inc/CommonSalLayout.hxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
New commits: commit 4814650c5021b72c81b4079f712a4c1baae0088b Author: Khaled Hosny <[email protected]> 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 _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
