vcl/generic/fontmanager/fontsubst.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 4a4a31ff64ce7d4f9687fa309f8be71715cd0a94
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Thu Jan 7 11:28:34 2016 +1100
vcl: use FontSelectPattern, not FontSelectPatternAttributes
Change-Id: I9e3759d1d5ae850a2bead62fb3b2fef02f43ec4a
Reviewed-on: https://gerrit.libreoffice.org/21176
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherloc...@gmail.com>
diff --git a/vcl/generic/fontmanager/fontsubst.cxx
b/vcl/generic/fontmanager/fontsubst.cxx
index 620bb91..6a187de 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())
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
