Class ImplGetDevFontList renamed to ImplDeviceFontList

Change-Id: I1282b61eacc4bac2f049340bd11c9467c0c239c0
Reviewed-on: https://gerrit.libreoffice.org/20918
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>

13 files changed, 42 insertions, 42 deletions

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 6c405788b85d..c8b4fbd234b2 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -65,7 +65,7 @@ struct SystemFontData;
 struct SystemTextLayoutData;
 class ImplFontCache;
 class PhysicalFontCollection;
-class ImplGetDevFontList;
+class ImplDeviceFontList;
 class ImplGetDevSizeList;
 class ImplMultiTextLineInfo;
 class SalGraphics;
@@ -361,7 +361,7 @@ private:
     mutable ImplFontEntry*          mpFontEntry;
     mutable ImplFontCache*          mpFontCache;
     mutable PhysicalFontCollection* mpFontCollection;
-    mutable ImplGetDevFontList*     mpGetDevFontList;
+    mutable ImplDeviceFontList*     mpDeviceFontList;
     mutable ImplGetDevSizeList*     mpGetDevSizeList;
     OutDevStateStack*               mpOutDevStateStack;
     ImplOutDevData*                 mpOutDevData;
diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx
index 4adbbe7b0401..38b2973cd532 100644
--- a/vcl/inc/PhysicalFontCollection.hxx
+++ b/vcl/inc/PhysicalFontCollection.hxx
@@ -62,7 +62,7 @@ public:
 
     // misc utilities
     PhysicalFontCollection* Clone( bool bScalable, bool bEmbeddable ) const;
-    ImplGetDevFontList*     GetDevFontList() const;
+    ImplDeviceFontList*     GetDevFontList() const;
     ImplGetDevSizeList*     GetDevSizeList( const OUString& rFontName ) const;
 
 private:
diff --git a/vcl/inc/PhysicalFontFamily.hxx b/vcl/inc/PhysicalFontFamily.hxx
index a2fbf1baa0a1..8c38586d40af 100644
--- a/vcl/inc/PhysicalFontFamily.hxx
+++ b/vcl/inc/PhysicalFontFamily.hxx
@@ -61,7 +61,7 @@ public:
     PhysicalFontFace*   FindBestFontFace( const FontSelectPattern& rFSD ) const;
 
     void                GetFontHeights( std::set<int>& rHeights ) const;
-    void                UpdateDevFontList( ImplGetDevFontList& ) const;
+    void                UpdateDevFontList( ImplDeviceFontList& ) const;
     void                UpdateCloneFontList( PhysicalFontCollection&,
                                              bool bScalable, bool bEmbeddable ) const;
 
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index d48fa994b4f7..90fad99fd40e 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -36,15 +36,15 @@ class VirtualDevice;
 class PhysicalFontCollection;
 enum class AddFontSubstituteFlags;
 
-// an ImplGetDevFontList is created by an PhysicalFontCollection
+// an ImplDeviceFontList is created by an PhysicalFontCollection
 // it becomes invalid when original PhysicalFontCollection is modified
