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

renamed misleading names

Browse Source 
Formula is a formatted text, and RawString isn't raw at all.

Change-Id: I2e4455401c47bd1215576b24f6041248cc7f5a90
This commit is contained in:
Eike Rathke
2014-01-21 00:27:52 +01:00
parent e5ad31e2f7
commit af43015cd7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sc/source/filter/xml/xmlexprt.cxx
View File

@@ -206,7 +206,7 @@ OUString lcl_RangeSequenceToString(
return aResult.makeStringAndClear(); return aResult.makeStringAndClear();
} }
OUString lcl_GetRawString( ScDocument* pDoc, const ScAddress& rPos ) OUString lcl_GetFormattedString( ScDocument* pDoc, const ScAddress& rPos )
{ {
// return text/edit cell string content, with line feeds in edit cells // return text/edit cell string content, with line feeds in edit cells
@@ -3169,13 +3169,13 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
break; break;
case table::CellContentType_TEXT : case table::CellContentType_TEXT :
{ {
OUString sFormula(lcl_GetRawString(pDoc, aCellPos)); OUString sFormattedString(lcl_GetFormattedString(pDoc, aCellPos));
OUString sCellString = aCell.maBaseCell.getString(pDoc); OUString sCellString = aCell.maBaseCell.getString(pDoc);
GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
sCellString, sFormula, true, true); sCellString, sFormattedString, true, true);
if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes( GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
sCellString, sFormula, false, true, XML_NAMESPACE_CALC_EXT); sCellString, sFormattedString, false, true, XML_NAMESPACE_CALC_EXT);
} }
break; break;
case table::CellContentType_FORMULA : case table::CellContentType_FORMULA :