Kaydet (Commit) b8912120 authored tarafından Noel Grandin's avatar Noel Grandin

cid#735557 Logically dead code

Change-Id: I0f6851a4ce5c02ea48110bdb8ed47cdb15853917
üst 2d2bb23a
...@@ -1605,8 +1605,6 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD ) ...@@ -1605,8 +1605,6 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
ReqFeatureTagList aReqFeatureTagList; ReqFeatureTagList aReqFeatureTagList;
if( rFSD.mbVertical ) if( rFSD.mbVertical )
aReqFeatureTagList.push_back( MKTAG("vert") ); aReqFeatureTagList.push_back( MKTAG("vert") );
sal_uLong nRequestedScript = 0; //MKTAG("hani");//### TODO: where to get script?
sal_uLong nRequestedLangsys = 0; //MKTAG("ZHT"); //### TODO: where to get langsys?
// TODO: request more features depending on script and language system // TODO: request more features depending on script and language system
if( aReqFeatureTagList.empty()) // nothing to do if( aReqFeatureTagList.empty()) // nothing to do
...@@ -1634,11 +1632,8 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD ) ...@@ -1634,11 +1632,8 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
pScriptHeader += 2; pScriptHeader += 2;
for( sal_uInt16 nScriptIndex = 0; nScriptIndex < nCntScript; ++nScriptIndex ) for( sal_uInt16 nScriptIndex = 0; nScriptIndex < nCntScript; ++nScriptIndex )
{ {
const sal_uLong nScriptTag = GetUInt( pScriptHeader+0 ); // e.g. hani/arab/kana/hang
const sal_uInt16 nOfsScriptTable= GetUShort( pScriptHeader+4 ); const sal_uInt16 nOfsScriptTable= GetUShort( pScriptHeader+4 );
pScriptHeader += 6; pScriptHeader += 6;
if( (nScriptTag != nRequestedScript) && (nRequestedScript != 0) )
continue;
const FT_Byte* pScriptTable = pGsubBase + nOfsScriptList + nOfsScriptTable; const FT_Byte* pScriptTable = pGsubBase + nOfsScriptList + nOfsScriptTable;
const sal_uInt16 nDefaultLangsysOfs = GetUShort( pScriptTable+0 ); const sal_uInt16 nDefaultLangsysOfs = GetUShort( pScriptTable+0 );
...@@ -1648,11 +1643,8 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD ) ...@@ -1648,11 +1643,8 @@ bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
for( sal_uInt16 nLangsysIndex = 0; nLangsysIndex < nCntLangSystem; ++nLangsysIndex ) for( sal_uInt16 nLangsysIndex = 0; nLangsysIndex < nCntLangSystem; ++nLangsysIndex )
{ {
const sal_uLong nTag = GetUInt( pScriptTable+0 ); // e.g. KOR/ZHS/ZHT/JAN
const sal_uInt16 nOffset= GetUShort( pScriptTable+4 ); const sal_uInt16 nOffset= GetUShort( pScriptTable+4 );
pScriptTable += 6; pScriptTable += 6;
if( (nTag != nRequestedLangsys) && (nRequestedLangsys != 0) )
continue;
nLangsysOffset = nOffset; nLangsysOffset = nOffset;
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment