diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-03-27 12:02:14 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-03-28 01:12:47 -0400 |
| commit | cdef3ead120149cc4db9f44a4ab3a5124ca450c6 (patch) | |
| tree | a776f31b167fddc3ce8a2c05e6977a67945995ba /sc/source/core/data/fillinfo.cxx | |
| parent | d824279a225b9a5b5d5391ec86ffb744406d6ecb (diff) | |
Replace ScBaseCell in CellInfo with ScRefCellValue.
And all the other changes that were necessary.
Change-Id: I76c938d5568e0ed46e654dd8ad9a4cd044b0e235
Diffstat (limited to 'sc/source/core/data/fillinfo.cxx')
| -rw-r--r-- | sc/source/core/data/fillinfo.cxx | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index 40ed6ba484c7..5a04751839af 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -286,7 +286,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrX]; pInfo->bEmptyCellText = true; - pInfo->pCell = NULL; + pInfo->maCell.clear(); if (bPaintMarks) pInfo->bMarked = ( nX >= nBlockStartX && nX <= nBlockEndX && nY >= nBlockStartY && nY <= nBlockEndY ); @@ -380,8 +380,8 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX RowInfo* pThisRowInfo = &pRowInfo[nArrY]; CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrX]; - pInfo->pCell = pThisCol->maItems[nUIndex].pCell; - if (pInfo->pCell->GetCellType() != CELLTYPE_NOTE) + pInfo->maCell.assign(*pThisCol->maItems[nUIndex].pCell); + if (pInfo->maCell.meType != CELLTYPE_NOTE) { pThisRowInfo->bEmptyText = false; // Zeile nicht leer pInfo->bEmptyCellText = false; // Zelle nicht leer @@ -504,11 +504,8 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX if(!pCondForm) continue; - ScRefCellValue aTmpCell; - if (pInfo->pCell) - aTmpCell.assign(*pInfo->pCell); ScCondFormatData aData = pCondForm->GetData( - aTmpCell, ScAddress(nX, nCurRow, nTab)); + pInfo->maCell, ScAddress(nX, nCurRow, nTab)); if (!aData.aStyleName.isEmpty()) { SfxStyleSheetBase* pStyleSheet = @@ -552,9 +549,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX } } - if (bHidden || ( bFormulaMode && bHideFormula && pInfo->pCell - && pInfo->pCell->GetCellType() - == CELLTYPE_FORMULA )) + if (bHidden || (bFormulaMode && bHideFormula && pInfo->maCell.meType == CELLTYPE_FORMULA)) pInfo->bEmptyCellText = true; ++nArrY; |