mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correctly export formulas in conditional formats to xlsx

Browse Source 
Change-Id: I534fb55b735f47124cd9820ba0a986315e263112
This commit is contained in:
Markus Mohrhard
2012-05-13 08:30:17 +02:00
parent 8f531a6cd7
commit 851a92bd02
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sc/source/filter/excel/xecontent.cxx
View File

@@ -821,6 +821,7 @@ const char* GetOperatorString(ScConditionMode eMode, bool& bFrmla2)
pRet = "uniqueValues"; pRet = "uniqueValues";
break; break;
case SC_COND_DIRECT: case SC_COND_DIRECT:
pRet = "expression";
case SC_COND_NONE: case SC_COND_NONE:
default: default:
pRet = ""; pRet = "";
@@ -850,9 +851,13 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
FSEND ); FSEND );
rWorksheet->startElement( XML_formula, FSEND ); rWorksheet->startElement( XML_formula, FSEND );
rWorksheet->write(XclXmlUtils::ToOUString( GetRoot().GetDoc(), mrFormatEntry.GetValidSrcPos(), mrFormatEntry.CreateTokenArry( 0 ) )); rWorksheet->write(XclXmlUtils::ToOUString( GetRoot().GetDoc(), mrFormatEntry.GetValidSrcPos(), mrFormatEntry.CreateTokenArry( 0 ) ));
rWorksheet->endElement( XML_formula );
if (bFmla2) if (bFmla2)
{
rWorksheet->startElement( XML_formula, FSEND );
rWorksheet->write(XclXmlUtils::ToOUString( GetRoot().GetDoc(), mrFormatEntry.GetValidSrcPos(), mrFormatEntry.CreateTokenArry( 1 ) )); rWorksheet->write(XclXmlUtils::ToOUString( GetRoot().GetDoc(), mrFormatEntry.GetValidSrcPos(), mrFormatEntry.CreateTokenArry( 1 ) ));
rWorksheet->endElement( XML_formula ); rWorksheet->endElement( XML_formula );
}
// OOXTODO: XML_extLst // OOXTODO: XML_extLst
rWorksheet->endElement( XML_cfRule ); rWorksheet->endElement( XML_cfRule );
} }