tdf#96099 Remove various smart pointer typedefs in vcl

Change-Id: I4ac1bb25d3d63f150b42d9e1708efc344bbdb6a7
Reviewed-on: https://gerrit.libreoffice.org/26113
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

2 files changed, 15 insertions, 18 deletions

diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 74725eab8990..9fcf8e70b854 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -36,7 +36,6 @@ typedef sal_Int32 GlyphWidth;
 typedef float RealType;
 typedef RealType ValType;
 #include <vector>
-typedef std::vector<ValType> ValVector;
 
 static const char* pStringIds[] = {
 /*0*/   ".notdef",      "space",            "exclam",           "quotedbl",
@@ -275,8 +274,8 @@ struct CffGlobal
     int     mnFontDictBase;
     int     mnFDAryCount;
 
-    ValVector   maFontBBox;
-    ValVector   maFontMatrix;
+    std::vector<ValType>   maFontBBox;
+    std::vector<ValType>   maFontMatrix;
 
     int     mnFontNameSID;
     int     mnFullNameSID;
@@ -300,12 +299,12 @@ struct CffLocal
     // ATM hinting related values
     ValType     maStemStdHW;
     ValType     maStemStdVW;
-    ValVector   maStemSnapH;
-    ValVector   maStemSnapV;
-    ValVector   maBlueValues;
-    ValVector   maOtherBlues;
-    ValVector   maFamilyBlues;
-    ValVector   maFamilyOtherBlues;
+    std::vector<ValType>   maStemSnapH;
+    std::vector<ValType>   maStemSnapV;
+    std::vector<ValType>   maBlueValues;
+    std::vector<ValType>   maOtherBlues;
+    std::vector<ValType>   maFamilyBlues;
+    std::vector<ValType>   maFamilyOtherBlues;
     RealType    mfBlueScale;
     RealType    mfBlueShift;
     RealType    mfBlueFuzz;
@@ -1712,7 +1711,7 @@ public:
     void        emitAllCrypted();
     int         tellPos() const;
     void        updateLen( int nTellPos, size_t nLength);
-    void        emitValVector( const char* pLineHead, const char* pLineTail, const ValVector&);
+    void        emitValVector( const char* pLineHead, const char* pLineTail, const std::vector<ValType>&);
 private:
     FILE*       mpFileOut;
     bool        mbCloseOutfile;
@@ -1844,7 +1843,7 @@ inline int dbl2str( char* pOut, double fVal)
 }
 
 void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail,
-    const ValVector& rVector)
+    const std::vector<ValType>& rVector)
 {
     // ignore empty vectors
     if( rVector.empty())
@@ -1853,8 +1852,8 @@ void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail,
     // emit the line head
     mpPtr += sprintf( mpPtr, "%s", pLineHead);
     // emit the vector values
-    ValVector::value_type aVal = 0;
-    for( ValVector::const_iterator it = rVector.begin();;) {
+    std::vector<ValType>::value_type aVal = 0;
+    for( std::vector<ValType>::const_iterator it = rVector.begin();;) {
         aVal = *it;
         if( ++it == rVector.end() )
             break;
diff --git a/vcl/source/fontsubset/gsub.cxx b/vcl/source/fontsubset/gsub.cxx
index 6ef40f209eff..52e6d8cc0a76 100644
--- a/vcl/source/fontsubset/gsub.cxx
+++ b/vcl/source/fontsubset/gsub.cxx
@@ -72,8 +72,7 @@ bool ReadGSUB( struct TrueTypeFont* pTTFile,
         if( nVersion != 0x00001000 )    // workaround for SunBatang etc.
             return false;               // unknown format or broken
 
-    typedef std::vector<sal_uInt32> ReqFeatureTagList;
-    ReqFeatureTagList aReqFeatureTagList;
+    std::vector<sal_uInt32> aReqFeatureTagList;
 
     aReqFeatureTagList.push_back( MKTAG("vert") );
 
@@ -231,8 +230,7 @@ bool ReadGSUB( struct TrueTypeFont* pTTFile,
             const sal_uInt16 nOfsCoverage       = NEXT_UShort( pSubLookup );
 
             typedef std::pair<sal_uInt16,sal_uInt16> GlyphSubst;
-            typedef std::vector<GlyphSubst> SubstVector;
-            SubstVector aSubstVector;
+            std::vector<GlyphSubst> aSubstVector;
 
             const FT_Byte* pCoverage    = pGsubBase
                 + nOfsLookupList + nOfsLookupTable + nOfsSubLookupTable + nOfsCoverage;
@@ -274,7 +272,7 @@ bool ReadGSUB( struct TrueTypeFont* pTTFile,
                 break;
             }
 
-            SubstVector::iterator subst_it( aSubstVector.begin() );
+            std::vector<GlyphSubst>::iterator subst_it( aSubstVector.begin() );
 
             switch( nFmtSubstitution )
             {