summaryrefslogtreecommitdiff
path: root/vcl/win
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2020-08-14 04:05:56 +0200
committerJan-Marek Glogowski <glogow@fbihome.de>2020-08-15 13:18:05 +0200
commit4c05d61a4393d38834254f03a83aa01b7582060b (patch)
tree59e2d51d9ba1e9abc346e6d3f35c851617048077 /vcl/win
parent71c160de978f615fb7e68fb7413c1d907ae53072 (diff)
Refactor vcl::TrueTypeFont class member access
This hides all members, which are needed to create a new TTF font by calling vcl::CreateTTFromTTGlyphs, and adds an abstraction to access individual font tables. This is needed, because Qt5 just allows access to the raw font based on font tables. Change-Id: I74e34cf1aa2529a06ec5ec53aa2be751e58982ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100717 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/win')
-rw-r--r--vcl/win/gdi/salfont.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index be4af132db1d..be55c9df0b40 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -1546,6 +1546,7 @@ public:
SFErrCodes open(void const * pBuffer, sal_uInt32 nLen, sal_uInt32 nFaceNum);
TrueTypeFont * get() const { return m_pFont; }
+ TrueTypeFont* operator->() { return m_pFont; }
private:
TrueTypeFont * m_pFont;
@@ -1748,7 +1749,7 @@ void WinSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont,
if( nRC != SFErrCodes::Ok )
return;
- int nGlyphs = GetTTGlyphCount( aSftTTF.get() );
+ int nGlyphs = aSftTTF->glyphCount();
if( nGlyphs > 0 )
{
rWidths.resize(nGlyphs);