3 files changed, 8 insertions, 8 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index e9a0c9e870a2..f5b4a0d3ca1c 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -191,7 +191,7 @@ const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, siz
 }
 #endif
 
-FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes,
+FtFontInfo::FtFontInfo( const ImplFontAttributes& rDevFontAttributes,
     const OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId)
 :
     maFaceFT( nullptr ),
@@ -367,7 +367,7 @@ FreetypeManager::~FreetypeManager()
 }
 
 void FreetypeManager::AddFontFile( const OString& rNormalizedName,
-    int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes& rDevFontAttr)
+    int nFaceNum, sal_IntPtr nFontId, const ImplFontAttributes& rDevFontAttr)
 {
     if( rNormalizedName.isEmpty() )
         return;
@@ -419,7 +419,7 @@ ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD )
     return pNew;
 }
 
-ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplDevFontAttributes& rDFA )
+ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplFontAttributes& rDFA )
 :   PhysicalFontFace( rDFA, IFTSFONT_MAGIC ),
     mpFtFontInfo( pFI )
 {
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx
index 82b52b30ee81..1fe995ae0169 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -58,7 +58,7 @@ private:
 class FtFontInfo
 {
 public:
-                           FtFontInfo( const ImplDevFontAttributes&,
+                           FtFontInfo( const ImplFontAttributes&,
                                const OString& rNativeFileName,
                                int nFaceNum, sal_IntPtr nFontId);
                           ~FtFontInfo();
@@ -94,7 +94,7 @@ private:
     GraphiteFaceWrapper * mpGraphiteFace;
 #endif
     sal_IntPtr      mnFontId;
-    ImplDevFontAttributes maDevFontAttributes;
+    ImplFontAttributes maDevFontAttributes;
 
     FontCharMapPtr  mpFontCharMap;
 
@@ -133,7 +133,7 @@ public:
                         ~FreetypeManager();
 
     void                AddFontFile( const OString& rNormalizedName,
-                            int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes&);
+                            int nFaceNum, sal_IntPtr nFontId, const ImplFontAttributes&);
     void                AnnounceFonts( PhysicalFontCollection* ) const;
     void                ClearFontList();
 
@@ -153,7 +153,7 @@ private:
     enum { IFTSFONT_MAGIC = 0x1F150A1C };
 
 public:
-                            ImplFTSFontData( FtFontInfo*, const ImplDevFontAttributes& );
+                            ImplFTSFontData( FtFontInfo*, const ImplFontAttributes& );
 
     virtual ImplFontEntry*  CreateFontInstance( FontSelectPattern& ) const override;
     virtual PhysicalFontFace* Clone() const override   { return new ImplFTSFontData( *this ); }
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index 8a2c955ae8d4..1f69fd6ac844 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -146,7 +146,7 @@ GlyphCache& GlyphCache::GetInstance()
 }
 
 void GlyphCache::AddFontFile( const OString& rNormalizedName, int nFaceNum,
-    sal_IntPtr nFontId, const ImplDevFontAttributes& rDFA)
+    sal_IntPtr nFontId, const ImplFontAttributes& rDFA)
 {
     if( mpFtManager )
         mpFtManager->AddFontFile( rNormalizedName, nFaceNum, nFontId, rDFA);