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/inc/svdata.hxx | |
| 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/inc/svdata.hxx')
| -rw-r--r-- | vcl/inc/svdata.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 628f5d098622..1995df30ba95 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -52,7 +52,7 @@ struct ImplPostEventData; struct ImplTimerData; struct ImplIdleData; struct ImplConfigData; -class ImplDirectFontSubstitution; +namespace vcl::font { class DirectFontSubstitution; } struct ImplHotKey; struct ImplEventHook; class Point; @@ -224,7 +224,7 @@ struct ImplSVGDIData std::shared_ptr<PhysicalFontCollection> mxScreenFontList; // Screen-Font-List std::shared_ptr<ImplFontCache> mxScreenFontCache; // Screen-Font-Cache lru_scale_cache maScaleCache = lru_scale_cache(10); // Cache for scaled images - ImplDirectFontSubstitution* mpDirectFontSubst = nullptr; // Font-Substitutions defined in Tools->Options->Fonts + vcl::font::DirectFontSubstitution* mpDirectFontSubst = nullptr; // Font-Substitutions defined in Tools->Options->Fonts std::unique_ptr<GraphicConverter> mxGrfConverter; // Converter for graphics tools::Long mnAppFontX = 0; // AppFont X-Numenator for 40/tel Width tools::Long mnAppFontY = 0; // AppFont Y-Numenator for 80/tel Height |