From 2f51bf35daa7d2e1612647e1768c443028e87c39 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Sun, 26 Sep 2021 08:17:26 +1000 Subject: 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 Tested-by: Jenkins --- vcl/inc/impfontcache.hxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'vcl/inc/impfontcache.hxx') 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 #include -#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, 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, IFSD_Hash, IFSD_Equal> FontInstanceList; LogicalFontInstance* mpLastHitCacheEntry; ///< keeps the last hit cache entry FontInstanceList maFontInstanceList; GlyphBoundRectCache m_aBoundRectCache; - rtl::Reference GetFontInstance(PhysicalFontCollection const*, FontSelectPattern&); + rtl::Reference GetFontInstance(PhysicalFontCollection const*, vcl::font::FontSelectPattern&); public: ImplFontCache(); @@ -82,7 +82,7 @@ public: rtl::Reference GetFontInstance(PhysicalFontCollection const *, const vcl::Font&, const Size& rPixelSize, float fExactHeight, bool bNonAntialias = false); - rtl::Reference GetGlyphFallbackFont( PhysicalFontCollection const *, FontSelectPattern&, + rtl::Reference GetGlyphFallbackFont( PhysicalFontCollection const *, vcl::font::FontSelectPattern&, LogicalFontInstance* pLogicalFont, int nFallbackLevel, OUString& rMissingCodes ); -- cgit