[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/filter/xml/xmlexprt.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit af43015cd7316b7d611b357a96a415c23b51db5d
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Jan 21 00:27:52 2014 +0100

    renamed misleading names
    
    Formula is a formatted text, and RawString isn't raw at all.
    
    Change-Id: I2e4455401c47bd1215576b24f6041248cc7f5a90

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 56399a5..05d5735 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -206,7 +206,7 @@ OUString lcl_RangeSequenceToString(
     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
 
@@ -3169,13 +3169,13 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
             break;
         case table::CellContentType_TEXT :
             {
-                OUString sFormula(lcl_GetRawString(pDoc, aCellPos));
+                OUString sFormattedString(lcl_GetFormattedString(pDoc, aCellPos));
                 OUString sCellString = aCell.maBaseCell.getString(pDoc);
                 GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
-                        sCellString, sFormula, true, true);
+                        sCellString, sFormattedString, true, true);
                 if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
                     GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
-                            sCellString, sFormula, false, true, XML_NAMESPACE_CALC_EXT);
+                            sCellString, sFormattedString, false, true, XML_NAMESPACE_CALC_EXT);
             }
             break;
         case table::CellContentType_FORMULA :