diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-09 17:51:07 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 18:32:08 +0100 |
| commit | d429ea8ac159283dc5ff862c254868a987a9f42b (patch) | |
| tree | 8f3561a82b1468bcdd4f3664533433586082ce47 /vcl/inc | |
| parent | 201812ee8bd8ed91df0a293649bfbd4a7dd6b059 (diff) | |
Remove unnecessary typedef (that introduced a reserved identifier)
Change-Id: I6c0aaac10b2244271f3cdf45f4eceb6d685b213c
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/fontsubset.hxx | 6 | ||||
| -rw-r--r-- | vcl/inc/sft.hxx | 8 |
2 files changed, 7 insertions, 7 deletions
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' */ |