summaryrefslogtreecommitdiff
path: root/vcl/inc/impfontmetricdata.hxx
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2019-08-25 14:12:15 +0200
committerKhaled Hosny <khaledhosny@eglug.org>2019-08-27 20:38:19 +0200
commit60d4be99383b6fe13ca55572c43fd022bdc73ce8 (patch)
tree356ce7bd448e3f93a59f9c47e108b87c5ac58838 /vcl/inc/impfontmetricdata.hxx
parenta5cafe5d7e87c0f5ecdcffbbe58c66abcb97ac8e (diff)
Consolidate ImplCalcLineSpacing()
Move getting UPEM and font tables to the functions and use HarfBuzz API to get them. In the future we might stop reading the tables ourselves and use HarfBuzz metrics API instead. Change-Id: I3f4511628fd33200bae94cdcd96479ba3e6d2fba Reviewed-on: https://gerrit.libreoffice.org/78081 Tested-by: Jenkins Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl/inc/impfontmetricdata.hxx')
-rw-r--r--vcl/inc/impfontmetricdata.hxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx
index 73beb59722db..6250c9155436 100644
--- a/vcl/inc/impfontmetricdata.hxx
+++ b/vcl/inc/impfontmetricdata.hxx
@@ -32,6 +32,7 @@ typedef tools::SvRef<ImplFontMetricData> ImplFontMetricDataRef;
class OutputDevice;
class FontSelectPattern;
+class LogicalFontInstance;
class VCL_DLLPUBLIC ImplFontMetricData : public FontAttributes, public SvRefBase
{
@@ -92,9 +93,7 @@ public:
void ImplInitTextLineSize( const OutputDevice* pDev );
void ImplInitAboveTextLineSize();
void ImplInitFlags( const OutputDevice* pDev );
- void ImplCalcLineSpacing(const std::vector<uint8_t>& rHhea,
- const std::vector<uint8_t>& rOS_2,
- int nUPEM);
+ void ImplCalcLineSpacing(LogicalFontInstance *pFontInstance);
private:
bool ShouldUseWinMetrics(const vcl::TTGlobalFontInfo& rInfo);