[Libreoffice-commits] core.git: vcl/source

[Mark Hung]

 vcl/source/gdi/pdffontcache.hxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 43fc91de2847c1d810a6ce48756130c0480427af
Author: Mark Hung <marklh9 at gmail.com>
Date:   Sun Jan 15 08:42:25 2017 +0800

    pdf export: make FontIdentifier comparison strict weak ordering.
    
    VS Runtime Library debug assertion failed "Expression: invalid
    operator<" when exporting attachment of tdf#98879 to pdf.
    The document uses both vertical and vertical fonts.
    
    Change-Id: I4a2c519c539c28515cac876298be820cad8b9014
    Reviewed-on: https://gerrit.libreoffice.org/33082
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/gdi/pdffontcache.hxx b/vcl/source/gdi/pdffontcache.hxx
index 597c47f..c02e28b 100644
--- a/vcl/source/gdi/pdffontcache.hxx
+++ b/vcl/source/gdi/pdffontcache.hxx
@@ -45,8 +45,9 @@ namespace vcl
                 std::type_info *pType = rRight.m_typeFontFace;
 
                 return m_nFontId < rRight.m_nFontId ||
-                       m_typeFontFace->before( *pType ) ||
-                       m_bVertical < rRight.m_bVertical;
+                       ( m_nFontId == rRight.m_nFontId &&
+                       ( m_typeFontFace->before( *pType ) ||
+                       ( *m_typeFontFace == *pType && m_bVertical < rRight.m_bVertical ) ) );
             }
         };
         struct FontData