[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/coretext
Tor Lillqvist
tml at iki.fi
Thu Jun 20 04:10:41 PDT 2013
vcl/coretext/ctfonts.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bfc66b44ed449ae2de6a4bcfed57651cc754f98e
Author: Tor Lillqvist <tml at iki.fi>
Date: Sun Jun 16 11:44:59 2013 +0300
kCTFontTableOptionExcludeSynthetic is deprecated in 10.8
Change-Id: Ic5fc06e38db6f2111d516c53b6d1be2e47a7ced7
(cherry picked from commit fa76a7159ad022df555f9c89dfce30a9c1681c26)
Reviewed-on: https://gerrit.libreoffice.org/4382
Reviewed-by: Noel Power <noel.power at suse.com>
Tested-by: Noel Power <noel.power at suse.com>
diff --git a/vcl/coretext/ctfonts.cxx b/vcl/coretext/ctfonts.cxx
index 8d693d1..630325a 100644
--- a/vcl/coretext/ctfonts.cxx
+++ b/vcl/coretext/ctfonts.cxx
@@ -285,7 +285,7 @@ int CTFontData::GetFontTable( const char pTagName[5], unsigned char* pResultBuf
// get the raw table length
CTFontDescriptorRef pFontDesc = reinterpret_cast<CTFontDescriptorRef>( GetFontId());
CTFontRef rCTFont = CTFontCreateWithFontDescriptor( pFontDesc, 0.0, NULL);
-#ifdef MACOSX
+#if defined(MACOSX) && MACOSX_SDK_VERSION < 1080
const uint32_t opts( kCTFontTableOptionExcludeSynthetic );
#else
const uint32_t opts( kCTFontTableOptionNoOptions );
More information about the Libreoffice-commits
mailing list