vcl/source/font/fontcache.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 508411a4eb17174beb255972659d38c3cd85b4e2
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jun 1 13:25:46 2018 +0100
fix dubious cache comparison check
in...
commit 083b7ca26bbf4b9bad2922520caaf5c0227dac5e
Date: Tue Dec 26 15:58:21 2017 +0100
Move PhysicalFontFace member of FontSelectPattern
this went from...
if (
(rA.mpFontData && rA.mpFontData->IsSymbolFont()) ||
(rB.mpFontData && rB.mpFontData->IsSymbolFont())
)
to ...
if (rA.IsSymbolFont() && rB.IsSymbolFont())
{
Change-Id: I1407573dfa73ac843b790ff3bc4ac0d5f66ab42c
Reviewed-on: https://gerrit.libreoffice.org/55184
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/font/fontcache.cxx b/vcl/source/font/fontcache.cxx
index 3e4945505144..205b49ada4e0 100644
--- a/vcl/source/font/fontcache.cxx
+++ b/vcl/source/font/fontcache.cxx
@@ -60,7 +60,7 @@ bool ImplFontCache::IFSD_Equal::operator()(const
FontSelectPattern& rA, const Fo
// Symbol fonts may recode from one type to another So they are only
// safely equivalent for equal targets
- if (rA.IsSymbolFont() && rB.IsSymbolFont())
+ if (rA.IsSymbolFont() || rB.IsSymbolFont())
{
if (rA.maTargetName != rB.maTargetName)
return false;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
