fontmanager.hxx is private to vcl

Change-Id: Iec1d1539db0b44d2ddc420cf500585098d4793fc

15 files changed, 19 insertions, 17 deletions

diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index e88745cbb007..828daee2e0d7 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -20,7 +20,7 @@
 
 #include "fontcache.hxx"
 #include "impfont.hxx"
-#include <vcl/fontmanager.hxx>
+#include "fontmanager.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/vclenum.hxx>
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index c506a901b89c..56b724069f43 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -30,7 +30,7 @@
 #include "impfont.hxx"
 #include "svdata.hxx"
 #include "generic/geninst.h"
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
 #include "vcl/strhelper.hxx"
 #include "vcl/ppdparser.hxx"
 #include <vcl/embeddedfontshelper.hxx>
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index abfa77578086..b153e5cf2112 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -63,7 +63,7 @@ typedef const FT_Vector* FT_Vector_CPtr;
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
 
 // the gamma table makes artificial bold look better for CJK glyphs
 static unsigned char aGammaTable[257];
diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx
index 851739a55898..84d3afcef575 100644
--- a/vcl/generic/print/common_gfx.cxx
+++ b/vcl/generic/print/common_gfx.cxx
@@ -23,7 +23,7 @@
 
 #include "generic/printergfx.hxx"
 #include "generic/printerjob.hxx"
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
 #include "vcl/strhelper.hxx"
 #include "vcl/printerinfomanager.hxx"
 
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index 07ac7466776e..118a0e2cfb3b 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -25,7 +25,7 @@
 
 #include "generic/printergfx.hxx"
 #include "fontsubset.hxx"
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
 
 #include <tools/gen.hxx>
 
diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx
index 7a65b64610f7..009f2ce40b76 100644
--- a/vcl/generic/print/glyphset.hxx
+++ b/vcl/generic/print/glyphset.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_GENERIC_PRINT_GLYPHSET_HXX
 #define INCLUDED_VCL_GENERIC_PRINT_GLYPHSET_HXX
 
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
 
 #include "osl/file.hxx"
 
diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx
index 5dc60f1de6fd..b8b9439c4a58 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/generic/print/text_gfx.cxx
@@ -24,7 +24,7 @@
 #include "glyphset.hxx"
 
 #include "generic/printergfx.hxx"
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
 #include "vcl/helper.hxx"
 
 #include "osl/thread.h"
diff --git a/vcl/inc/fontcache.hxx b/vcl/inc/fontcache.hxx
index d70b641695dd..abce7432fb15 100644
--- a/vcl/inc/fontcache.hxx
+++ b/vcl/inc/fontcache.hxx
@@ -22,9 +22,10 @@
 
 #include <rtl/ustring.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/fontmanager.hxx>
 #include <boost/unordered_map.hpp>
 
+#include "fontmanager.hxx"
+
 namespace psp
 {
 
diff --git a/include/vcl/fontmanager.hxx b/vcl/inc/fontmanager.hxx
index ca78376972a0..a727b84a58c5 100644
--- a/include/vcl/fontmanager.hxx
+++ b/vcl/inc/fontmanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_FONTMANAGER_HXX
-#define INCLUDED_VCL_FONTMANAGER_HXX
+#ifndef INCLUDED_VCL_INC_FONTMANAGER_HXX
+#define INCLUDED_VCL_INC_FONTMANAGER_HXX
 
 #include <boost/unordered_map.hpp>
 #include <map>
@@ -532,6 +532,6 @@ public:
 
 } // namespace
 
-#endif // INCLUDED_VCL_FONTMANAGER_HXX
+#endif // INCLUDED_VCL_INC_FONTMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 17912bcc023e..a80f75cfddf1 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -21,7 +21,7 @@
 #define INCLUDED_VCL_INC_GENERIC_GENPSPGRAPHICS_H
 
 
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
 
 #include "vclpluginapi.h"
 #include "salgdi.hxx"
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 27f87b0c4f58..8362c883fc7d 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -48,7 +48,7 @@
 
 #include <vcl/sysdata.hxx>
 #include "generic/printergfx.hxx"
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
 #include "vcl/jobdata.hxx"
 #include "vcl/printerinfomanager.hxx"
 #include "vcl/svapp.hxx"
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 67ab5a4df76b..14f6d7adad87 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -36,7 +36,7 @@
 #include <boost/unordered_map.hpp>
 
 #include "vcl/vclenum.hxx"
-#include "vcl/fontmanager.hxx"
+#include "fontmanager.hxx"
 #include <vcl/decoview.hxx>
 
 typedef struct _cairo_font_options cairo_font_options_t;
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 98da94498021..c1929378f28d 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -14,7 +14,7 @@
 #include <unx/gtk/gtkdata.hxx>
 #include <unx/gtk/gtkinst.hxx>
 #include <unx/gtk/gtkgdi.hxx>
-#include <vcl/fontmanager.hxx>
+#include "fontmanager.hxx"
 
 GtkStyleContext* GtkSalGraphics::mpButtonStyle = NULL;
 GtkStyleContext* GtkSalGraphics::mpEntryStyle = NULL;
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index dfbdb4293afb..97473130374a 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -28,7 +28,7 @@
 #include <unx/kde/kdedata.hxx>
 
 #include <vcl/settings.hxx>
-#include <vcl/fontmanager.hxx>
+#include "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 71f9c56c5c0a..a32291247d22 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -42,7 +42,8 @@
 
 #include <vcl/font.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/fontmanager.hxx>
+
+#include "fontmanager.hxx"
 
 #include <svdata.hxx>