Rename and move header next to other font headers

Change-Id: I5485817b5a6c2e9538ed6fb00893663d09e7fa26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153869
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@libreoffice.org>

12 files changed, 12 insertions, 12 deletions

diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 427504fe18ea..297523b8b356 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -23,7 +23,7 @@
 #include <vcl/fontcharmap.hxx>
 #include <basegfx/range/b2ibox.hxx>
 #include <headless/svpgdi.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
 #include <sallayout.hxx>
 
 void SvpSalGraphics::SetFont(LogicalFontInstance* pIFSD, int nFallbackLevel)
diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/font/FontMetricData.hxx
index d4b44bb60101..000a5a250bbd 100644
--- a/vcl/inc/impfontmetricdata.hxx
+++ b/vcl/inc/font/FontMetricData.hxx
@@ -24,7 +24,7 @@
 #include <vcl/dllapi.h>
 #include <tools/long.hxx>
 #include <tools/ref.hxx>
-#include "fontattributes.hxx"
+#include <fontattributes.hxx>
 
 #include <vector>
 
diff --git a/vcl/inc/font/LogicalFontInstance.hxx b/vcl/inc/font/LogicalFontInstance.hxx
index a50df83d7c48..2261246b069b 100644
--- a/vcl/inc/font/LogicalFontInstance.hxx
+++ b/vcl/inc/font/LogicalFontInstance.hxx
@@ -30,7 +30,7 @@
 #include <tools/degree.hxx>
 
 #include <font/FontSelectPattern.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
 #include <glyphid.hxx>
 
 #include <optional>
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 5164a71cc51d..d341c1f8b2f9 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -34,7 +34,7 @@
 #include <salgdi.hxx>
 #include <sallayout.hxx>
 #include <unx/cairotextrender.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
 
 #include <headless/SvpGraphicsBackend.hxx>
 #include <headless/CairoCommon.hxx>
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 4b5faaab7c81..06b9b08b431d 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -48,7 +48,7 @@
 
 
 #include <font/LogicalFontInstance.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
 #include <font/PhysicalFontFace.hxx>
 #include <salgdi.hxx>
 
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index b273eab6434d..debdd34bb00f 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -23,7 +23,7 @@
 
 #include <vcl/outdev.hxx>
 
-#include "impfontmetricdata.hxx"
+#include "font/FontMetricData.hxx"
 #include "salgdiimpl.hxx"
 #include "sallayout.hxx"
 #include "SalGradient.hxx"
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index dcb3c2be9361..cd8f31ef0df2 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -34,7 +34,7 @@
 
 #include <fontattributes.hxx>
 #include <font/LogicalFontInstance.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
 
 #include <unordered_map>
 
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 333f55113c2f..4af4b28ffa2c 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -42,7 +42,7 @@
 #include <quartz/ctfonts.hxx>
 #include <fontsubset.hxx>
 #include <impfont.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
 #include <font/fontsubstitution.hxx>
 #include <font/PhysicalFontCollection.hxx>
 
diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index 0667dddf31ec..da927c8b4bb2 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -30,7 +30,7 @@
 #include <font/FontSelectPattern.hxx>
 #include <font/PhysicalFontFace.hxx>
 #include <font/LogicalFontInstance.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
 #include <sft.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx b/vcl/unx/generic/gdi/freetypetextrender.cxx
index 75fa18146dd7..3a6891c7f8a8 100644
--- a/vcl/unx/generic/gdi/freetypetextrender.cxx
+++ b/vcl/unx/generic/gdi/freetypetextrender.cxx
@@ -34,7 +34,7 @@
 #include <unx/fc_fontoptions.hxx>
 #include <unx/freetype_glyphcache.hxx>
 #include <font/PhysicalFontFace.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
 
 #include <sallayout.hxx>
 
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 6cf66ac49aa3..24d0515c3b03 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -45,7 +45,7 @@
 #include <langboost.hxx>
 #include <font/LogicalFontInstance.hxx>
 #include <fontattributes.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
 #include <font/FontSelectPattern.hxx>
 #include <font/PhysicalFontCollection.hxx>
 #include <font/PhysicalFontFace.hxx>
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 37afd63123b8..f4a3029a454f 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -71,7 +71,7 @@
 #include <win/winlayout.hxx>
 #include <win/wingdiimpl.hxx>
 #include <impfontcharmap.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
 #include <impglyphitem.hxx>
 
 #if HAVE_FEATURE_SKIA