diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-05-13 08:30:17 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-05-13 08:44:39 +0200 |
| commit | 851a92bd022c48c5cc5e2f9943ce550167be124b (patch) | |
| tree | 3946f75dd1b38bf2a9fc458f56998be163656796 /sc/source/filter/excel/xecontent.cxx | |
| parent | 8f531a6cd796ce759e9d68ce577d0eaf058e1a75 (diff) | |
correctly export formulas in conditional formats to xlsx
Change-Id: I534fb55b735f47124cd9820ba0a986315e263112
Diffstat (limited to 'sc/source/filter/excel/xecontent.cxx')
| -rw-r--r-- | sc/source/filter/excel/xecontent.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index d8a839177c93..9bf323e7cd1d 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -821,6 +821,7 @@ const char* GetOperatorString(ScConditionMode eMode, bool& bFrmla2) pRet = "uniqueValues"; break; case SC_COND_DIRECT: + pRet = "expression"; case SC_COND_NONE: default: pRet = ""; @@ -850,9 +851,13 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm ) FSEND ); rWorksheet->startElement( XML_formula, FSEND ); rWorksheet->write(XclXmlUtils::ToOUString( GetRoot().GetDoc(), mrFormatEntry.GetValidSrcPos(), mrFormatEntry.CreateTokenArry( 0 ) )); + rWorksheet->endElement( XML_formula ); if (bFmla2) + { + rWorksheet->startElement( XML_formula, FSEND ); rWorksheet->write(XclXmlUtils::ToOUString( GetRoot().GetDoc(), mrFormatEntry.GetValidSrcPos(), mrFormatEntry.CreateTokenArry( 1 ) )); - rWorksheet->endElement( XML_formula ); + rWorksheet->endElement( XML_formula ); + } // OOXTODO: XML_extLst rWorksheet->endElement( XML_cfRule ); } |