vcl: split classes out of metric.hxx

Change-Id: Id3b155abec7b7a2ff43d0a35e98709f5ee51c6b9
Reviewed-on: https://gerrit.libreoffice.org/21069
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>

16 files changed, 18 insertions, 2 deletions

diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index f8cbc7d0c33e..86dfab3b0a9d 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -34,6 +34,7 @@
 #include "vcl/strhelper.hxx"
 #include "vcl/ppdparser.hxx"
 #include <vcl/embeddedfontshelper.hxx>
+#include <vcl/fontcharmap.hxx>
 
 #include "tools/urlobj.hxx"
 #include "tools/stream.hxx"
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index fe15d11fc335..686be0060ad0 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+
+#include <vcl/fontcharmap.hxx>
+
 #include "gcach_ftyp.hxx"
 
 #include "vcl/svapp.hxx"
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index f892eca01197..096536a2703c 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -40,6 +40,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/sysdata.hxx>
+#include <vcl/fontcharmap.hxx>
 #include <config_cairo_canvas.h>
 
 #include "fontsubset.hxx"
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 785461d1fc39..df156ed5f33e 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/types.h>
+#include <vcl/fontcharmap.hxx>
 #include <basegfx/range/b2ibox.hxx>
 #include "headless/svpgdi.hxx"
 #include <config_cairo_canvas.h>
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index b8b7d74cd5b2..c58c17a5e67d 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -28,6 +28,7 @@
 #include "PhysicalFontFace.hxx"
 #include "impfont.hxx"
 #include <vcl/fontcapabilities.hxx>
+#include <vcl/fontcharmap.hxx>
 
 #include <memory>
 #include <unordered_set>
diff --git a/vcl/qa/cppunit/fontcharmap.cxx b/vcl/qa/cppunit/fontcharmap.cxx
index 17923afc983e..4453ffa4cb95 100644
--- a/vcl/qa/cppunit/fontcharmap.cxx
+++ b/vcl/qa/cppunit/fontcharmap.cxx
@@ -12,7 +12,7 @@
 #include <osl/file.hxx>
 #include <osl/process.h>
 
-#include <vcl/metric.hxx>
+#include <vcl/fontcharmap.hxx>
 
 class VclFontCharMapTest : public test::BootstrapFixture
 {
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index c36eacf1da08..ca83b61e3748 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -33,6 +33,7 @@
 #include <rtl/strbuf.hxx>
 
 #include <vcl/metric.hxx>
+#include <vcl/fontcharmap.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/sysdata.hxx>
 
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index dbb9ad3a7a34..73f0489da7e5 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -37,6 +37,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <memory>
+#include <vcl/fontcharmap.hxx>
 
 // MS Windows defines
 
diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx
index e8c68fc3cb5d..f99bed10dc11 100644
--- a/vcl/source/gdi/impfont.cxx
+++ b/vcl/source/gdi/impfont.cxx
@@ -15,7 +15,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <vcl/metric.hxx>
+#include <vcl/fontcharmap.hxx>
 #include <outfont.hxx>
 #include <impfont.hxx>
 
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index f328a4f7e64b..237cca2d94ce 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -26,6 +26,7 @@
 #include <vcl/edit.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/sysdata.hxx>
+#include <vcl/fontcharmap.hxx>
 
 #include "sallayout.hxx"
 #include "svdata.hxx"
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 6a04eb88313d..b396e535cead 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -32,6 +32,7 @@
 
 #include <comphelper/processfactory.hxx>
 
+#include <vcl/textrectinfo.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/bmpacc.hxx>
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 1e273749f073..962bd8ae51b3 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -22,6 +22,7 @@
 #include <brdwin.hxx>
 #include <window.h>
 
+#include <vcl/textrectinfo.hxx>
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/syswin.hxx>
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 6f84fbcd4778..600a1a88e1fe 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -24,6 +24,7 @@
 #include <brdwin.hxx>
 #include <window.h>
 
+#include <vcl/textrectinfo.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 419dc58ceec2..7727e12c34bf 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -23,6 +23,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/fontcharmap.hxx>
 
 #include "generic/printergfx.hxx"
 #include "generic/genpspgraphics.h"
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 27e339a45ff1..ae63464b2a5a 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -40,6 +40,7 @@
 #include <vcl/printerinfomanager.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/metric.hxx>
+#include <vcl/fontcharmap.hxx>
 
 #include "fontmanager.hxx"
 #include "impfont.hxx"
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index dba8568710ee..1f83835ceba9 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -40,6 +40,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/metric.hxx>
+#include <vcl/fontcharmap.hxx>
 
 #include "fontsubset.hxx"
 #include "outdev.h"