diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-09-13 20:20:45 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-09-13 20:21:07 +0200 |
| commit | 4fa8282816cb39692678e9da6b6693e821a3039b (patch) | |
| tree | 7da85a2aa31b851d782acca5bc1f683c23280e37 /vcl/quartz | |
| parent | 100805844ab3371553803b0b05d3a41a42da7a3a (diff) | |
mac: clean-up obsolete conditional code based on old SDK
Change-Id: Ie2d476780a48b5815961598e214343d5def962c1
Diffstat (limited to 'vcl/quartz')
| -rw-r--r-- | vcl/quartz/CTRunData.hxx | 12 | ||||
| -rw-r--r-- | vcl/quartz/ctfonts.cxx | 4 |
2 files changed, 0 insertions, 16 deletions
diff --git a/vcl/quartz/CTRunData.hxx b/vcl/quartz/CTRunData.hxx index b6d1a1d86188..40c2a0a5ddd3 100644 --- a/vcl/quartz/CTRunData.hxx +++ b/vcl/quartz/CTRunData.hxx @@ -10,20 +10,8 @@ #define CTRunData_Included #include "premac.h" -#if defined(MACOSX) && MACOSX_SDK_VERSION < 1080 -#include <ApplicationServices/ApplicationServices.h> -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 -// The following symbols are SPI (System Programming Interface) in 10.5 -extern "C" { - void CTRunGetAdvances(CTRunRef run, CFRange range, CGSize buffer[]); - const CGSize* CTRunGetAdvancesPtr(CTRunRef run); - extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel; -} -#endif -#else #include <CoreGraphics/CoreGraphics.h> #include <CoreText/CoreText.h> -#endif #include "postmac.h" class CTRunData diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 38cf249cfaf2..8a06d3b7dd10 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -249,11 +249,7 @@ int CoreTextFontData::GetFontTable( const char pTagName[5], unsigned char* pResu // get the raw table length CTFontDescriptorRef pFontDesc = reinterpret_cast<CTFontDescriptorRef>( GetFontId()); CTFontRef rCTFont = CTFontCreateWithFontDescriptor( pFontDesc, 0.0, NULL); -#if defined(MACOSX) && MACOSX_SDK_VERSION < 1080 - const uint32_t opts( kCTFontTableOptionExcludeSynthetic ); -#else const uint32_t opts( kCTFontTableOptionNoOptions ); -#endif CFDataRef pDataRef = CTFontCopyTable( rCTFont, nTagCode, opts); CFRelease( rCTFont); if( !pDataRef) |