vcl/inc/fontmanager.hxx | 511 -------------------------
vcl/inc/unx/fontcache.hxx | 2
vcl/inc/unx/fontmanager.hxx | 511 +++++++++++++++++++++++++
vcl/inc/unx/genpspgraphics.h | 2
vcl/unx/generic/fontmanager/fontconfig.cxx | 2
vcl/unx/generic/fontmanager/fontmanager.cxx | 2
vcl/unx/generic/gdi/salgdi3.cxx | 2
vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 2
vcl/unx/generic/print/common_gfx.cxx | 2
vcl/unx/generic/print/glyphset.cxx | 2
vcl/unx/generic/print/glyphset.hxx | 2
vcl/unx/generic/print/text_gfx.cxx | 2
vcl/unx/gtk/salnativewidgets-gtk.cxx | 2
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 2
vcl/unx/kde/salnativewidgets-kde.cxx | 2
vcl/unx/kde4/KDESalFrame.cxx | 2
16 files changed, 525 insertions(+), 525 deletions(-)
New commits:
commit d8ecd82f310108c10ad0a2dd9586d4596dd4c96f
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Thu Jan 14 10:38:25 2016 +1100
vcl: fontmanager.hxx is a private Unix header
Change-Id: I06f3e941bfb1af861298d4fbf666d270c5bac051
diff --git a/vcl/inc/unx/fontcache.hxx b/vcl/inc/unx/fontcache.hxx
index 233540e..9c40040 100644
--- a/vcl/inc/unx/fontcache.hxx
+++ b/vcl/inc/unx/fontcache.hxx
@@ -24,7 +24,7 @@
#include <vcl/dllapi.h>
#include <unordered_map>
-#include "fontmanager.hxx"
+#include "unx/fontmanager.hxx"
namespace psp
{
diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
similarity index 100%
rename from vcl/inc/fontmanager.hxx
rename to vcl/inc/unx/fontmanager.hxx
diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
index 850270c..15f0041 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -23,7 +23,7 @@
#include <vcl/vclenum.hxx>
#include <config_cairo_canvas.h>
-#include "fontmanager.hxx"
+#include "unx/fontmanager.hxx"
#include "salgdi.hxx"
#include "sallayout.hxx"
#include "vclpluginapi.h"
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 6d45e87..611a2ed 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -19,7 +19,7 @@
#include "unx/fontcache.hxx"
#include "impfont.hxx"
-#include "fontmanager.hxx"
+#include "unx/fontmanager.hxx"
#include <vcl/svapp.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/vclenum.hxx>
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx
b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 35e4889..1b895c8 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -30,7 +30,7 @@
#include "impfontcharmap.hxx"
#include "svdata.hxx"
#include "unx/geninst.h"
-#include "fontmanager.hxx"
+#include "unx/fontmanager.hxx"
#include "vcl/strhelper.hxx"
#include "vcl/ppdparser.hxx"
#include <vcl/embeddedfontshelper.hxx>
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 568695c..c4e3037 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -42,7 +42,7 @@
#include <vcl/metric.hxx>
#include <vcl/fontcharmap.hxx>
-#include "fontmanager.hxx"
+#include "unx/fontmanager.hxx"
#include "impfont.hxx"
#include "gcach_xpeer.hxx"
#include "unx/genpspgraphics.h"
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index a9d1287..5a1193a 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -67,7 +67,7 @@
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/mman.h>
-#include "fontmanager.hxx"
+#include "unx/fontmanager.hxx"
#include "impfontcharmap.hxx"
static FT_Library aLibFT = nullptr;
diff --git a/vcl/unx/generic/print/common_gfx.cxx
b/vcl/unx/generic/print/common_gfx.cxx
index 3034e3e..105de97 100644
--- a/vcl/unx/generic/print/common_gfx.cxx
+++ b/vcl/unx/generic/print/common_gfx.cxx
@@ -26,7 +26,7 @@
#include "unx/printergfx.hxx"
#include "unx/printerjob.hxx"
-#include "fontmanager.hxx"
+#include "unx/fontmanager.hxx"
#include "vcl/strhelper.hxx"
#include "vcl/printerinfomanager.hxx"
diff --git a/vcl/unx/generic/print/glyphset.cxx
b/vcl/unx/generic/print/glyphset.cxx
index 7bd8e03..d75d942 100644
--- a/vcl/unx/generic/print/glyphset.cxx
+++ b/vcl/unx/generic/print/glyphset.cxx
@@ -24,7 +24,7 @@
#include "unx/printergfx.hxx"
#include "fontsubset.hxx"
-#include "fontmanager.hxx"
+#include "unx/fontmanager.hxx"
#include <tools/gen.hxx>
diff --git a/vcl/unx/generic/print/glyphset.hxx
b/vcl/unx/generic/print/glyphset.hxx
index 4f68e50..04f8f21 100644
--- a/vcl/unx/generic/print/glyphset.hxx
+++ b/vcl/unx/generic/print/glyphset.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_GENERIC_PRINT_GLYPHSET_HXX
#define INCLUDED_VCL_GENERIC_PRINT_GLYPHSET_HXX
-#include "fontmanager.hxx"
+#include "unx/fontmanager.hxx"
#include "osl/file.hxx"
diff --git a/vcl/unx/generic/print/text_gfx.cxx
b/vcl/unx/generic/print/text_gfx.cxx
index f5b1e7e..cfe4b8c 100644
--- a/vcl/unx/generic/print/text_gfx.cxx
+++ b/vcl/unx/generic/print/text_gfx.cxx
@@ -23,7 +23,7 @@
#include "glyphset.hxx"
#include "unx/printergfx.hxx"
-#include "fontmanager.hxx"
+#include "unx/fontmanager.hxx"
#include "vcl/helper.hxx"
#include "osl/thread.h"
diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index 32b4fe5..0718b906 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -40,7 +40,7 @@
#include "vcl/vclenum.hxx"
#include <vcl/settings.hxx>
-#include "fontmanager.hxx"
+#include "unx/fontmanager.hxx"
#include <vcl/decoview.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index b8740b5..bea9183 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -16,7 +16,7 @@
#include <unx/gtk/gtkgdi.hxx>
#include <vcl/decoview.hxx>
#include <vcl/settings.hxx>
-#include "fontmanager.hxx"
+#include "unx/fontmanager.hxx"
#include "cairo_gtk3_cairo.hxx"
#include <boost/optional.hpp>
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx
b/vcl/unx/kde/salnativewidgets-kde.cxx
index 0d1455f..0f1b8bd 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -29,7 +29,7 @@
#include "unx/pixmap.hxx"
#include <vcl/settings.hxx>
-#include "fontmanager.hxx"
+#include "unx/fontmanager.hxx"
#include <vcl/vclenum.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index d02779a..1d945a5 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -41,7 +41,7 @@
#include <vcl/font.hxx>
#include <vcl/settings.hxx>
-#include "fontmanager.hxx"
+#include "unx/fontmanager.hxx"
#include <svdata.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
