1 files changed, 4 insertions, 6 deletions
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index ade0a6607a8f..79c344d8fbfb 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -31,8 +31,6 @@ typedef sal_uInt8 U8;
 typedef sal_uInt16 U16;
 typedef sal_Int64 S64;
 
-typedef sal_Int32 GlyphWidth;
-
 typedef double RealType;
 typedef RealType ValType;
 
@@ -273,7 +271,7 @@ public:
     bool    initialCffRead();
     void    emitAsType1( class Type1Emitter&,
                 const sal_GlyphId* pGlyphIds, const U8* pEncoding,
-                GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& );
+                sal_Int32* pGlyphWidths, int nGlyphCount, FontSubsetInfo& );
 
 private:
     int     convert2Type1Ops( CffLocal*, const U8* pType2Ops, int nType2Len, U8* pType1Ops);
@@ -1734,7 +1732,7 @@ void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail,
 
 void CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
     const sal_GlyphId* pReqGlyphIds, const U8* pReqEncoding,
-    GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rFSInfo)
+    sal_Int32* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rFSInfo)
 {
     // prepare some fontdirectory details
     static const int nUniqueIdBase = 4100000; // using private-interchange UniqueIds
@@ -1975,7 +1973,7 @@ void CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
             ValType aCharWidth = getCharWidth();
             if( maFontMatrix.size() >= 4)
                 aCharWidth *= 1000.0F * maFontMatrix[0];
-            pGlyphWidths[i] = static_cast<GlyphWidth>(aCharWidth);
+            pGlyphWidths[i] = static_cast<sal_Int32>(aCharWidth);
         }
     }
     pOut += sprintf( pOut, "end end\nreadonly put\nput\n");
@@ -2029,7 +2027,7 @@ void CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
     rFSInfo.m_aPSName   = OUString( rEmitter.maSubsetName, strlen(rEmitter.maSubsetName), RTL_TEXTENCODING_UTF8 );
 }
 
-bool FontSubsetInfo::CreateFontSubsetFromCff( GlyphWidth* pOutGlyphWidths )
+bool FontSubsetInfo::CreateFontSubsetFromCff( sal_Int32* pOutGlyphWidths )
 {
     CffSubsetterContext aCff( mpInFontBytes, mnInByteLength);
     bool bRC = aCff.initialCffRead();