summaryrefslogtreecommitdiff
path: root/vcl/coretext
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-06-04 00:16:06 +0200
committerKhaled Hosny <khaledhosny@eglug.org>2013-06-04 00:24:46 +0200
commita3e97576aa0a7d7c5d51a8ca2f9d220e7d342d87 (patch)
tree6693db013e42d0e09635e9752cc37b6cf1c43ade /vcl/coretext
parent5e33f1c09b5dcfaa9cabdf1711c9a173514a1c7b (diff)
Drop "CJK extra leading" crack
It have been unused on Mac OS X since since 2008 (commit da4d070d9d2d563f6e1401496957b22b51c81ff9). Change-Id: I4b3eabe71a54021903009310a87319c9caecfd4c
Diffstat (limited to 'vcl/coretext')
-rw-r--r--vcl/coretext/salgdi2.cxx43
1 files changed, 0 insertions, 43 deletions
diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx
index 2f7da5bab0e0..774c1d702767 100644
--- a/vcl/coretext/salgdi2.cxx
+++ b/vcl/coretext/salgdi2.cxx
@@ -77,7 +77,6 @@ ImplMacFontData::ImplMacFontData( const ImplMacFontData& rSrc )
, mbOs2Read( rSrc.mbOs2Read )
, mbHasOs2Table( rSrc.mbHasOs2Table )
, mbCmapEncodingRead( rSrc.mbCmapEncodingRead )
-, mbHasCJKSupport( rSrc.mbHasCJKSupport )
{
if( mpCharMap )
mpCharMap->AddReference();
@@ -92,7 +91,6 @@ ImplMacFontData::ImplMacFontData( const ImplDevFontAttributes& rDFA, sal_IntPtr
, mbOs2Read( false )
, mbHasOs2Table( false )
, mbCmapEncodingRead( false )
-, mbHasCJKSupport( false )
, mbFontCapabilitiesRead( false )
{}
@@ -121,7 +119,6 @@ ImplFontEntry* ImplMacFontData::CreateFontInstance(FontSelectPattern& rFSD) cons
// -----------------------------------------------------------------------
static unsigned GetUShort( const unsigned char* p ){return((p[0]<<8)+p[1]);}
-static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);}
const ImplFontCharMap* ImplMacFontData::GetImplFontCharMap() const
{
@@ -233,16 +230,6 @@ void ImplMacFontData::ReadOs2Table( void ) const
// parse the OS/2 raw data
// TODO: also analyze panose info, etc.
-
- // check if the fonts needs the "CJK extra leading" heuristic
- const unsigned char* pOS2map = &aBuffer[0];
- const sal_uInt32 nVersion = GetUShort( pOS2map );
- if( nVersion >= 0x0001 )
- {
- sal_uInt32 ulUnicodeRange2 = GetUInt( pOS2map + 46 );
- if( ulUnicodeRange2 & 0x2DF00000 )
- mbHasCJKSupport = true;
- }
}
void ImplMacFontData::ReadMacCmapEncoding( void ) const
@@ -266,40 +253,10 @@ void ImplMacFontData::ReadMacCmapEncoding( void ) const
const unsigned char* pCmap = &aBuffer[0];
if( GetUShort( pCmap ) != 0x0000 )
return;
-
- // check if the fonts needs the "CJK extra leading" heuristic
- int nSubTables = GetUShort( pCmap + 2 );
-
- for( const unsigned char* p = pCmap + 4; --nSubTables >= 0; p += 8 )
- {
- int nPlatform = GetUShort( p );
- if( nPlatform == kFontMacintoshPlatform ) {
- int nEncoding = GetUShort (p + 2 );
- if( nEncoding == kFontJapaneseScript ||
- nEncoding == kFontTraditionalChineseScript ||
- nEncoding == kFontKoreanScript ||
- nEncoding == kFontSimpleChineseScript )
- {
- mbHasCJKSupport = true;
- break;
- }
- }
- }
}
// -----------------------------------------------------------------------
-bool ImplMacFontData::HasCJKSupport( void ) const
-{
- ReadOs2Table();
- if( !mbHasOs2Table )
- ReadMacCmapEncoding();
-
- return mbHasCJKSupport;
-}
-
-// =======================================================================
-
AquaSalGraphics::AquaSalGraphics()
: mpFrame( NULL )
, mxLayer( NULL )