[Libreoffice-commits] core.git: sc/source

[Tor Lillqvist]

 sc/source/core/data/table3.cxx |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit fa3522a1adcb312639207bae304b866d73872bf4
Author: Tor Lillqvist <t...@collabora.com>
Date:   Tue Oct 24 23:36:24 2017 +0300

    Don't pointlessly abbreviate "First" and "Second"
    
    Change-Id: I7b446f9eed6cf00c605d1cdb8a84273d0ea6628e

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 9399a37db3c0..6347e24086ef 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -3323,10 +3323,10 @@ bool ScTable::HasColHeader( SCCOL nStartCol, SCROW 
nStartRow, SCCOL nEndCol, SCR
 
     if (nStartCol == nEndCol)
     {
-        CellType eFstCellType = GetCellType(nStartCol, nStartRow);
-        CellType eSndCellType = GetCellType(nStartCol, nStartRow+1);
-        return ((eFstCellType == CELLTYPE_STRING || eFstCellType == 
CELLTYPE_EDIT) &&
-                (eSndCellType != CELLTYPE_STRING && eSndCellType != 
CELLTYPE_EDIT));
+        CellType eFirstCellType = GetCellType(nStartCol, nStartRow);
+        CellType eSecondCellType = GetCellType(nStartCol, nStartRow+1);
+        return ((eFirstCellType == CELLTYPE_STRING || eFirstCellType == 
CELLTYPE_EDIT) &&
+                (eSecondCellType != CELLTYPE_STRING && eSecondCellType != 
CELLTYPE_EDIT));
     }
 
     for (SCCOL nCol=nStartCol; nCol<=nEndCol; nCol++)
@@ -3360,10 +3360,10 @@ bool ScTable::HasRowHeader( SCCOL nStartCol, SCROW 
nStartRow, SCCOL nEndCol, SCR
 
     if (nStartRow == nEndRow)
     {
-        CellType eFstCellType = GetCellType(nStartCol, nStartRow);
-        CellType eSndCellType = GetCellType(nStartCol+1, nStartRow);
-        return ((eFstCellType == CELLTYPE_STRING || eFstCellType == 
CELLTYPE_EDIT) &&
-                (eSndCellType != CELLTYPE_STRING && eSndCellType != 
CELLTYPE_EDIT));
+        CellType eFirstCellType = GetCellType(nStartCol, nStartRow);
+        CellType eSecondCellType = GetCellType(nStartCol+1, nStartRow);
+        return ((eFirstCellType == CELLTYPE_STRING || eFirstCellType == 
CELLTYPE_EDIT) &&
+                (eSecondCellType != CELLTYPE_STRING && eSecondCellType != 
CELLTYPE_EDIT));
     }
 
     for (SCROW nRow=nStartRow; nRow<=nEndRow; nRow++)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits