diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-09-26 08:17:26 +1000 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-09-27 22:13:02 +0200 |
| commit | 2f51bf35daa7d2e1612647e1768c443028e87c39 (patch) | |
| tree | 95fd29350da03666c21319d8d2b275a479ad94b2 /vcl/inc/impfontcache.hxx | |
| parent | 5e4e1cdb1e14354b42838e1dfcf82873b3071896 (diff) | |
vcl: move FontSelectPattern to own file and into vcl::font namespace
Change-Id: I2f01a8e67c52ece9b434777203aa9fbc9ac8be02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122613
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'vcl/inc/impfontcache.hxx')
| -rw-r--r-- | vcl/inc/impfontcache.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/inc/impfontcache.hxx b/vcl/inc/impfontcache.hxx index f3d8736add41..72e7a44dc9a2 100644 --- a/vcl/inc/impfontcache.hxx +++ b/vcl/inc/impfontcache.hxx @@ -27,7 +27,7 @@ #include <tools/gen.hxx> #include <vcl/glyphitem.hxx> -#include "fontselect.hxx" +#include "font/FontSelectPattern.hxx" class Size; namespace vcl { class Font; } @@ -66,15 +66,15 @@ class ImplFontCache { private: // cache of recently used font instances - struct IFSD_Equal { bool operator()( const FontSelectPattern&, const FontSelectPattern& ) const; }; - struct IFSD_Hash { size_t operator()( const FontSelectPattern& ) const; }; - typedef o3tl::lru_map<FontSelectPattern, rtl::Reference<LogicalFontInstance>, IFSD_Hash, IFSD_Equal> FontInstanceList; + struct IFSD_Equal { bool operator()( const vcl::font::FontSelectPattern&, const vcl::font::FontSelectPattern& ) const; }; + struct IFSD_Hash { size_t operator()( const vcl::font::FontSelectPattern& ) const; }; + typedef o3tl::lru_map<vcl::font::FontSelectPattern, rtl::Reference<LogicalFontInstance>, IFSD_Hash, IFSD_Equal> FontInstanceList; LogicalFontInstance* mpLastHitCacheEntry; ///< keeps the last hit cache entry FontInstanceList maFontInstanceList; GlyphBoundRectCache m_aBoundRectCache; - rtl::Reference<LogicalFontInstance> GetFontInstance(PhysicalFontCollection const*, FontSelectPattern&); + rtl::Reference<LogicalFontInstance> GetFontInstance(PhysicalFontCollection const*, vcl::font::FontSelectPattern&); public: ImplFontCache(); @@ -82,7 +82,7 @@ public: rtl::Reference<LogicalFontInstance> GetFontInstance(PhysicalFontCollection const *, const vcl::Font&, const Size& rPixelSize, float fExactHeight, bool bNonAntialias = false); - rtl::Reference<LogicalFontInstance> GetGlyphFallbackFont( PhysicalFontCollection const *, FontSelectPattern&, + rtl::Reference<LogicalFontInstance> GetGlyphFallbackFont( PhysicalFontCollection const *, vcl::font::FontSelectPattern&, LogicalFontInstance* pLogicalFont, int nFallbackLevel, OUString& rMissingCodes ); |