diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-07 03:04:31 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-07 03:04:31 +0300 |
| commit | 07c9bb103823dd9c0dc297d0315907ab94488f93 (patch) | |
| tree | 53b894b927c37c8a6e8779225861861656b033ac /vcl/coretext | |
| parent | d0d2c12a54e590496af9d0df278c863365293ae0 (diff) | |
Drop workarounds for Mac OS X SDKs 10.4 and 10.5
Change-Id: Ifa07f9b5613b4a75c5b72178cb276b9c0b495a62
Diffstat (limited to 'vcl/coretext')
| -rw-r--r-- | vcl/coretext/salcoretextfontutils.cxx | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/vcl/coretext/salcoretextfontutils.cxx b/vcl/coretext/salcoretextfontutils.cxx index 15db6fb4812c..3bcfa2285585 100644 --- a/vcl/coretext/salcoretextfontutils.cxx +++ b/vcl/coretext/salcoretextfontutils.cxx @@ -45,17 +45,6 @@ static bool GetDevFontAttributes( CTFontDescriptorRef font_descriptor, ImplDevFo rDFA.mbDevice = true; rDFA.mnQuality = 0; -#if defined(MACOSX) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060 - CTFontRef font = CTFontCreateWithFontDescriptor(font_descriptor, 0.0, NULL); - CFDataRef rHeadTable = CTFontCopyTable(font, kCTFontTableHead, kCTFontTableOptionNoOptions); - CFRelease(font); - if(!rHeadTable || CFDataGetLength(rHeadTable) == 0) - { - SafeCFRelease(rHeadTable); - return false; - } - CFRelease(rHeadTable); -#else CFNumberRef format = (CFNumberRef)CTFontDescriptorCopyAttribute(font_descriptor, kCTFontFormatAttribute); CFNumberGetValue(format, kCFNumberIntType, &value); CFRelease(format); @@ -65,7 +54,7 @@ static bool GetDevFontAttributes( CTFontDescriptorRef font_descriptor, ImplDevFo /* we don't want bitmap fonts */ return false; } -#endif + rDFA.mbSubsettable = true; rDFA.mbEmbeddable = false; |