Remove unnecessary typedef (that introduced a reserved identifier)

Change-Id: I6c0aaac10b2244271f3cdf45f4eceb6d685b213c

6 files changed, 17 insertions, 17 deletions

diff --git a/unusedcode.easy b/unusedcode.easy
index d77024d77891..7285029d48d1 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -72,7 +72,7 @@ sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
 sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
 std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_M_move_data(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&, std::integral_constant<bool, true>)
 std::__cxx1998::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long)
-vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
+vcl::MapChar(vcl::TrueTypeFont*, unsigned short, bool)
 vcl::Region::IsInside(Rectangle const&) const
 vcl::RenderSettings::PushAndApply(OutputDevice&)
 vcl::Window::DrawGradientWallpaper(OutputDevice&, long, long, long, long, Wallpaper const&)
diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index 7e25b9b9e8d8..5053442e3ece 100644
--- a/vcl/inc/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -25,7 +25,7 @@
 
 #include "salglyphid.hxx"
 
-namespace vcl { struct _TrueTypeFont; }         ///< SFT's idea of a TTF font
+namespace vcl { struct TrueTypeFont; }         ///< SFT's idea of a TTF font
 
 class FontSubsetInfo
 {
@@ -49,7 +49,7 @@ public:
 
     bool        LoadFont( FontType eInFontType,
                     const unsigned char* pFontBytes, int nByteLength );
-    bool        LoadFont( vcl::_TrueTypeFont* pSftTrueTypeFont );
+    bool        LoadFont( vcl::TrueTypeFont* pSftTrueTypeFont );
 
     bool        CreateFontSubset( int nOutFontTypeMask,
                     FILE* pOutFile, const char* pOutFontName,
@@ -70,7 +70,7 @@ private:
     unsigned const char*    mpInFontBytes;
     int                     mnInByteLength;
     FontType                meInFontType;       ///< allowed mask of input font-types
-    vcl::_TrueTypeFont*     mpSftTTFont;
+    vcl::TrueTypeFont*      mpSftTTFont;
 
     // subset-request details
     int                     mnReqFontTypeMask;  ///< allowed subset-target font types
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index e4daced652ee..c4622f7e6d55 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -100,7 +100,7 @@ namespace vcl
         FWIDTH_ULTRA_EXPANDED = 9           /**< 200% of normal                     */
     };
 
-/** Type of the 'kern' table, stored in _TrueTypeFont::kerntype */
+/** Type of the 'kern' table, stored in TrueTypeFont::kerntype */
     enum KernType {
         KT_NONE         = 0,                /**< no kern table                      */
         KT_APPLE_NEW    = 1,                /**< new Apple kern table               */
@@ -226,7 +226,7 @@ namespace vcl
         sal_Int16 y;                  /**< Y coordinate in EmSquare units      */
     } ControlPoint;
 
-    typedef struct _TrueTypeFont TrueTypeFont;
+    struct TrueTypeFont;
 
 /**
  * @defgroup sft Sun Font Tools Exported Functions
@@ -520,7 +520,7 @@ namespace vcl
 
 /*- private definitions */
 
-    struct _TrueTypeFont {
+    struct TrueTypeFont {
         sal_uInt32 tag;
 
         char        *fname;
@@ -550,7 +550,7 @@ namespace vcl
         void        *pGSubstitution;                       /* info provided by GSUB for UseGSUB()                                */
     };
 
-/* indexes into _TrueTypeFont::tables[] and _TrueTypeFont::tlens[] */
+/* indexes into TrueTypeFont::tables[] and TrueTypeFont::tlens[] */
 #define O_maxp 0     /* 'maxp' */
 #define O_glyf 1     /* 'glyf' */
 #define O_head 2     /* 'head' */
diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx
index 26403cc88f2d..a1a147629a1c 100644
--- a/vcl/source/fontsubset/fontsubset.cxx
+++ b/vcl/source/fontsubset/fontsubset.cxx
@@ -59,7 +59,7 @@ bool FontSubsetInfo::LoadFont(
 }
 
 // prepare subsetting for fonts that are known to the SFT-parser
-bool FontSubsetInfo::LoadFont( vcl::_TrueTypeFont* pSftTTFont )
+bool FontSubsetInfo::LoadFont( vcl::TrueTypeFont* pSftTTFont )
 {
     DBG_ASSERT( (mpInFontBytes == nullptr), "Subset from SFT and from mapped font-file requested");
     mpSftTTFont = pSftTTFont;
diff --git a/vcl/source/fontsubset/gsub.cxx b/vcl/source/fontsubset/gsub.cxx
index 399f31e1630a..d9971fe933b6 100644
--- a/vcl/source/fontsubset/gsub.cxx
+++ b/vcl/source/fontsubset/gsub.cxx
@@ -50,7 +50,7 @@ inline sal_uInt16 NEXT_UShort( const unsigned char* &p )
 
 #define MKTAG(s) ((((((s[0]<<8)+s[1])<<8)+s[2])<<8)+s[3])
 
-bool ReadGSUB( struct _TrueTypeFont* pTTFile,
+bool ReadGSUB( struct TrueTypeFont* pTTFile,
     int nRequestedScript, int nRequestedLangsys )
 {
     const FT_Byte* pGsubBase = pTTFile->tables[ O_gsub ];
@@ -315,13 +315,13 @@ bool ReadGSUB( struct _TrueTypeFont* pTTFile,
     return true;
 }
 
-void ReleaseGSUB(struct _TrueTypeFont* pTTFile)
+void ReleaseGSUB(struct TrueTypeFont* pTTFile)
 {
     GlyphSubstitution* pGlyphSubstitution = static_cast<GlyphSubstitution*>(pTTFile->pGSubstitution);
     delete pGlyphSubstitution;
 }
 
-int UseGSUB( struct _TrueTypeFont* pTTFile, int nGlyph )
+int UseGSUB( struct TrueTypeFont* pTTFile, int nGlyph )
 {
     GlyphSubstitution* pGlyphSubstitution = static_cast<GlyphSubstitution*>(pTTFile->pGSubstitution);
     if( pGlyphSubstitution != nullptr )
@@ -334,7 +334,7 @@ int UseGSUB( struct _TrueTypeFont* pTTFile, int nGlyph )
     return nGlyph;
 }
 
-int HasVerticalGSUB( struct _TrueTypeFont* pTTFile )
+int HasVerticalGSUB( struct TrueTypeFont* pTTFile )
 {
     GlyphSubstitution* pGlyphSubstitution = static_cast<GlyphSubstitution*>(pTTFile->pGSubstitution);
     return pGlyphSubstitution ? +1 : 0;
diff --git a/vcl/source/fontsubset/gsub.h b/vcl/source/fontsubset/gsub.h
index 362a6196028d..51f5ce8bbeab 100644
--- a/vcl/source/fontsubset/gsub.h
+++ b/vcl/source/fontsubset/gsub.h
@@ -23,13 +23,13 @@
 namespace vcl
 {
 
-int HasVerticalGSUB( struct vcl::_TrueTypeFont* pTTFile );
+int HasVerticalGSUB( struct vcl::TrueTypeFont* pTTFile );
 
-int UseGSUB( struct vcl::_TrueTypeFont* pTTFile, int nGlyph );
+int UseGSUB( struct vcl::TrueTypeFont* pTTFile, int nGlyph );
 
-bool ReadGSUB( struct vcl::_TrueTypeFont* pTTFile, int nRequestedScript, int nRequestedLangsys );
+bool ReadGSUB( struct vcl::TrueTypeFont* pTTFile, int nRequestedScript, int nRequestedLangsys );
 
-void ReleaseGSUB( struct vcl::_TrueTypeFont* pTTFile );
+void ReleaseGSUB( struct vcl::TrueTypeFont* pTTFile );
 
 }