-class ImplGetDevFontList
+class ImplDeviceFontList
 {
 private:
     std::vector<PhysicalFontFace*> maDevFontVector;
 
 public:
-                        ImplGetDevFontList()        { maDevFontVector.reserve(1024); }
+                        ImplDeviceFontList()        { maDevFontVector.reserve(1024); }
     void                Add( PhysicalFontFace* pFace )  { maDevFontVector.push_back( pFace ); }
     PhysicalFontFace*   Get( int nIndex ) const     { return maDevFontVector[ nIndex ]; }
     int                 Count() const               { return maDevFontVector.size(); }
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index 033499ed128d..df863b6bc273 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -953,18 +953,18 @@ PhysicalFontCollection* PhysicalFontCollection::Clone( bool bScalable, bool bEmb
     return pClonedCollection;
 }
 
-ImplGetDevFontList* PhysicalFontCollection::GetDevFontList() const
+ImplDeviceFontList* PhysicalFontCollection::GetDevFontList() const
 {
-    ImplGetDevFontList* pGetDevFontList = new ImplGetDevFontList;
+    ImplDeviceFontList* pDeviceFontList = new ImplDeviceFontList;
 
     PhysicalFontFamilies::const_iterator it = maPhysicalFontFamilies.begin();
     for(; it != maPhysicalFontFamilies.end(); ++it )
     {
         const PhysicalFontFamily* pFontFamily = (*it).second;
-        pFontFamily->UpdateDevFontList( *pGetDevFontList );
+        pFontFamily->UpdateDevFontList( *pDeviceFontList );
     }
 
-    return pGetDevFontList;
+    return pDeviceFontList;
 }
 
 ImplGetDevSizeList* PhysicalFontCollection::GetDevSizeList( const OUString& rFontName ) const
diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx
index 1496091d08f7..83f2ab07e99e 100644
--- a/vcl/source/font/PhysicalFontFamily.cxx
+++ b/vcl/source/font/PhysicalFontFamily.cxx
@@ -247,7 +247,7 @@ PhysicalFontFace* PhysicalFontFamily::FindBestFontFace( const FontSelectPattern&
 
 // update device font list with unique font faces, with uniqueness
 // meaning different font attributes, but not different fonts sizes
-void PhysicalFontFamily::UpdateDevFontList( ImplGetDevFontList& rDevFontList ) const
+void PhysicalFontFamily::UpdateDevFontList( ImplDeviceFontList& rDevFontList ) const
 {
     PhysicalFontFace* pPrevFace = nullptr;
     for( PhysicalFontFace* pFace = mpFirst; pFace; pFace = pFace->GetNextFace() )
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx
index fa7fb59eee5c..54bd9e21aef5 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -230,7 +230,7 @@ OUString EmbeddedFontsHelper::fontFileUrl( const OUString& familyName, FontFamil
     SalGraphics* graphics = Application::GetDefaultDevice()->GetGraphics();
     PhysicalFontCollection fonts;
     graphics->GetDevFontList( &fonts );
-    std::unique_ptr< ImplGetDevFontList > fontInfo( fonts.GetDevFontList());
+    std::unique_ptr< ImplDeviceFontList > fontInfo( fonts.GetDevFontList());
     PhysicalFontFace* selected = nullptr;
     for( int i = 0;
          i < fontInfo->Count();
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index ebe19e95b327..f4e106c474b1 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -636,10 +636,10 @@ void Printer::ImplReleaseFonts()
         mpFontEntry = nullptr;
     }
 
-    if ( mpGetDevFontList )
+    if ( mpDeviceFontList )
     {
-        delete mpGetDevFontList;
-        mpGetDevFontList = nullptr;
+        delete mpDeviceFontList;
+        mpDeviceFontList = nullptr;
     }
 
     if ( mpGetDevSizeList )
@@ -1013,10 +1013,10 @@ void Printer::dispose()
             mpFontCache->Release( mpFontEntry );
             mpFontEntry = nullptr;
         }
-        if ( mpGetDevFontList )
+        if ( mpDeviceFontList )
         {
-            delete mpGetDevFontList;
-            mpGetDevFontList = nullptr;
+            delete mpDeviceFontList;
+            mpDeviceFontList = nullptr;
         }
         if ( mpGetDevSizeList )
         {
@@ -1167,10 +1167,10 @@ bool Printer::SetPrinterProps( const Printer* pPrinter )
                 mpFontCache->Release( mpFontEntry );
                 mpFontEntry = nullptr;
             }
-            if ( mpGetDevFontList )
+            if ( mpDeviceFontList )
             {
-                delete mpGetDevFontList;
-                mpGetDevFontList = nullptr;
+                delete mpDeviceFontList;
+                mpDeviceFontList = nullptr;
             }
             if ( mpGetDevSizeList )
             {
@@ -1210,10 +1210,10 @@ bool Printer::SetPrinterProps( const Printer* pPrinter )
                 mpFontCache->Release( mpFontEntry );
                 mpFontEntry = nullptr;
             }
-            if ( mpGetDevFontList )
+            if ( mpDeviceFontList )
             {
-                delete mpGetDevFontList;
-                mpGetDevFontList = nullptr;
+                delete mpDeviceFontList;
+                mpDeviceFontList = nullptr;
             }
             if ( mpGetDevSizeList )
             {
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index af9bbbdddc83..f97b810ce903 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -514,10 +514,10 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode i_eRefDevMode, sal_Int32
         mpFontCache->Release( mpFontEntry );
         mpFontEntry = nullptr;
     }
-    if ( mpGetDevFontList )
+    if ( mpDeviceFontList )
     {
-        delete mpGetDevFontList;
-        mpGetDevFontList = nullptr;
+        delete mpDeviceFontList;
+        mpDeviceFontList = nullptr;
     }
     if ( mpGetDevSizeList )
     {
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index a6bed226ae1c..b2ac6f281595 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -70,7 +70,7 @@ vcl::FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const
     int nCount = GetDevFontCount();
     if( nDevFontIndex < nCount )
     {
-        const PhysicalFontFace& rData = *mpGetDevFontList->Get( nDevFontIndex );
+        const PhysicalFontFace& rData = *mpDeviceFontList->Get( nDevFontIndex );
         aFontInfo.SetName( rData.GetFamilyName() );
         aFontInfo.SetStyleName( rData.GetStyleName() );
         aFontInfo.SetCharSet( rData.IsSymbolFont() ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE );
@@ -90,14 +90,14 @@ vcl::FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const
 
 int OutputDevice::GetDevFontCount() const
 {
-    if( !mpGetDevFontList )
+    if( !mpDeviceFontList )
     {
         if (!mpFontCollection)
             return 0;
 
-        mpGetDevFontList = mpFontCollection->GetDevFontList();
+        mpDeviceFontList = mpFontCollection->GetDevFontList();
     }
-    return mpGetDevFontList->Count();
+    return mpDeviceFontList->Count();
 }
 
 bool OutputDevice::IsFontAvailable( const OUString& rFontName ) const
@@ -503,10 +503,10 @@ void OutputDevice::ImplClearFontData( const bool bNewFontLists )
 
     if ( bNewFontLists )
     {
-        if ( mpGetDevFontList )
+        if ( mpDeviceFontList )
         {
-            delete mpGetDevFontList;
-            mpGetDevFontList = nullptr;
+            delete mpDeviceFontList;
+            mpDeviceFontList = nullptr;
         }
         if ( mpGetDevSizeList )
         {
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 5d7f98de73cf..14b6321f20f3 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -96,7 +96,7 @@ OutputDevice::OutputDevice() :
     mpFontEntry                     = nullptr;
     mpFontCache                     = nullptr;
     mpFontCollection                = nullptr;
-    mpGetDevFontList                = nullptr;
+    mpDeviceFontList                = nullptr;
     mpGetDevSizeList                = nullptr;
     mpOutDevStateStack              = new OutDevStateStack;
     mpPDFWriter                     = nullptr;
@@ -239,8 +239,8 @@ void OutputDevice::dispose()
 
     // remove cached results of GetDevFontList/GetDevSizeList
     // TODO: use smart pointers for them
-    delete mpGetDevFontList;
-    mpGetDevFontList = nullptr;
+    delete mpDeviceFontList;
+    mpDeviceFontList = nullptr;
 
     delete mpGetDevSizeList;
     mpGetDevSizeList = nullptr;
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index aa3de62f881d..8175ea64f905 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -639,10 +639,10 @@ void OutputDevice::ImplReleaseFonts()
         mpFontEntry = nullptr;
     }
 
-    if ( mpGetDevFontList )
+    if ( mpDeviceFontList )
     {
-        delete mpGetDevFontList;
-        mpGetDevFontList = nullptr;
+        delete mpDeviceFontList;
+        mpDeviceFontList = nullptr;
     }
 
     if ( mpGetDevSizeList )
diff --git a/vcl/win/gdi/salgdi3.cxx b/vcl/win/gdi/salgdi3.cxx
index ca8b49ed236a..43c397144e4d 100644
--- a/vcl/win/gdi/salgdi3.cxx
+++ b/vcl/win/gdi/salgdi3.cxx
@@ -559,7 +559,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFon
     }
 
     // last level fallback, check each font type face one by one
-    ImplGetDevFontList* pTestFontList = pFontCollection->GetDevFontList();
+    ImplDeviceFontList* pTestFontList = pFontCollection->GetDevFontList();
     // limit the count of fonts to be checked to prevent hangs
     static const int MAX_GFBFONT_COUNT = 600;
     int nTestFontCount = pTestFontList->Count();