summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2014-03-17 00:11:30 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2014-03-20 16:11:57 -0500
commit5971a040f974dcdd0b0d8491d720fa7ad74439b4 (patch)
treec7c4a273838a908ac5e8dfb7dcd320443283aebe /vcl/unx
parent98da670aef5c4f964c612cbdd4579c9b3eb39715 (diff)
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/unx')
-rw-r--r--vcl/unx/generic/gdi/salgdi3.cxx13
1 files changed, 7 insertions, 6 deletions
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index c234973d4330..2c8949d01547 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -498,8 +498,9 @@ X11SalGraphics::SetTextColor( SalColor nSalColor )
-bool X11SalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
- const OUString& rFileURL, const OUString& rFontName )
+bool X11SalGraphics::AddTempDevFont( PhysicalFontCollection* pFontCollection,
+ const OUString& rFileURL,
+ const OUString& rFontName )
{
// inform PSP font manager
OUString aUSystemPath;
@@ -531,7 +532,7 @@ bool X11SalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
}
// announce new font to device's font list
- rGC.AnnounceFonts( pFontList );
+ rGC.AnnounceFonts( pFontCollection );
return true;
}
@@ -541,7 +542,7 @@ void X11SalGraphics::ClearDevFontCache()
rGC.ClearFontCache();
}
-void X11SalGraphics::GetDevFontList( ImplDevFontList *pList )
+void X11SalGraphics::GetDevFontList( PhysicalFontCollection* pFontCollection )
{
// prepare the GlyphCache using psprint's font infos
X11GlyphCache& rGC = X11GlyphCache::GetInstance();
@@ -567,10 +568,10 @@ void X11SalGraphics::GetDevFontList( ImplDevFontList *pList )
}
// announce glyphcache fonts
- rGC.AnnounceFonts( pList );
+ rGC.AnnounceFonts( pFontCollection );
// register platform specific font substitutions if available
- SalGenericInstance::RegisterFontSubstitutors( pList );
+ SalGenericInstance::RegisterFontSubstitutors( pFontCollection );
ImplGetSVData()->maGDIData.mbNativeFontConfig = true;
}