diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-11-29 08:17:25 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-18 01:08:20 -0500 |
| commit | ac360e56999b50ec23a6915277131745366842c4 (patch) | |
| tree | 5a5b410045fc038b708a2470cf5ce7bdf6d244a4 | |
| parent | b43c98776c9ae04e88e21373e59f828c7465d43b (diff) | |
Drop assigned but never used parameter
Change-Id: If043960898b6388df7a5ecf5fe34172ed08bba9f
Reviewed-on: https://gerrit.libreoffice.org/31344
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
(cherry picked from commit 0f4777a19634e64db884f39611be0d5075ea24e3)
(cherry picked from commit 58740f2b26a34234633b4e756dc1bf3350b2b6eb)
| -rw-r--r-- | vcl/inc/unx/glyphcache.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 5 | ||||
| -rw-r--r-- | vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx index 28a3665e8e6d..f109e610a6d9 100644 --- a/vcl/inc/unx/glyphcache.hxx +++ b/vcl/inc/unx/glyphcache.hxx @@ -157,7 +157,7 @@ public: const FontSelectPattern& GetFontSelData() const { return maFontSelData; } - void GetFontMetric( ImplFontMetricDataRef&, long& rFactor ) const; + void GetFontMetric(ImplFontMetricDataRef&) const; const unsigned char* GetTable( const char* pName, sal_uLong* pLength ); int GetEmUnits() const { return maFaceFT->units_per_EM;} double GetStretch() { return mfStretch; } diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 9e75162b6caf..d53e18f2efbf 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -426,10 +426,7 @@ void CairoTextRender::GetFontMetric( ImplFontMetricDataRef& rxFontMetric, int nF return; if( mpFreetypeFont[nFallbackLevel] != nullptr ) - { - long rDummyFactor; - mpFreetypeFont[nFallbackLevel]->GetFontMetric( rxFontMetric, rDummyFactor ); - } + mpFreetypeFont[nFallbackLevel]->GetFontMetric(rxFontMetric); } bool CairoTextRender::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 67b8d62a66d5..54006e1aac01 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -569,7 +569,7 @@ FreetypeFont::~FreetypeFont() } -void FreetypeFont::GetFontMetric( ImplFontMetricDataRef& rxTo, long& rFactor ) const +void FreetypeFont::GetFontMetric(ImplFontMetricDataRef& rxTo) const { rxTo->FontAttributes::operator =(mpFontInfo->GetFontAttributes()); @@ -585,8 +585,6 @@ void FreetypeFont::GetFontMetric( ImplFontMetricDataRef& rxTo, long& rFactor ) c FT_Activate_Size( maSizeFT ); - rFactor = 0x100; - sal_uLong nHhea = 0; const uint8_t* pHheaBuf = mpFontInfo->GetTable("hhea", &nHhea); const std::vector<uint8_t> rHhea(pHheaBuf, pHheaBuf + nHhea); |