summaryrefslogtreecommitdiff
path: root/vcl/win
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2021-09-10 22:22:07 +1000
committerMike Kaganski <mike.kaganski@collabora.com>2021-09-19 12:11:53 +0200
commit9e7715dbc4e3c09d9be8a6f3c5ca0e4910651fec (patch)
treea760fef9057b93ae5fa906e80437c66d0e3e3a53 /vcl/win
parenta6bccaf72f69428bffd6688917491ef921383456 (diff)
vcl: test PhysicalFontFamily and move to vcl::font namespace
- Adds a series of unit tests for PhysicalFontFamily - Moves PhysicalFontFamily into vcl::font - Move PhysicalFontFamily.hxx into vcl/inc/font This is part of a series of patches where I also move font files into the relevant font directories, and into the vcl::font namespace. Change-Id: I9e8d7ceb5ec3494bf3ab6560645e52e88223ee69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121903 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'vcl/win')
-rw-r--r--vcl/win/gdi/salfont.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 6c199de9c18f..0fc289d3d95e 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -244,7 +244,7 @@ bool WinGlyphFallbackSubstititution::HasMissingChars(PhysicalFontFace* pFace, OU
namespace
{
//used by 2-level font fallback
- PhysicalFontFamily* findDevFontListByLocale(const PhysicalFontCollection &rFontCollection,
+ vcl::font::PhysicalFontFamily* findDevFontListByLocale(const PhysicalFontCollection &rFontCollection,
const LanguageTag& rLanguageTag )
{
// get the default font for a specified locale
@@ -302,7 +302,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute(FontSelectPattern& rFont
// first level fallback:
// try use the locale specific default fonts defined in VCL.xcu
const PhysicalFontCollection* pFontCollection = ImplGetSVData()->maGDIData.mxScreenFontList.get();
- PhysicalFontFamily* pFontFamily = findDevFontListByLocale(*pFontCollection, aLanguageTag);
+ vcl::font::PhysicalFontFamily* pFontFamily = findDevFontListByLocale(*pFontCollection, aLanguageTag);
if( pFontFamily )
{
PhysicalFontFace* pFace = pFontFamily->FindBestFontFace( rFontSelData );