diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-06-19 15:19:31 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-06-24 16:51:36 -0400 |
commit | 2a5ea9ee0ba2b38d1810828a9fdf884d9b0fd198 (patch) | |
tree | ce44f962f792146880936a60986413c29950aadf /sc | |
parent | 458df361e0761651b6d17f4fb730f996243bc9f3 (diff) |
Same fix for fill series & some cleanup.
Change-Id: I2f741305ac64c221c5af8ab99f3ddff0ce56f458
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/data/table4.cxx | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index 02f9c7d0928b..c605a972736a 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -766,7 +766,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, short nHeadNoneTail = 0; sal_Int32 nStringValue = 0; String aValue; - ScRefCellValue aSrcCell; + ScCellValue aSrcCell; CellType eCellType = CELLTYPE_NONE; bool bIsOrdinalSuffix = false; @@ -846,21 +846,8 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, } } else - { - ScAddress aDestPos( static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow), nTab ); - switch ( eCellType ) - { - case CELLTYPE_STRING: - aCol[nCol].SetRawString(aDestPos.Row(), *aSrcCell.mpString); - case CELLTYPE_EDIT: - aCol[nCol].SetEditText(aDestPos.Row(), aSrcCell.mpEditText->Clone()); - break; - default: - { - // added to avoid warnings - } - } - } + aSrcCell.commit(aCol[nCol], nRow); + break; case CELLTYPE_FORMULA : FillFormula( nFormulaCounter, bFirst, aSrcCell.mpFormula, |