diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-10-06 16:35:09 +1100 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-10-08 19:19:56 +0200 |
| commit | 677434a572b8f07a386937b2f7edf2e9b801bbd0 (patch) | |
| tree | 52b10a20cf6956572aaddd1c986b27787c028859 /vcl/unx/generic/fontmanager | |
| parent | 49e02381a301e4634eb7077fcb08eb4e8a95fb08 (diff) | |
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>
Diffstat (limited to 'vcl/unx/generic/fontmanager')
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontsubst.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/generic/fontmanager/fontsubst.cxx b/vcl/unx/generic/fontmanager/fontsubst.cxx index 9559a252b089..7945da6179c4 100644 --- a/vcl/unx/generic/fontmanager/fontsubst.cxx +++ b/vcl/unx/generic/fontmanager/fontsubst.cxx @@ -20,7 +20,7 @@ #include <sal/config.h> #include <unx/geninst.h> -#include <outdev.h> +#include <font/fontsubstitution.hxx> #include <unx/fontmanager.hxx> #include <PhysicalFontCollection.hxx> @@ -29,7 +29,7 @@ namespace { class FcPreMatchSubstitution -: public ImplPreMatchFontSubstitution +: public vcl::font::PreMatchFontSubstitution { public: bool FindFontSubstitute( vcl::font::FontSelectPattern& ) const override; @@ -40,7 +40,7 @@ private: }; class FcGlyphFallbackSubstitution -: public ImplGlyphFallbackFontSubstitution +: public vcl::font::GlyphFallbackFontSubstitution { // TODO: add a cache public: |