From 83e835156bc32bb904552465354b5b477a66d503 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 4 Dec 2013 12:06:07 +0200 Subject: Bin ATSUI code TDF has been shipping a CoreText-using LO since 4.1 and the sky hasn't fallen. Getting rid of the ATSUI code will make other needed refactoring easier. Change-Id: I494096c3988ea26fa2b336621857d32b64b040f0 --- include/sal/log-areas.dox | 1 - include/vcl/sysdata.hxx | 8 -------- 2 files changed, 9 deletions(-) (limited to 'include') diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 9845f569e691..3463a05fde14 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -332,7 +332,6 @@ certain functionality. @li @c vcl @li @c vcl.a11y @li @c vcl.app -@li @c vcl.atsui - ATSUI (obsolete) -using code for Mac OS X @li @c vcl.control @li @c vcl.coretext - CoreText-using code for Mac OS X and iOS @li @c vcl.emf - EMF/EMF+ processing diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx index 78d756bfc994..58f3830f8d34 100644 --- a/include/vcl/sysdata.hxx +++ b/include/vcl/sysdata.hxx @@ -27,9 +27,7 @@ // predeclare the native classes to avoid header/include problems typedef struct CGContext *CGContextRef; typedef struct CGLayer *CGLayerRef; -#ifdef ENABLE_CORETEXT typedef const struct __CTFont * CTFontRef; -#endif #ifdef __OBJC__ @class NSView; #else @@ -214,9 +212,6 @@ struct SystemFontData #if defined( WNT ) HFONT hFont; // native font object #elif defined( MACOSX ) -#ifndef ENABLE_CORETEXT - void* aATSUFontID; // native font object -#endif #elif defined( UNX ) void* nFontId; // native font id int nFontFlags; // native font flags @@ -231,9 +226,6 @@ struct SystemFontData #if defined( WNT ) , hFont( 0 ) #elif defined( MACOSX ) -#ifndef ENABLE_CORETEXT - , aATSUFontID( NULL ) -#endif #elif defined( UNX ) , nFontId( NULL ) , nFontFlags( 0 ) -- cgit