Kaydet (Commit) 41cd0bc2 authored tarafından Caolán McNamara's avatar Caolán McNamara

crashtesting: assert on export of fdo59645-3.odt to docx

probably since...

commit 3f2e84b4
Date:   Tue Oct 31 23:39:26 2017 +0100

    tdf#38778 Fix output of the font in DOC run

    The font information should be output before field declaration.
    Added unit test.

    tdf#38778 DOCX output: no double output of the font info

need to also not double output the complex script font info as well
as the western and ctl info

I misread hAnsi as Asian the last time so thought CJK was already
handled, handle it for real this time

Change-Id: If57a3ca3f96a7b76f1fb8702a0d5071c0b3e5cd9
Reviewed-on: https://gerrit.libreoffice.org/44771Reviewed-by: 's avatarSerge Krot (CIB) <Serge.Krot@cib.de>
Tested-by: 's avatarSerge Krot (CIB) <Serge.Krot@cib.de>
üst a3df638a
...@@ -6927,6 +6927,14 @@ void DocxAttributeOutput::CharBackground( const SvxBrushItem& rBrush ) ...@@ -6927,6 +6927,14 @@ void DocxAttributeOutput::CharBackground( const SvxBrushItem& rBrush )
void DocxAttributeOutput::CharFontCJK( const SvxFontItem& rFont ) void DocxAttributeOutput::CharFontCJK( const SvxFontItem& rFont )
{ {
if (m_pFontsAttrList && m_pFontsAttrList->hasAttribute(FSNS(XML_w, XML_eastAsia)))
{
// tdf#38778: do to fields output into DOC the font could be added before and after field declaration
// that all sub runs of the field will have correct font inside.
// For DOCX we should do not add the same font information twice in the same node
return;
}
const OUString& sFontName(rFont.GetFamilyName()); const OUString& sFontName(rFont.GetFamilyName());
OString sFontNameUtf8 = OUStringToOString(sFontName, RTL_TEXTENCODING_UTF8); OString sFontNameUtf8 = OUStringToOString(sFontName, RTL_TEXTENCODING_UTF8);
AddToAttrList( m_pFontsAttrList, FSNS( XML_w, XML_eastAsia ), sFontNameUtf8.getStr() ); AddToAttrList( m_pFontsAttrList, FSNS( XML_w, XML_eastAsia ), sFontNameUtf8.getStr() );
......
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