[Libreoffice-commits] core.git: vcl/source vcl/unx

[slideon]

 vcl/source/fontsubset/gsub.cxx                 |    9 ++++-----
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |    9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 7b3dbf6cd1bad9a1cc94221952ac6cc54280b7d2
Author: slideon <adamkasztenny at gmail.com>
Date:   Tue Mar 29 18:32:18 2016 -0400

    tdf#96099 Remove trivial typedefs from vcl module
    
    This typedef was not needed.
    
    Change-Id: I442068a3e394a23551655294dc8f1765bc8f2887
    Reviewed-on: https://gerrit.libreoffice.org/23618
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/vcl/source/fontsubset/gsub.cxx b/vcl/source/fontsubset/gsub.cxx
index d9971fe..6ef40f2 100644
--- a/vcl/source/fontsubset/gsub.cxx
+++ b/vcl/source/fontsubset/gsub.cxx
@@ -77,8 +77,7 @@ bool ReadGSUB( struct TrueTypeFont* pTTFile,
 
     aReqFeatureTagList.push_back( MKTAG("vert") );
 
-    typedef std::vector<sal_uInt16> UshortList;
-    UshortList aFeatureIndexList;
+    std::vector<sal_uInt16> aFeatureIndexList;
 
     // parse Script Table
     const FT_Byte* pScriptHeader = pGsubBase + nOfsScriptList;
@@ -150,8 +149,8 @@ bool ReadGSUB( struct TrueTypeFont* pTTFile,
     if( aFeatureIndexList.empty() )
         return true;
 
-    UshortList aLookupIndexList;
-    UshortList aLookupOffsetList;
+    std::vector<sal_uInt16> aLookupIndexList;
+    std::vector<sal_uInt16> aLookupOffsetList;
 
     // parse Feature Table
     const FT_Byte* pFeatureHeader = pGsubBase + nOfsFeatureTable;
@@ -205,7 +204,7 @@ bool ReadGSUB( struct TrueTypeFont* pTTFile,
             aLookupOffsetList.push_back( nOffset );
     }
 
-    UshortList::const_iterator it = aLookupOffsetList.begin();
+    std::vector<sal_uInt16>::const_iterator it = aLookupOffsetList.begin();
     for(; it != aLookupOffsetList.end(); ++it )
     {
         const sal_uInt16 nOfsLookupTable = *it;
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index e25a2e0..0a10247 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -1329,8 +1329,7 @@ void ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
     const sal_uInt16 nOfsFeatureTable   = GetUShort( pGsubHeader+6 );
     const sal_uInt16 nOfsLookupList     = GetUShort( pGsubHeader+8 );
 
-    typedef std::vector<sal_uInt16> UshortList;
-    UshortList aFeatureIndexList;
+    std::vector<sal_uInt16> aFeatureIndexList;
 
     // parse Script Table
     const FT_Byte* pScriptHeader = pGsubBase + nOfsScriptList;
@@ -1386,8 +1385,8 @@ void ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
     if( aFeatureIndexList.empty() )
         return;
 
-    UshortList aLookupIndexList;
-    UshortList aLookupOffsetList;
+    std::vector<sal_uInt16> aLookupIndexList;
+    std::vector<sal_uInt16> aLookupOffsetList;
 
     // parse Feature Table
     const FT_Byte* pFeatureHeader = pGsubBase + nOfsFeatureTable;
@@ -1436,7 +1435,7 @@ void ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
             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 )
     {
         const sal_uInt16 nOfsLookupTable = *lookup_it;