diff options
| -rw-r--r-- | sc/source/core/data/table3.cxx | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 6da1c7cfc140..86b979cba5c0 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -3239,8 +3239,20 @@ bool ScTable::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow return bValid; } -bool ScTable::HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW /* nEndRow */ ) const +bool ScTable::HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow) const { + 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; + } for (SCCOL nCol=nStartCol; nCol<=nEndCol; nCol++) { CellType eType = GetCellType( nCol, nStartRow ); @@ -3250,8 +3262,20 @@ bool ScTable::HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCR return true; } -bool ScTable::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL /* nEndCol */, SCROW nEndRow ) const +bool ScTable::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) const { + 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; + } for (SCROW nRow=nStartRow; nRow<=nEndRow; nRow++) { CellType eType = GetCellType( nStartCol, nRow ); |