diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-09-12 14:41:19 +1000 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-10-05 18:11:01 +0200 |
| commit | c817a5a4958c323eb189e1374072998b8b13ba8c (patch) | |
| tree | 0345dd9e4ae0b590a184b354e9fb183dbcd27f09 /vcl/quartz/salgdi.cxx | |
| parent | 0e736b0c20e096c5daf59f141b4509cfcc159a79 (diff) | |
vcl: test PhysicalFontFace and move to vcl::font namespace
- moved PhysicalFontFace.hxx to vcl/inc/font
- added PhysicalFontFace to vcl::font namespace
- had to regenerate precompiled_vcl.hxx
- tested PhysicalFontFace, with some extensive tests for
IsBetterMatch()
Change-Id: I860022ac244f8a827f6f9cb7ed9018c5d9c328cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121970
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'vcl/quartz/salgdi.cxx')
| -rw-r--r-- | vcl/quartz/salgdi.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 3cfa39cc98fc..ab67e851612a 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -109,7 +109,7 @@ bool CoreTextGlyphFallbackSubstititution::FindFontSubstitute(vcl::font::FontSele } CoreTextFontFace::CoreTextFontFace( const FontAttributes& rDFA, sal_IntPtr nFontId ) - : PhysicalFontFace( rDFA ) + : vcl::font::PhysicalFontFace( rDFA ) , mnFontId( nFontId ) , mbFontCapabilitiesRead( false ) { @@ -556,7 +556,7 @@ static void FakeDirEntry( const char aTag[5], ByteCount nOfs, ByteCount nLen, // fake a TTF or CFF font as directly accessing font file is not possible // when only the fontid is known. This approach also handles *.font fonts. -bool AquaSalGraphics::GetRawFontData( const PhysicalFontFace* pFontData, +bool AquaSalGraphics::GetRawFontData( const vcl::font::PhysicalFontFace* pFontData, std::vector<unsigned char>& rBuffer, bool* pJustCFF ) { const CoreTextFontFace* pMacFont = static_cast<const CoreTextFontFace*>(pFontData); @@ -742,7 +742,7 @@ bool AquaSalGraphics::GetRawFontData( const PhysicalFontFace* pFontData, return true; } -void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bVertical, +void AquaSalGraphics::GetGlyphWidths( const vcl::font::PhysicalFontFace* pFontData, bool bVertical, std::vector< sal_Int32 >& rGlyphWidths, Ucs2UIntMap& rUnicodeEnc ) { rGlyphWidths.clear(); @@ -768,7 +768,7 @@ void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bV ::CloseTTFont( pSftFont ); } -const void* AquaSalGraphics::GetEmbedFontData(const PhysicalFontFace*, tools::Long* /*pDataLen*/) +const void* AquaSalGraphics::GetEmbedFontData(const vcl::font::PhysicalFontFace*, tools::Long* /*pDataLen*/) { return nullptr; } |