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

[Stephan Bergmann]

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

New commits:
commit ff180af5cb4f0c527cdf5c5cf18bbf6db0cea14c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 23 22:00:59 2016 +0100

    loplugin:externandnotdefined
    
    Change-Id: Ic7866850453a26501e957747bf68f6ffd1b84907

diff --git a/vcl/inc/unx/cairotextrender.hxx b/vcl/inc/unx/cairotextrender.hxx
index 1aeaf06..0735d059 100644
--- a/vcl/inc/unx/cairotextrender.hxx
+++ b/vcl/inc/unx/cairotextrender.hxx
@@ -26,6 +26,7 @@
 
 #include <deque>
 
+class FontConfigFontOptions;
 class FreetypeFont;
 class GlyphCache;
 typedef struct _cairo cairo_t;
@@ -94,6 +95,8 @@ public:
 #endif
 };
 
+FontConfigFontOptions* GetFCFontOptions( const FontAttributes& rFontAttributes, int nSize);
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 9bbfaa7..55d5e49 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -148,8 +148,6 @@ bool CairoTextRender::setFont( const FontSelectPattern *pEntry, int nFallbackLev
     return false;
 }
 
-FontConfigFontOptions* GetFCFontOptions( const FontAttributes& rFontAttributes, int nSize);
-
 void FreetypeFontInstance::HandleFontOptions()
 {
     if( !mpFreetypeFont )
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index f8dc3da..9a72bf3 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -20,6 +20,7 @@
 
 #include <vcl/fontcharmap.hxx>
 
+#include <unx/cairotextrender.hxx>
 #include "unx/freetype_glyphcache.hxx"
 
 #include <vcl/svapp.hxx>
@@ -588,8 +589,6 @@ void FreetypeFont::SetFontOptions(const std::shared_ptr<FontConfigFontOptions>&
         mnLoadFlags |= FT_LOAD_NO_BITMAP;
 }
 
-extern FontConfigFontOptions* GetFCFontOptions( const FontAttributes& rFontAttributes, int nSize);
-
 const std::shared_ptr<FontConfigFontOptions>& FreetypeFont::GetFontOptions() const
 {
     if (!mxFontOptions)