summaryrefslogtreecommitdiff
path: root/sc/source/core/data/table3.cxx
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2013-05-03 15:05:51 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-05-09 13:34:31 -0400
commit59f38babd074cc0b835a5d2a1c81af013dba0deb (patch)
tree6a9fd62c6b8eabe939845e85f3dd5942963cc51b /sc/source/core/data/table3.cxx
parentff4731fb89f3b9d394c3826ab8dbe9d77df90a5a (diff)
Remove broadcaster from ScBaseCell, remove ScNoteCell and CELLTYPE_NOTE...
and Calc is now officially broken. Let's start fixing this bit by bit... Change-Id: I383c88245fe1e573666da636c6a8ca8815352ce7
Diffstat (limited to 'sc/source/core/data/table3.cxx')
-rw-r--r--sc/source/core/data/table3.cxx17
1 files changed, 2 insertions, 15 deletions
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index ec4e67bb4912..a668a2c9a166 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -377,18 +377,6 @@ short ScTable::CompareCell( sal_uInt16 nSort,
short nRes = 0;
CellType eType1 = CELLTYPE_NONE, eType2 = CELLTYPE_NONE;
- if (pCell1)
- {
- eType1 = pCell1->GetCellType();
- if (eType1 == CELLTYPE_NOTE)
- pCell1 = NULL;
- }
- if (pCell2)
- {
- eType2 = pCell2->GetCellType();
- if (eType2 == CELLTYPE_NOTE)
- pCell2 = NULL;
- }
if (pCell1)
{
@@ -1367,7 +1355,7 @@ public:
// Error cell is evaluated as string (for now).
aCellStr = ScGlobal::GetErrorString(static_cast<ScFormulaCell*>(pCell)->GetErrCode());
}
- else if (pCell->GetCellType() != CELLTYPE_NOTE)
+ else
{
sal_uLong nFormat = mrTab.GetNumberFormat( static_cast<SCCOL>(rEntry.nField), nRow );
ScRefCellValue aCell;
@@ -1660,8 +1648,7 @@ void ScTable::TopTenQuery( ScQueryParam& rParam )
ScSortInfo** ppInfo = pArray->GetFirstArray();
SCSIZE nValidCount = nCount;
// keine Note-/Leerzellen zaehlen, sind ans Ende sortiert
- while ( nValidCount > 0 && ( ppInfo[nValidCount-1]->pCell == NULL ||
- ppInfo[nValidCount-1]->pCell->GetCellType() == CELLTYPE_NOTE ) )
+ while ( nValidCount > 0 && (ppInfo[nValidCount-1]->pCell == NULL) )
nValidCount--;
// keine Strings zaehlen, sind zwischen Value und Leer
while ( nValidCount > 0