summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2021-09-14 00:17:06 +1000
committerMike Kaganski <mike.kaganski@collabora.com>2021-10-08 19:22:59 +0200
commit3f5fb07565d0e08773ddfcda4d5acbb1446aa2f2 (patch)
treec0830ab69aac8f1424e6788448bb68690883ab9e /include
parent677434a572b8f07a386937b2f7edf2e9b801bbd0 (diff)
vcl: test PhysicalFontCollection and move to vcl::font namespace
- tested PhysicalFontCollection, noted odd behaviour with search names and normalization - moved PhysicalFontCollection.hxx to vcl/inc/font - moved PhysicalFontCollection into vcl::font namespace Note that I needed to regenerate the pch file otherwise errors were generated. Change-Id: Ifa0c7b871c40687bd15002565d2f7a3e408218f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122036 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include')
-rw-r--r--include/vcl/outdev.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index f44a9d5e3b70..50ee0324af3d 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -69,7 +69,6 @@ struct ImplOutDevData;
class LogicalFontInstance;
struct SystemGraphicsData;
class ImplFontCache;
-class PhysicalFontCollection;
class ImplMultiTextLineInfo;
class SalGraphics;
class Gradient;
@@ -105,6 +104,7 @@ namespace vcl
class WindowOutputDevice;
namespace font {
struct Feature;
+ class PhysicalFontCollection;
class PhysicalFontFaceCollection;
}
@@ -256,7 +256,7 @@ private:
mutable bool mbEnableRTL : 1;
protected:
- mutable std::shared_ptr<PhysicalFontCollection> mxFontCollection;
+ mutable std::shared_ptr<vcl::font::PhysicalFontCollection> mxFontCollection;
mutable std::shared_ptr<ImplFontCache> mxFontCache;
/** @name Initialization and accessor functions