diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-07 11:28:34 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-07 02:22:17 +0000 |
| commit | 4a4a31ff64ce7d4f9687fa309f8be71715cd0a94 (patch) | |
| tree | 456f640688220c79ac8991e9348cc5707ef29305 | |
| parent | 91f97fddff931e9b34ea982f1fe45120a3feef65 (diff) | |
vcl: use FontSelectPattern, not FontSelectPatternAttributes
Change-Id: I9e3759d1d5ae850a2bead62fb3b2fef02f43ec4a
Reviewed-on: https://gerrit.libreoffice.org/21176
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
| -rw-r--r-- | vcl/generic/fontmanager/fontsubst.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx index 620bb9178a16..6a187de91602 100644 --- a/vcl/generic/fontmanager/fontsubst.cxx +++ b/vcl/generic/fontmanager/fontsubst.cxx @@ -42,7 +42,7 @@ class FcPreMatchSubstitution { public: bool FindFontSubstitute( FontSelectPattern& ) const override; - typedef ::std::pair<FontSelectPatternAttributes, FontSelectPatternAttributes> value_type; + typedef ::std::pair<FontSelectPattern, FontSelectPattern> value_type; private: typedef ::std::list<value_type> CachedFontMapType; mutable CachedFontMapType maCachedFontMap; @@ -132,9 +132,9 @@ namespace class equal { private: - const FontSelectPatternAttributes& mrAttributes; + const FontSelectPattern& mrAttributes; public: - explicit equal(const FontSelectPatternAttributes& rAttributes) + explicit equal(const FontSelectPattern& rAttributes) : mrAttributes(rAttributes) { } @@ -157,7 +157,7 @@ bool FcPreMatchSubstitution::FindFontSubstitute( FontSelectPattern &rFontSelData //different fonts depending on fontsize, bold, etc settings so don't cache //just on the name, cache map all the input and all the output not just map //from original selection to output fontname - FontSelectPatternAttributes& rPatternAttributes = rFontSelData; + FontSelectPattern& rPatternAttributes = rFontSelData; CachedFontMapType &rCachedFontMap = const_cast<CachedFontMapType &>(maCachedFontMap); CachedFontMapType::iterator itr = std::find_if(rCachedFontMap.begin(), rCachedFontMap.end(), equal(rPatternAttributes)); if (itr != rCachedFontMap.end()) |