diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-07 23:56:20 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-15 06:41:41 +0200 |
| commit | fb50c96b4207f7effb9e656ae9c8ec8d25d625ca (patch) | |
| tree | 863edc818b69587be952d3c76331bb6ca74ec2c9 /vcl/qt5 | |
| parent | 574eec9036c5f185b3572ba1e0ca9d111eb361dc (diff) | |
VCL register common functions in PhysicalFontFace
This makes GetFontCapabilities and GetFontChatMap members of the
PhysicalFontFace. These are implemented in all the real font face
classes anyway. Also provide dummies for the PDF buildin fonts.
Change-Id: Icb8cb14480ce1e020977b8f69892095d787982ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102683
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Tested-by: Jenkins
Diffstat (limited to 'vcl/qt5')
| -rw-r--r-- | vcl/qt5/Qt5FontFace.cxx | 2 | ||||
| -rw-r--r-- | vcl/qt5/Qt5Graphics_Text.cxx | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/vcl/qt5/Qt5FontFace.cxx b/vcl/qt5/Qt5FontFace.cxx index d02e61955103..ce349099030a 100644 --- a/vcl/qt5/Qt5FontFace.cxx +++ b/vcl/qt5/Qt5FontFace.cxx @@ -162,7 +162,7 @@ Qt5FontFace::CreateFontInstance(const FontSelectPattern& rFSD) const return new Qt5Font(*this, rFSD); } -const FontCharMapRef& Qt5FontFace::GetFontCharMap() const +FontCharMapRef Qt5FontFace::GetFontCharMap() const { if (m_xCharMap.is()) return m_xCharMap; diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx index 26b53ff694b8..0fe602d1ce3f 100644 --- a/vcl/qt5/Qt5Graphics_Text.cxx +++ b/vcl/qt5/Qt5Graphics_Text.cxx @@ -72,15 +72,14 @@ FontCharMapRef Qt5Graphics::GetFontCharMap() const { if (!m_pTextStyle[0]) return FontCharMapRef(new FontCharMap()); - return static_cast<const Qt5FontFace*>(m_pTextStyle[0]->GetFontFace())->GetFontCharMap(); + return m_pTextStyle[0]->GetFontFace()->GetFontCharMap(); } bool Qt5Graphics::GetFontCapabilities(vcl::FontCapabilities& rFontCapabilities) const { if (!m_pTextStyle[0]) return false; - return static_cast<const Qt5FontFace*>(m_pTextStyle[0]->GetFontFace()) - ->GetFontCapabilities(rFontCapabilities); + return m_pTextStyle[0]->GetFontFace()->GetFontCapabilities(rFontCapabilities); } void Qt5Graphics::GetDevFontList(PhysicalFontCollection* pPFC) |