Kaydet (Commit) 7b3dbf6c authored tarafından slideon's avatar slideon Kaydeden (comit) Noel Grandin

tdf#96099 Remove trivial typedefs from vcl module

This typedef was not needed.

Change-Id: I442068a3e394a23551655294dc8f1765bc8f2887
Reviewed-on: https://gerrit.libreoffice.org/23618Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst bf7aabd5
...@@ -77,8 +77,7 @@ bool ReadGSUB( struct TrueTypeFont* pTTFile, ...@@ -77,8 +77,7 @@ bool ReadGSUB( struct TrueTypeFont* pTTFile,
aReqFeatureTagList.push_back( MKTAG("vert") ); aReqFeatureTagList.push_back( MKTAG("vert") );
typedef std::vector<sal_uInt16> UshortList; std::vector<sal_uInt16> aFeatureIndexList;
UshortList aFeatureIndexList;
// parse Script Table // parse Script Table
const FT_Byte* pScriptHeader = pGsubBase + nOfsScriptList; const FT_Byte* pScriptHeader = pGsubBase + nOfsScriptList;
...@@ -150,8 +149,8 @@ bool ReadGSUB( struct TrueTypeFont* pTTFile, ...@@ -150,8 +149,8 @@ bool ReadGSUB( struct TrueTypeFont* pTTFile,
if( aFeatureIndexList.empty() ) if( aFeatureIndexList.empty() )
return true; return true;
UshortList aLookupIndexList; std::vector<sal_uInt16> aLookupIndexList;
UshortList aLookupOffsetList; std::vector<sal_uInt16> aLookupOffsetList;
// parse Feature Table // parse Feature Table
const FT_Byte* pFeatureHeader = pGsubBase + nOfsFeatureTable; const FT_Byte* pFeatureHeader = pGsubBase + nOfsFeatureTable;
...@@ -205,7 +204,7 @@ bool ReadGSUB( struct TrueTypeFont* pTTFile, ...@@ -205,7 +204,7 @@ bool ReadGSUB( struct TrueTypeFont* pTTFile,
aLookupOffsetList.push_back( nOffset ); aLookupOffsetList.push_back( nOffset );
} }
UshortList::const_iterator it = aLookupOffsetList.begin(); std::vector<sal_uInt16>::const_iterator it = aLookupOffsetList.begin();
for(; it != aLookupOffsetList.end(); ++it ) for(; it != aLookupOffsetList.end(); ++it )
{ {
const sal_uInt16 nOfsLookupTable = *it; const sal_uInt16 nOfsLookupTable = *it;
......
...@@ -1329,8 +1329,7 @@ void ServerFont::ApplyGSUB( const FontSelectPattern& rFSD ) ...@@ -1329,8 +1329,7 @@ void ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
const sal_uInt16 nOfsFeatureTable = GetUShort( pGsubHeader+6 ); const sal_uInt16 nOfsFeatureTable = GetUShort( pGsubHeader+6 );
const sal_uInt16 nOfsLookupList = GetUShort( pGsubHeader+8 ); const sal_uInt16 nOfsLookupList = GetUShort( pGsubHeader+8 );
typedef std::vector<sal_uInt16> UshortList; std::vector<sal_uInt16> aFeatureIndexList;
UshortList aFeatureIndexList;
// parse Script Table // parse Script Table
const FT_Byte* pScriptHeader = pGsubBase + nOfsScriptList; const FT_Byte* pScriptHeader = pGsubBase + nOfsScriptList;
...@@ -1386,8 +1385,8 @@ void ServerFont::ApplyGSUB( const FontSelectPattern& rFSD ) ...@@ -1386,8 +1385,8 @@ void ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
if( aFeatureIndexList.empty() ) if( aFeatureIndexList.empty() )
return; return;
UshortList aLookupIndexList; std::vector<sal_uInt16> aLookupIndexList;
UshortList aLookupOffsetList; std::vector<sal_uInt16> aLookupOffsetList;
// parse Feature Table // parse Feature Table
const FT_Byte* pFeatureHeader = pGsubBase + nOfsFeatureTable; const FT_Byte* pFeatureHeader = pGsubBase + nOfsFeatureTable;
...@@ -1436,7 +1435,7 @@ void ServerFont::ApplyGSUB( const FontSelectPattern& rFSD ) ...@@ -1436,7 +1435,7 @@ void ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
aLookupOffsetList.push_back( nOffset ); aLookupOffsetList.push_back( nOffset );
} }
UshortList::const_iterator lookup_it = aLookupOffsetList.begin(); std::vector<sal_uInt16>::const_iterator lookup_it = aLookupOffsetList.begin();
for(; lookup_it != aLookupOffsetList.end(); ++lookup_it ) for(; lookup_it != aLookupOffsetList.end(); ++lookup_it )
{ {
const sal_uInt16 nOfsLookupTable = *lookup_it; const sal_uInt16 nOfsLookupTable = *lookup_it;
......
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