diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-03-17 00:11:30 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-03-20 16:11:57 -0500 |
| commit | 5971a040f974dcdd0b0d8491d720fa7ad74439b4 (patch) | |
| tree | c7c4a273838a908ac5e8dfb7dcd320443283aebe /vcl/generic/glyphs | |
| parent | replace DevFontList with PhysicalFontFamilies propagate the naming change (diff) | |
| download | core-5971a040f974dcdd0b0d8491d720fa7ad74439b4.tar.gz core-5971a040f974dcdd0b0d8491d720fa7ad74439b4.zip | |
rename ImplDevFontList to PhysicalFontCollection
again, convergence of teh naming with what is normally
used in the underlying native API,
where FontFace ) FontFamily ) FontCollection
Change-Id: Ieb098b782ea828a3365f00d07914b9566278caba
Diffstat (limited to 'vcl/generic/glyphs')
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 6 | ||||
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.hxx | 4 | ||||
| -rw-r--r-- | vcl/generic/glyphs/glyphcache.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 93cb40ec8ac8..ea6c966e1e57 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -373,10 +373,10 @@ const unsigned char* FtFontInfo::GetTable( const char* pTag, sal_uLong* pLength -void FtFontInfo::AnnounceFont( ImplDevFontList* pFontList ) +void FtFontInfo::AnnounceFont( PhysicalFontCollection* pFontCollection ) { ImplFTSFontData* pFD = new ImplFTSFontData( this, maDevFontAttributes ); - pFontList->Add( pFD ); + pFontCollection->Add( pFD ); } @@ -442,7 +442,7 @@ void FreetypeManager::AddFontFile( const OString& rNormalizedName, -void FreetypeManager::AnnounceFonts( ImplDevFontList* pToAdd ) const +void FreetypeManager::AnnounceFonts( PhysicalFontCollection* pToAdd ) const { for( FontList::const_iterator it = maFontList.begin(); it != maFontList.end(); ++it ) { diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx index a4712cc64dbc..6da2ce3b88d8 100644 --- a/vcl/generic/glyphs/gcach_ftyp.hxx +++ b/vcl/generic/glyphs/gcach_ftyp.hxx @@ -81,7 +81,7 @@ public: bool IsSymbolFont() const { return maDevFontAttributes.IsSymbolFont(); } const ImplFontAttributes& GetFontAttributes() const { return maDevFontAttributes; } - void AnnounceFont( ImplDevFontList* ); + void AnnounceFont( PhysicalFontCollection* ); int GetGlyphIndex( sal_UCS4 cChar ) const; void CacheGlyphIndex( sal_UCS4 cChar, int nGI ) const; @@ -142,7 +142,7 @@ public: void AddFontFile( const OString& rNormalizedName, int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes&); - void AnnounceFonts( ImplDevFontList* ) const; + void AnnounceFonts( PhysicalFontCollection* ) const; void ClearFontList(); ServerFont* CreateFont( const FontSelectPattern& ); diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx index 4e5e939e4bb9..7c7e2d15d8fc 100644 --- a/vcl/generic/glyphs/glyphcache.cxx +++ b/vcl/generic/glyphs/glyphcache.cxx @@ -161,10 +161,10 @@ void GlyphCache::AddFontFile( const OString& rNormalizedName, int nFaceNum, } -void GlyphCache::AnnounceFonts( ImplDevFontList* pList ) const +void GlyphCache::AnnounceFonts( PhysicalFontCollection* pFontCollection ) const { if( mpFtManager ) - mpFtManager->AnnounceFonts( pList ); + mpFtManager->AnnounceFonts( pFontCollection ); } void GlyphCache::ClearFontCache() |