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

[Noel Grandin]

 vcl/inc/sft.hxx                |    2 +-
 vcl/source/font/fontmetric.cxx |    2 +-
 vcl/source/fontsubset/sft.cxx  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8cca31aaba11f03d746cafeec381968ce1418346
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Tue Sep 5 13:36:08 2017 +0200

    rename GetTTFontMterics -> GetTTFontMetrics
    
    Change-Id: I9952ddf0b1256e768a664f4da70455245cf67f41
    Reviewed-on: https://gerrit.libreoffice.org/41934
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 546e97e4cf52..04ec36d0e813 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -447,7 +447,7 @@ namespace vcl
  * @ingroup sft
  *
  */
- void GetTTFontMterics(const std::vector<uint8_t>& hhea,
+ void GetTTFontMetrics(const std::vector<uint8_t>& hhea,
                        const std::vector<uint8_t>& os2,
                        TTGlobalFontInfo *info);
 
diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index 7371c1dc7c74..23954b3c67d9 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -416,7 +416,7 @@ void ImplFontMetricData::ImplCalcLineSpacing(const std::vector<uint8_t>& rHheaDa
 
     vcl::TTGlobalFontInfo rInfo;
     memset(&rInfo, 0, sizeof(vcl::TTGlobalFontInfo));
-    GetTTFontMterics(rHheaData, rOS2Data, &rInfo);
+    GetTTFontMetrics(rHheaData, rOS2Data, &rInfo);
 
     // Try hhea table first.
     if (rInfo.ascender || rInfo.descender)
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 2f44b0fbcdf2..864158aba8ec 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2385,7 +2385,7 @@ TTSimpleGlyphMetrics *GetTTSimpleGlyphMetrics(TrueTypeFont *ttf, const sal_uInt1
 }
 
 // TODO, clean up table parsing and re-use it elsewhere in this file.
-void GetTTFontMterics(const std::vector<uint8_t>& hhea,
+void GetTTFontMetrics(const std::vector<uint8_t>& hhea,
                       const std::vector<uint8_t>& os2,
                       TTGlobalFontInfo *info)
 {