diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2013-12-17 14:12:57 +0100 |
|---|---|---|
| committer | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2013-12-17 19:51:18 +0100 |
| commit | 25dc9aaf693ba1e4aac75659f0762f5169c10f28 (patch) | |
| tree | 9ce5707bb030760c7f4df40c93a3ab4ebf88f16c /sw | |
| parent | 3d126bcf1febe68919eab42c5cd2cd0d7db2f66b (diff) | |
ooxml: preserve font theme color shade property
Change-Id: I40fa3f172f98b319a97a855231b854651be2d784
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 9cbaaf638e5c..e8279c097447 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2062,6 +2062,8 @@ DECLARE_OOXMLEXPORT_TEST(testThemePreservation, "theme-preservation.docx") // check theme font color value has been preserved assertXPath(pXmlDocument, "/w:document/w:body/w:p[4]/w:r[1]/w:rPr/w:color", "themeColor", "accent3"); + OUString sThemeShade = getXPath(pXmlDocument, "/w:document/w:body/w:p[4]/w:r[1]/w:rPr/w:color", "themeShade"); + CPPUNIT_ASSERT_EQUAL(sThemeShade.toInt32(16), 0xbf); // check the themeFontLang values in settings file xmlDocPtr pXmlSettings = parseExport("word/settings.xml"); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 7d32238467a6..ff041dc6430a 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -6216,6 +6216,15 @@ void DocxAttributeOutput::CharGrabBag( const SfxGrabBagItem& rItem ) m_pColorAttrList->add( FSNS( XML_w, XML_themeColor ), OUStringToOString( str, RTL_TEXTENCODING_UTF8 ) ); } + else if ( i->first == "CharThemeColorShade" ) + { + i->second >>= str; + if( !m_pColorAttrList ) + m_pColorAttrList = m_pSerializer->createAttrList(); + + m_pColorAttrList->add( FSNS( XML_w, XML_themeShade ), + OUStringToOString( str, RTL_TEXTENCODING_UTF8 ) ); + } else if( i->first == "CharThemeFontNameCs" || i->first == "CharThemeFontNameAscii" || i->first == "CharThemeFontNameEastAsia" || |