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

[Chris Sherlock]

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

New commits:
commit 511bccbf890d3cc9c993375b372ae96460ee6f32
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Thu Jan 14 14:41:11 2016 +1100

    vcl: change ServerFont::FetchFontMetric to GetFontMetric
    
    Change-Id: I935f69d275d2073d8f0924392a5aa1fb2567cedf

diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 463c259..ea756a5 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -162,7 +162,7 @@ public:
 
     const FontSelectPattern& GetFontSelData() const      { return maFontSelData; }
 
-    void                    FetchFontMetric( ImplFontMetricData&, long& rFactor ) const;
+    void                    GetFontMetric( ImplFontMetricData&, long& rFactor ) 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 398b756..4476a44 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -463,7 +463,7 @@ CairoTextRender::GetFontMetric( ImplFontMetricData *pFontMetric, int nFallbackLe
     if( mpServerFont[nFallbackLevel] != nullptr )
     {
         long rDummyFactor;
-        mpServerFont[nFallbackLevel]->FetchFontMetric( *pFontMetric, rDummyFactor );
+        mpServerFont[nFallbackLevel]->GetFontMetric( *pFontMetric, rDummyFactor );
     }
 }
 
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index 5a1193a..f2638f8 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -614,7 +614,7 @@ ServerFont::~ServerFont()
 }
 
 
-void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const
+void ServerFont::GetFontMetric( ImplFontMetricData& rTo, long& rFactor ) const
 {
     static_cast< FontAttributes& >(rTo) = mpFontInfo->GetFontAttributes();