Rename the class ImplFontData into PhysicalFontFace

Change-Id: I402481e7c6ea605c8ccfdf6cb08166859b37e8de

2 files changed, 14 insertions, 14 deletions

diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx
index a8fc7c51a7c1..73182ede97fc 100644
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
@@ -69,7 +69,7 @@ public:
     virtual bool    GetGlyphOutlines( SalGraphics&, PolyPolyVector& ) const;
     virtual bool    GetBoundRect( SalGraphics&, Rectangle& ) const;
 
-    const ImplFontData* GetFallbackFontData( sal_GlyphId ) const;
+    const PhysicalFontFace* GetFallbackFontData( sal_GlyphId ) const;
 
     virtual void    InitFont() const;
     virtual void    MoveGlyph( int nStart, long nNewXPos );
@@ -127,7 +127,7 @@ class FallbackInfo
 public:
         FallbackInfo() : mnMaxLevel(0) {}
     int AddFallback( ATSUFontID );
-    const ImplFontData* GetFallbackFontData( int nLevel ) const;
+    const PhysicalFontFace* GetFallbackFontData( int nLevel ) const;
 
 private:
     const ImplMacFontData* maFontData[ MAX_FALLBACK ];
@@ -1110,9 +1110,9 @@ void ATSLayout::MoveGlyph( int /*nStart*/, long /*nNewXPos*/ ) {}
 void ATSLayout::DropGlyph( int /*nStart*/ ) {}
 void ATSLayout::Simplify( bool /*bIsBase*/ ) {}
 
-// get the ImplFontData for a glyph fallback font
+// get the PhysicalFontFace for a glyph fallback font
 // for a glyphid that was returned by ATSLayout::GetNextGlyphs()
-const ImplFontData* ATSLayout::GetFallbackFontData( sal_GlyphId nGlyphId ) const
+const PhysicalFontFace* ATSLayout::GetFallbackFontData( sal_GlyphId nGlyphId ) const
 {
     // check if any fallback fonts were needed
     if( !mpFallbackInfo )
@@ -1138,7 +1138,7 @@ int FallbackInfo::AddFallback( ATSUFontID nFontId )
         return 0;
     // keep ATSU font id of fallback font
     maATSUFontId[ mnMaxLevel ] = nFontId;
-    // find and cache the corresponding ImplFontData pointer
+    // find and cache the corresponding PhysicalFontFace pointer
     const SystemFontList* pSFL = GetSalData()->mpFontList;
     const ImplMacFontData* pFontData = pSFL->GetFontDataFromId( nFontId );
     maFontData[ mnMaxLevel ] = pFontData;
@@ -1148,7 +1148,7 @@ int FallbackInfo::AddFallback( ATSUFontID nFontId )
 
 // -----------------------------------------------------------------------
 
-const ImplFontData* FallbackInfo::GetFallbackFontData( int nFallbackLevel ) const
+const PhysicalFontFace* FallbackInfo::GetFallbackFontData( int nFallbackLevel ) const
 {
     const ImplMacFontData* pFallbackFont = maFontData[ nFallbackLevel-1 ];
     return pFallbackFont;
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 933b139dcae9..05c970d7d06d 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -77,7 +77,7 @@ typedef std::vector<unsigned char> ByteVector;
 // =======================================================================
 
 ImplMacFontData::ImplMacFontData( const ImplDevFontAttributes& rDFA, ATSUFontID nFontId )
-:   ImplFontData( rDFA, 0 )
+:   PhysicalFontFace( rDFA, 0 )
 ,   mnFontId( nFontId )
 ,   mpCharMap( NULL )
 ,   mbOs2Read( false )
@@ -104,7 +104,7 @@ sal_IntPtr ImplMacFontData::GetFontId() const
 
 // -----------------------------------------------------------------------
 
-ImplFontData* ImplMacFontData::Clone() const
+PhysicalFontFace* ImplMacFontData::Clone() const
 {
     ImplMacFontData* pClone = new ImplMacFontData(*this);
     if( mpCharMap )
@@ -1711,7 +1711,7 @@ void AquaSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
     if (pSalData->mpFontList == NULL)
         pSalData->mpFontList = new SystemFontList();
 
-    // Copy all ImplFontData objects contained in the SystemFontList
+    // Copy all PhysicalFontFace objects contained in the SystemFontList
     pSalData->mpFontList->AnnounceFonts( *pFontList );
 }
 
@@ -2072,7 +2072,7 @@ static void FakeDirEntry( FourCharCode eFCC, ByteCount nOfs, ByteCount nLen,
     rpDest += 16;
 }
 
-static bool GetRawFontData( const ImplFontData* pFontData,
+static bool GetRawFontData( const PhysicalFontFace* pFontData,
     ByteVector& rBuffer, bool* pJustCFF )
 {
     const ImplMacFontData* pMacFont = static_cast<const ImplMacFontData*>(pFontData);
@@ -2222,7 +2222,7 @@ static bool GetRawFontData( const ImplFontData* pFontData,
 }
 
 sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
-    const ImplFontData* pFontData, long* pGlyphIDs, sal_uInt8* pEncoding,
+    const PhysicalFontFace* pFontData, long* pGlyphIDs, sal_uInt8* pEncoding,
     sal_Int32* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rInfo )
 {
     // TODO: move more of the functionality here into the generic subsetter code
@@ -2356,7 +2356,7 @@ sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::GetGlyphWidths( const ImplFontData* pFontData, bool bVertical,
+void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bVertical,
     Int32Vector& rGlyphWidths, Ucs2UIntMap& rUnicodeEnc )
 {
     rGlyphWidths.clear();
@@ -2428,14 +2428,14 @@ void AquaSalGraphics::GetGlyphWidths( const ImplFontData* pFontData, bool bVerti
 // -----------------------------------------------------------------------
 
 const Ucs2SIntMap* AquaSalGraphics::GetFontEncodingVector(
-    const ImplFontData*, const Ucs2OStrMap** /*ppNonEncoded*/ )
+    const PhysicalFontFace*, const Ucs2OStrMap** /*ppNonEncoded*/ )
 {
     return NULL;
 }
 
 // -----------------------------------------------------------------------
 
-const void* AquaSalGraphics::GetEmbedFontData( const ImplFontData*,
+const void* AquaSalGraphics::GetEmbedFontData( const PhysicalFontFace*,
                               const sal_Ucs* /*pUnicodes*/,
                               sal_Int32* /*pWidths*/,
                               FontSubsetInfo&,