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

5 files changed, 16 insertions, 16 deletions

diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx
index 44cb5a7776ac..f2f57f4a80bb 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -82,7 +82,7 @@ int SalGenericInstance::FetchFontSubstitutionFlags()
     return nDisableBits;
 }
 
-void SalGenericInstance::RegisterFontSubstitutors( ImplDevFontList* pList )
+void SalGenericInstance::RegisterFontSubstitutors( PhysicalFontCollection* pFontCollection )
 {
     // init font substitution defaults
     int nDisableBits = 0;
@@ -103,14 +103,14 @@ void SalGenericInstance::RegisterFontSubstitutors( ImplDevFontList* pList )
     if( (nDisableBits & 1) == 0 )
     {
         static FcPreMatchSubstititution aSubstPreMatch;
-        pList->SetPreMatchHook( &aSubstPreMatch );
+        pFontCollection->SetPreMatchHook( &aSubstPreMatch );
     }
 
     // register glyph fallback substitutions (unless disabled by bit1)
     if( (nDisableBits & 2) == 0 )
     {
         static FcGlyphFallbackSubstititution aSubstFallback;
-        pList->SetFallbackHook( &aSubstFallback );
+        pFontCollection->SetFallbackHook( &aSubstFallback );
     }
 }
 
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()
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 84eb8be57491..a0ba001d1273 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -882,12 +882,12 @@ void GenPspGraphics::SetTextColor( SalColor nSalColor )
     m_pPrinterGfx->SetTextColor (aColor);
 }
 
-bool GenPspGraphics::AddTempDevFont( ImplDevFontList*, const OUString&,const OUString& )
+bool GenPspGraphics::AddTempDevFont( PhysicalFontCollection*, const OUString&,const OUString& )
 {
     return false;
 }
 
-void GenPspGraphics::GetDevFontList( ImplDevFontList *pList )
+void GenPspGraphics::GetDevFontList( PhysicalFontCollection *pFontCollection )
 {
     ::std::list< psp::fontID > aList;
     psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
@@ -897,10 +897,10 @@ void GenPspGraphics::GetDevFontList( ImplDevFontList *pList )
     psp::FastPrintFontInfo aInfo;
     for (it = aList.begin(); it != aList.end(); ++it)
         if (rMgr.getFontFastInfo (*it, aInfo))
-            AnnounceFonts( pList, aInfo );
+            AnnounceFonts( pFontCollection, aInfo );
 
     // register platform specific font substitutions if available
-    SalGenericInstance::RegisterFontSubstitutors( pList );
+    SalGenericInstance::RegisterFontSubstitutors( pFontCollection );
 }
 
 void GenPspGraphics::ClearDevFontCache()
@@ -1161,7 +1161,7 @@ namespace vcl
 
 
 
-void GenPspGraphics::AnnounceFonts( ImplDevFontList* pFontList, const psp::FastPrintFontInfo& aInfo )
+void GenPspGraphics::AnnounceFonts( PhysicalFontCollection* pFontCollection, const psp::FastPrintFontInfo& aInfo )
 {
     int nQuality = 0;
 
@@ -1191,7 +1191,7 @@ void GenPspGraphics::AnnounceFonts( ImplDevFontList* pFontList, const psp::FastP
 
     ImplPspFontData* pFD = new ImplPspFontData( aInfo );
     pFD->mnQuality += nQuality;
-    pFontList->Add( pFD );
+    pFontCollection->Add( pFD );
 }
 
 bool GenPspGraphics::drawAlphaBitmap( const SalTwoRect&,