diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-10-27 16:08:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-10-27 16:39:32 +0100 |
| commit | bea5e37dd32f30d301aca89ba4875657de7c1025 (patch) | |
| tree | b0f0384cdaa9f6ff6d7ce511c7aaa876549fdf30 /vcl/generic/glyphs/gcach_ftyp.cxx | |
| parent | ac1eb33bfc4ce95779e8a1ed252d928c799afa40 (diff) | |
Rename ImplFontSelectData to FontSelectPattern so I know what it does
Rename ImplFontSelectData to FontSelectPattern because I can never remember the
name of the thing. This way I'll be able to remember that its basically the
equivalent of fontconfig's FcPattern
Diffstat (limited to 'vcl/generic/glyphs/gcach_ftyp.cxx')
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index ffa4aa33b642..44d8958a0081 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -640,7 +640,7 @@ void FreetypeManager::ClearFontList( ) // ----------------------------------------------------------------------- -ServerFont* FreetypeManager::CreateFont( const ImplFontSelectData& rFSD ) +ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD ) { FtFontInfo* pFontInfo = NULL; @@ -670,7 +670,7 @@ ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplDevFontAttributes& // ----------------------------------------------------------------------- -ImplFontEntry* ImplFTSFontData::CreateFontInstance( ImplFontSelectData& rFSD ) const +ImplFontEntry* ImplFTSFontData::CreateFontInstance( FontSelectPattern& rFSD ) const { ImplServerFontEntry* pEntry = new ImplServerFontEntry( rFSD ); return pEntry; @@ -680,7 +680,7 @@ ImplFontEntry* ImplFTSFontData::CreateFontInstance( ImplFontSelectData& rFSD ) c // ServerFont // ======================================================================= -ServerFont::ServerFont( const ImplFontSelectData& rFSD, FtFontInfo* pFI ) +ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI ) : maGlyphList( 0), maFontSelData(rFSD), mnExtInfo(0), @@ -1872,7 +1872,7 @@ int ServerFont::GetGlyphKernValue( int nGlyphLeft, int nGlyphRight ) const if( !nKernVal ) return 0; // scale the kern value to match the font size - const ImplFontSelectData& rFSD = GetFontSelData(); + const FontSelectPattern& rFSD = GetFontSelData(); nKernVal *= rFSD.mnWidth ? rFSD.mnWidth : rFSD.mnHeight; return (nKernVal + 500) / 1000; } @@ -1901,7 +1901,7 @@ sal_uLong ServerFont::GetKernPairs( ImplKernPairData** ppKernPairs ) const // then we have may have extra kerning info from e.g. psprint int nCount = mpFontInfo->GetExtraKernPairs( ppKernPairs ); // scale the kern values to match the font size - const ImplFontSelectData& rFSD = GetFontSelData(); + const FontSelectPattern& rFSD = GetFontSelData(); int nFontWidth = rFSD.mnWidth ? rFSD.mnWidth : rFSD.mnHeight; ImplKernPairData* pKernPair = *ppKernPairs; for( int i = nCount; --i >= 0; ++pKernPair ) @@ -2388,7 +2388,7 @@ bool ServerFont::GetGlyphOutline( int nGlyphIndex, // ----------------------------------------------------------------------- -bool ServerFont::ApplyGSUB( const ImplFontSelectData& rFSD ) +bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD ) { #define MKTAG(s) ((((((s[0]<<8)+s[1])<<8)+s[2])<<8)+s[3]) |