[Libreoffice-commits] core.git: vcl/inc vcl/unx

[Khaled Hosny]

 vcl/inc/unx/glyphcache.hxx                     |    2 +-
 vcl/unx/generic/gdi/cairotextrender.cxx        |    5 +----
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |    4 +---
 3 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 0f4777a19634e64db884f39611be0d5075ea24e3
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Tue Nov 29 08:17:25 2016 +0200

    Drop assigned but never used parameter
    
    Change-Id: If043960898b6388df7a5ecf5fe34172ed08bba9f
    Reviewed-on: https://gerrit.libreoffice.org/31344
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>

diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 28a3665..f109e61 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 9e75162..d53e18f 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 156a196..4320892 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);