summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2015-04-17 20:30:27 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2015-04-22 19:01:43 +0200
commit89964955e535f7343cccf1399312f0e8ac76323d (patch)
treef12b528decb4ba70e6768c489abd13bed038c8d4
parentfa8aaaadc38372185d6d29d8d91391907e95b689 (diff)
tdf#85769 Avoid writing font name attribute twice, by ignoring empty value
Change-Id: If2491db482fc6eebc5d28f03ace12a89ac6c0a0f
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index c9cd83db9839..1783a287b29a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6120,7 +6120,8 @@ void DocxAttributeOutput::CharFont( const SvxFontItem& rFont)
GetExport().GetId( rFont ); // ensure font info is written to fontTable.xml
OUString sFontName(rFont.GetFamilyName());
OString sFontNameUtf8 = OUStringToOString(sFontName, RTL_TEXTENCODING_UTF8);
- AddToAttrList( m_pFontsAttrList, 2,
+ if (!sFontNameUtf8.isEmpty())
+ AddToAttrList( m_pFontsAttrList, 2,
FSNS( XML_w, XML_ascii ), sFontNameUtf8.getStr(),
FSNS( XML_w, XML_hAnsi ), sFontNameUtf8.getStr() );
}