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/source | |
| parent | Avoid reserved identifiers (diff) | |
| download | core-d429ea8ac159283dc5ff862c254868a987a9f42b.tar.gz core-d429ea8ac159283dc5ff862c254868a987a9f42b.zip | |
Remove unnecessary typedef (that introduced a reserved identifier)
Change-Id: I6c0aaac10b2244271f3cdf45f4eceb6d685b213c
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/fontsubset/fontsubset.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/fontsubset/gsub.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/fontsubset/gsub.h | 8 |
3 files changed, 9 insertions, 9 deletions
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 ); } |