[Libreoffice-commits] .: oox/source

[Muthu Subramanian]

 oox/source/xls/sheetdatacontext.cxx |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit cb03f63c053a3ccdd2f580f978b5fa4df7b1398f
Author: Muthu Subramanian <sumuthu at novell.com>
Date:   Fri Jul 8 16:34:04 2011 +0530

    [Temp] Import all formulas post tokenization.

diff --git a/oox/source/xls/sheetdatacontext.cxx b/oox/source/xls/sheetdatacontext.cxx
index 698f0fe..b9d80f4 100644
--- a/oox/source/xls/sheetdatacontext.cxx
+++ b/oox/source/xls/sheetdatacontext.cxx
@@ -163,8 +163,15 @@ void SheetDataContext::onCharacters( const OUString& rChars )
             maCellValue = rChars;
         break;
         case XLS_TOKEN( f ):
-            maCellValue = rChars;
-            mrSheetData.putFormulaString( maCellData.maCellAddr, maCellValue );
+            if( 0 && maFmlaData.mnFormulaType == XML_normal )
+            {
+                maCellValue = rChars;
+                mrSheetData.putFormulaString( maCellData.maCellAddr, maCellValue );
+            }
+            else if( maFmlaData.mnFormulaType != XML_TOKEN_INVALID )
+            {
+                maTokens = mrFormulaParser.importFormula( maCellData.maCellAddr, rChars );
+            }
         break;
     }
 }
@@ -177,7 +184,7 @@ void SheetDataContext::onEndElement()
         if( mbHasFormula ) switch( maFmlaData.mnFormulaType )
         {
             case XML_normal:
-                //mrSheetData.setFormulaCell( maCellData, maTokens );
+                mrSheetData.setFormulaCell( maCellData, maTokens );
                 break;
             case XML_shared:
                 if( maFmlaData.mnSharedId >= 0 )