diff options
| author | Mark Hung <marklh9@gmail.com> | 2017-01-15 08:42:25 +0800 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-18 09:14:02 +0000 |
| commit | 43fc91de2847c1d810a6ce48756130c0480427af (patch) | |
| tree | 3e285222cac5e6909d77e85a25a1640adb531a38 | |
| parent | 441d7e046df36900bbf14b37277b15d615f67641 (diff) | |
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@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/source/gdi/pdffontcache.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/source/gdi/pdffontcache.hxx b/vcl/source/gdi/pdffontcache.hxx index 597c47f5bc09..c02e28b91d33 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 |