vcl: split out outdev.h into seperate headers

outdev.h is a hodge-podge of functions - font substitution and an
internal state struct for OutputDevice. I have split these into:

- font/fontsubstitution: FontSubstitution,
GlyphFallbackFontSubstitution.hxx and PreMatchFontSubstitution.hxx
(all three define pure virtual base classes for later reuse)
- font/DirectFontSubstitution.hxx: incorporates FontSubstEntry and
DirectFontSubstitution
- ImplOutDevData.hxx contains it's own class

Each fo the classes has been moved to the vcl::font namespace.

As outdev.h is now no longer, this has meant that I have had to
regenerate vcl/inc/pch/precompiled_vcl.hxx

Change-Id: Iaa92fa21271faff46f2a8a0f6488e01434c142db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121997
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

3 files changed, 5 insertions, 6 deletions

diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx b/vcl/win/gdi/DWriteTextRenderer.cxx
index 0940b4005af6..177f1e7c3384 100644
--- a/vcl/win/gdi/DWriteTextRenderer.cxx
+++ b/vcl/win/gdi/DWriteTextRenderer.cxx
@@ -21,7 +21,7 @@
 
 #include <win/salgdi.h>
 #include <win/saldata.hxx>
-#include <outdev.h>
+#include <ImplOutDevData.hxx>
 
 #include <win/DWriteTextRenderer.hxx>
 
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 842f5ed8830f..522793f68580 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -53,10 +53,10 @@
 
 #include <font/FontSelectPattern.hxx>
 #include <fontsubset.hxx>
-#include <outdev.h>
 #include <font/PhysicalFontFaceCollection.hxx>
 #include <PhysicalFontCollection.hxx>
 #include <font/PhysicalFontFace.hxx>
+#include <font/fontsubstitution.hxx>
 #include <sft.hxx>
 #include <win/saldata.hxx>
 #include <win/salgdi.h>
@@ -158,14 +158,14 @@ RawFontData::RawFontData( HDC hDC, DWORD nTableTag )
 namespace {
 
 class WinPreMatchFontSubstititution
-:    public ImplPreMatchFontSubstitution
+:    public vcl::font::PreMatchFontSubstitution
 {
 public:
     bool FindFontSubstitute(vcl::font::FontSelectPattern&) const override;
 };
 
 class WinGlyphFallbackSubstititution
-:    public ImplGlyphFallbackFontSubstitution
+:    public vcl::font::GlyphFallbackFontSubstitution
 {
 public:
     explicit WinGlyphFallbackSubstititution()
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 0db736c256c0..68ee4aa45865 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -1,4 +1,3 @@
-
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
@@ -34,7 +33,7 @@
 #include <win/salgdi.h>
 #include <win/saldata.hxx>
 #include <win/wingdiimpl.hxx>
-#include <outdev.h>
+#include <ImplOutDevData.hxx>
 
 #include <win/DWriteTextRenderer.hxx>
 #include <win/scoped_gdi.hxx>