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

[Chris Sherlock]

 vcl/inc/cairotextrender.hxx                |  134 -----------------------------
 vcl/inc/headless/svpcairotextrender.hxx    |    2 
 vcl/inc/unx/cairotextrender.hxx            |  131 ++++++++++++++++++++++++++++
 vcl/unx/generic/gdi/cairotextrender.cxx    |    2 
 vcl/unx/generic/gdi/x11cairotextrender.hxx |    2 
 5 files changed, 134 insertions(+), 137 deletions(-)

New commits:
commit 45178c9ba5730bfb1de2604c9048d27f6297faff
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Wed Jan 27 21:23:39 2016 +1100

    vcl: cairotextrender.hxx is a private Unix header
    
    Change-Id: I3f2dbce1c162a2db94a9c2f9d23c83209b1d82bb

diff --git a/vcl/inc/headless/svpcairotextrender.hxx b/vcl/inc/headless/svpcairotextrender.hxx
index 1a0a1ec..9e3c837 100644
--- a/vcl/inc/headless/svpcairotextrender.hxx
+++ b/vcl/inc/headless/svpcairotextrender.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_VCL_UNX_GTK3_GDI_GTK3CAIROTEXTRENDER_HXX
 #define INCLUDED_VCL_UNX_GTK3_GDI_GTK3CAIROTEXTRENDER_HXX
 
-#include "cairotextrender.hxx"
+#include "unx/cairotextrender.hxx"
 
 class SvpSalGraphics;
 
diff --git a/vcl/inc/cairotextrender.hxx b/vcl/inc/unx/cairotextrender.hxx
similarity index 97%
rename from vcl/inc/cairotextrender.hxx
rename to vcl/inc/unx/cairotextrender.hxx
index a645c90..2402050 100644
--- a/vcl/inc/cairotextrender.hxx
+++ b/vcl/inc/unx/cairotextrender.hxx
@@ -20,19 +20,16 @@
 #ifndef INCLUDED_VCL_INC_UNX_CAIROTEXTRENDER_HXX
 #define INCLUDED_VCL_INC_UNX_CAIROTEXTRENDER_HXX
 
-#include "textrender.hxx"
 #include <vcl/region.hxx>
+
+#include "textrender.hxx"
+
 #include <deque>
 
 typedef struct FT_FaceRec_* FT_Face;
 
 class ServerFont;
 class GlyphCache;
-class ImplLayoutArgs;
-class ServerFontLayout;
-class PhysicalFontCollection;
-class PhysicalFontFace;
-class ImplFontMetricData;
 typedef struct _cairo cairo_t;
 
 class VCL_DLLPUBLIC CairoFontsCache
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index ab7fa40..5ea9d3e 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "cairotextrender.hxx"
+#include "unx/cairotextrender.hxx"
 
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <vcl/settings.hxx>
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.hxx b/vcl/unx/generic/gdi/x11cairotextrender.hxx
index 5d210cf..0c66738 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.hxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_UNX_GENERIC_GDI_X11CAIROTEXTRENDER_HXX
 #define INCLUDED_VCL_UNX_GENERIC_GDI_X11CAIROTEXTRENDER_HXX
 
-#include "cairotextrender.hxx"
+#include "unx/cairotextrender.hxx"
 
 #include "unx/saldata.hxx"
 #include "unx/saldisp.hxx"