diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-06-03 23:01:56 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2013-06-04 00:01:15 +0200 |
| commit | eddf277c992b80282e0b49325b3138de5a3a2509 (patch) | |
| tree | 83a5211aef3aa127585062872304e334d57c173a /vcl/coretext/salgdi2.cxx | |
| parent | b0dc4032e746575cc3a66155782a57774890e94d (diff) | |
Drop ENABLE_CORETEXT
This file is Core Text only already.
Change-Id: Ic4c1f44296eaae582091e515d3ca1b4aa227301e
Diffstat (limited to 'vcl/coretext/salgdi2.cxx')
| -rw-r--r-- | vcl/coretext/salgdi2.cxx | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx index ba076a7cc74b..2f7da5bab0e0 100644 --- a/vcl/coretext/salgdi2.cxx +++ b/vcl/coretext/salgdi2.cxx @@ -38,11 +38,7 @@ #include "coretext/salgdi2.h" #include "aqua/salframe.h" -#ifdef ENABLE_CORETEXT #include "ctfonts.hxx" -#else -#include "atsfonts.hxx" -#endif #include "fontsubset.hxx" #include "impfont.hxx" @@ -426,15 +422,9 @@ void AquaSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) // through it as should be all event handlers SalData* pSalData = GetSalData(); -#ifdef ENABLE_CORETEXT SystemFontList* GetCoretextFontList(void); // forward declaration if( !pSalData->mpFontList ) pSalData->mpFontList = GetCoretextFontList(); -#else - SystemFontList* GetAtsFontList(void); // forward declaration - if( !pSalData->mpFontList ) - pSalData->mpFontList = GetAtsFontList(); -#endif // Copy all PhysicalFontFace objects contained in the SystemFontList pSalData->mpFontList->AnnounceFonts( *pFontList ); @@ -854,33 +844,6 @@ SystemFontData AquaSalGraphics::GetSysFontData( int /* nFallbacklevel */ ) const SystemFontData aSysFontData; aSysFontData.nSize = sizeof( SystemFontData ); -#ifndef ENABLE_CORETEXT - // NOTE: Native ATSU font fallbacks are used, not the VCL fallbacks. - ATSUFontID fontId; - OSStatus err; - err = ATSUGetAttribute( maATSUStyle, kATSUFontTag, sizeof(fontId), &fontId, 0 ); - if (err) fontId = 0; - aSysFontData.aATSUFontID = (void *) fontId; - - Boolean bFbold; - err = ATSUGetAttribute( maATSUStyle, kATSUQDBoldfaceTag, sizeof(bFbold), &bFbold, 0 ); - if (err) bFbold = FALSE; - aSysFontData.bFakeBold = (bool) bFbold; - - Boolean bFItalic; - err = ATSUGetAttribute( maATSUStyle, kATSUQDItalicTag, sizeof(bFItalic), &bFItalic, 0 ); - if (err) bFItalic = FALSE; - aSysFontData.bFakeItalic = (bool) bFItalic; - - ATSUVerticalCharacterType aVerticalCharacterType; - err = ATSUGetAttribute( maATSUStyle, kATSUVerticalCharacterTag, sizeof(aVerticalCharacterType), &aVerticalCharacterType, 0 ); - if (!err && aVerticalCharacterType == kATSUStronglyVertical) { - aSysFontData.bVerticalCharacterType = true; - } else { - aSysFontData.bVerticalCharacterType = false; - } -#endif - aSysFontData.bAntialias = !mbNonAntialiasedText; return aSysFontData; |