diff options
| author | Muthu Subramanian <sumuthu@novell.com> | 2011-07-08 16:34:04 +0530 |
|---|---|---|
| committer | Muthu Subramanian <sumuthu@novell.com> | 2011-07-08 16:35:21 +0530 |
| commit | cb03f63c053a3ccdd2f580f978b5fa4df7b1398f (patch) | |
| tree | 94cee4644d456a10fd847867e7bc2c9715c79df2 | |
| parent | 72ecba52c7e52c53338404c1d002e47f08712137 (diff) | |
[Temp] Import all formulas post tokenization.
| -rw-r--r-- | oox/source/xls/sheetdatacontext.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/oox/source/xls/sheetdatacontext.cxx b/oox/source/xls/sheetdatacontext.cxx index 698f0fe3c..b9d80f41a 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 ) |