commit 846675d6c0ff6838526f97961e95eca945c60eeb
author Caolán McNamara <caolanm@redhat.com> Fri Jun 01 13:25:46 2018 +0100
committer Caolán McNamara <caolanm@redhat.com> Sat Jun 02 22:16:11 2018 +0200
tree bf018fce2ff33c12c800609f508461883ee3ccbe
parent 7e83b2d3b52fda5c1535e85f76c096c3ee627b1e

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/55183
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

vcl/source/font/fontcache.cxx

diff --git a/vcl/source/font/fontcache.cxx b/vcl/source/font/fontcache.cxx
index 3e49455..205b49a 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;