Kaydet (Commit) 43fc91de authored tarafından Mark Hung's avatar Mark Hung Kaydeden (comit) Caolán McNamara

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/33082Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 441d7e04
...@@ -45,8 +45,9 @@ namespace vcl ...@@ -45,8 +45,9 @@ namespace vcl
std::type_info *pType = rRight.m_typeFontFace; std::type_info *pType = rRight.m_typeFontFace;
return m_nFontId < rRight.m_nFontId || return m_nFontId < rRight.m_nFontId ||
m_typeFontFace->before( *pType ) || ( m_nFontId == rRight.m_nFontId &&
m_bVertical < rRight.m_bVertical; ( m_typeFontFace->before( *pType ) ||
( *m_typeFontFace == *pType && m_bVertical < rRight.m_bVertical ) ) );
} }
}; };
struct FontData struct FontData
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment