diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-20 11:12:36 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-20 14:40:48 +0200 |
| commit | 29ff7fbbcc3cdd077458356b06cf7e8120fb4e95 (patch) | |
| tree | 80f157d96b0127770d7ea87923a8c4144bbbc585 | |
| parent | 7d44fb6d97f629839bb896142ccb4ce0c55db707 (diff) | |
these just use the base FontSelectPatternAttributes
Change-Id: I0c5ffe571c2cf37ec7d20d4d3ae965227cd72b7e
Reviewed-on: https://gerrit.libreoffice.org/59314
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/inc/impfontcache.hxx | 6 | ||||
| -rw-r--r-- | vcl/source/font/fontcache.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/inc/impfontcache.hxx b/vcl/inc/impfontcache.hxx index 6cb05b39d9b3..47314d4ffeaf 100644 --- a/vcl/inc/impfontcache.hxx +++ b/vcl/inc/impfontcache.hxx @@ -37,9 +37,9 @@ private: LogicalFontInstance* mpLastHitCacheEntry; ///< keeps the last hit cache entry // 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 std::unordered_map<FontSelectPattern, rtl::Reference<LogicalFontInstance>, IFSD_Hash, IFSD_Equal> FontInstanceList; + struct IFSD_Equal { bool operator()( const FontSelectPatternAttributes&, const FontSelectPatternAttributes& ) const; }; + struct IFSD_Hash { size_t operator()( const FontSelectPatternAttributes& ) const; }; + typedef std::unordered_map<FontSelectPatternAttributes, rtl::Reference<LogicalFontInstance>, IFSD_Hash, IFSD_Equal> FontInstanceList; FontInstanceList maFontInstanceList; rtl::Reference<LogicalFontInstance> GetFontInstance(PhysicalFontCollection const*, FontSelectPattern&); diff --git a/vcl/source/font/fontcache.cxx b/vcl/source/font/fontcache.cxx index 080521c771c9..5355fb3b97f0 100644 --- a/vcl/source/font/fontcache.cxx +++ b/vcl/source/font/fontcache.cxx @@ -26,12 +26,12 @@ #include <PhysicalFontFamily.hxx> #include <sal/log.hxx> -size_t ImplFontCache::IFSD_Hash::operator()( const FontSelectPattern& rFSD ) const +size_t ImplFontCache::IFSD_Hash::operator()( const FontSelectPatternAttributes& rFSD ) const { return rFSD.hashCode(); } -bool ImplFontCache::IFSD_Equal::operator()(const FontSelectPattern& rA, const FontSelectPattern& rB) const +bool ImplFontCache::IFSD_Equal::operator()(const FontSelectPatternAttributes& rA, const FontSelectPatternAttributes& rB) const { // check normalized font family name if( rA.maSearchName != rB.maSearchName ) |