sc/source/core/data/table3.cxx | 68 ++++++++++++++++++++++++++++-------------
1 file changed, 48 insertions(+), 20 deletions(-)
New commits:
commit 63592999a067d76c896ed79204330e1a4b934c80
Author: Eike Rathke <er...@redhat.com>
Date: Thu Aug 18 17:16:50 2016 +0200
refine HasColHeader()/HasRowHeader() conditions, tdf#91305 related
Check not only the first row/column whether it consists only of text
cells, but also the second row/column whether there are only text cells,
and if so don't assume headers.
Change-Id: I961e93599621c297e866caaf0062f387a7318838
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 86b979c..23b7b5f 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -3241,48 +3241,76 @@ bool ScTable::CreateQueryParam(SCCOL nCol1, SCROW
nRow1, SCCOL nCol2, SCROW nRow
bool ScTable::HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
SCROW nEndRow) const
{
+ if (nStartRow == nEndRow)
+ // Assume only data.
+ /* XXX NOTE: previous behavior still checked this one row and could
+ * evaluate it has header row, but that doesn't make much sense. */
+ return false;
+
if (nStartCol == nEndCol)
{
- if (nEndRow > nStartRow)
- {
- CellType eFstCellType = GetCellType(nStartCol, nStartRow);
- CellType eSndCellType = GetCellType(nStartCol, nStartRow+1);
- if ((eFstCellType == CELLTYPE_STRING || eFstCellType ==
CELLTYPE_EDIT)
- && (eSndCellType != CELLTYPE_STRING && eSndCellType !=
CELLTYPE_STRING))
- return true;
- }
- return false;
+ CellType eFstCellType = GetCellType(nStartCol, nStartRow);
+ CellType eSndCellType = GetCellType(nStartCol, nStartRow+1);
+ return ((eFstCellType == CELLTYPE_STRING || eFstCellType ==
CELLTYPE_EDIT) &&
+ (eSndCellType != CELLTYPE_STRING && eSndCellType !=
CELLTYPE_STRING));
}
+
for (SCCOL nCol=nStartCol; nCol<=nEndCol; nCol++)
{
CellType eType = GetCellType( nCol, nStartRow );
+ // Any non-text cell in first row => not headers.
if (eType != CELLTYPE_STRING && eType != CELLTYPE_EDIT)
return false;
}
- return true;
+
+ // First row all text cells, any non-text cell in second row => headers.
+ SCROW nTestRow = nStartRow + 1;
+ for (SCCOL nCol=nStartCol; nCol<=nEndCol; nCol++)
+ {
+ CellType eType = GetCellType( nCol, nTestRow );
+ if (eType != CELLTYPE_STRING && eType != CELLTYPE_EDIT)
+ return true;
+ }
+
+ // Also second row all text cells => first row not headers.
+ return false;
}
bool ScTable::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
SCROW nEndRow ) const
{
+ if (nStartCol == nEndCol)
+ // Assume only data.
+ /* XXX NOTE: previous behavior still checked this one column and could
+ * evaluate it has header column, but that doesn't make much sense. */
+ return false;
+
if (nStartRow == nEndRow)
{
- if (nEndCol > nStartCol)
- {
- CellType eFstCellType = GetCellType(nStartCol, nStartRow);
- CellType eSndCellType = GetCellType(nStartCol+1, nStartRow);
- if ((eFstCellType == CELLTYPE_STRING || eFstCellType ==
CELLTYPE_EDIT)
- && (eSndCellType != CELLTYPE_STRING && eSndCellType !=
CELLTYPE_STRING))
- return true;
- }
- return false;
+ CellType eFstCellType = GetCellType(nStartCol, nStartRow);
+ CellType eSndCellType = GetCellType(nStartCol+1, nStartRow);
+ return ((eFstCellType == CELLTYPE_STRING || eFstCellType ==
CELLTYPE_EDIT) &&
+ (eSndCellType != CELLTYPE_STRING && eSndCellType !=
CELLTYPE_STRING));
}
+
for (SCROW nRow=nStartRow; nRow<=nEndRow; nRow++)
{
CellType eType = GetCellType( nStartCol, nRow );
+ // Any non-text cell in first column => not headers.
if (eType != CELLTYPE_STRING && eType != CELLTYPE_EDIT)
return false;
}
- return true;
+
+ // First column all text cells, any non-text cell in second column =>
headers.
+ SCROW nTestCol = nStartCol + 1;
+ for (SCCOL nRow=nStartRow; nRow<=nEndRow; nRow++)
+ {
+ CellType eType = GetCellType( nRow, nTestCol );
+ if (eType != CELLTYPE_STRING && eType != CELLTYPE_EDIT)
+ return true;
+ }
+
+ // Also second column all text cells => first column not headers.
+ return false;
}
void ScTable::GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2,
std::vector<ScTypedStrData>& rStrings, bool& rHasDates)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
