[Libreoffice-commits] core.git: sc/inc sc/source
Dennis Francis
dennisfrancis.in at gmail.com
Wed Nov 30 16:01:51 UTC 2016
sc/inc/colcontainer.hxx | 12 +++++
sc/source/core/data/table1.cxx | 84 +++++++++++++++++++++++++++++++----------
2 files changed, 77 insertions(+), 19 deletions(-)
New commits:
commit ad2bc869bfe2d34bde7d42e10593db1c5ffccc2a
Author: Dennis Francis <dennisfrancis.in at gmail.com>
Date: Wed Nov 23 21:03:14 2016 +0530
tdf#50916 : Refactor table1.cxx wherever there is column access
This is still a WIP for table1.cxx, but want to get some comments
as I proceed.
Added back() method to ScColContainer to avoid aCol[aCol.size()-1]
usages.
Looks like we will need to initialize column container with at least
one column in the ScTable constructor because we need to use a lot
of "aCol.size() - 1" expression.
Change-Id: I5f0fa3d2daed67cb623641b273d2727561ab3d49
Reviewed-on: https://gerrit.libreoffice.org/31125
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/sc/inc/colcontainer.hxx b/sc/inc/colcontainer.hxx
index 1a2e9d4..c3e0398 100644
--- a/sc/inc/colcontainer.hxx
+++ b/sc/inc/colcontainer.hxx
@@ -56,6 +56,18 @@ public:
}
void Clear();
+
+ const ScColumn& back() const
+ {
+ assert(aCols.size() > 0);
+ return *aCols.back();
+ }
+
+ ScColumn& back()
+ {
+ assert(aCols.size() > 0);
+ return *aCols.back();
+ }
};
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 7e1b403..289266b 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -91,7 +91,7 @@ void GetOptimalHeightsInColumn(
// on standard format)
- rCol[MAXCOL].GetOptimalHeight(rCxt, nStartRow, nEndRow, 0, 0);
+ rCol.back().GetOptimalHeight(rCxt, nStartRow, nEndRow, 0, 0);
// from there search for the standard height that is in use in the lower part
@@ -110,7 +110,7 @@ void GetOptimalHeightsInColumn(
SCROW nMinStart = nPos;
sal_uLong nWeightedCount = 0;
- for (SCCOL nCol=0; nCol<MAXCOL; nCol++) // MAXCOL already above
+ for (SCCOL nCol=0; nCol<(rCol.size()-1); nCol++) // last col done already above
{
rCol[nCol].GetOptimalHeight(rCxt, nStartRow, nEndRow, nMinHeight, nMinStart);
@@ -336,7 +336,7 @@ ScTable::~ScTable()
{
if (!pDocument->IsInDtorClear())
{
- for (SCCOL nCol = 0; nCol < MAXCOL; ++nCol)
+ for (SCCOL nCol = 0; nCol < (aCol.size() - 1); ++nCol)
{
aCol[nCol].FreeNotes();
}
@@ -454,6 +454,9 @@ sal_uInt16 ScTable::GetOptimalColWidth( SCCOL nCol, OutputDevice* pDev,
bool bFormula, const ScMarkData* pMarkData,
const ScColWidthParam* pParam )
{
+ if ( nCol >= aCol.size() )
+ return ( STD_COL_WIDTH - STD_EXTRA_WIDTH );
+
return aCol[nCol].GetOptimalColWidth( pDev, nPPTX, nPPTY, rZoomX, rZoomY,
bFormula, STD_COL_WIDTH - STD_EXTRA_WIDTH, pMarkData, pParam );
}
@@ -464,6 +467,9 @@ long ScTable::GetNeededSize( SCCOL nCol, SCROW nRow,
const Fraction& rZoomX, const Fraction& rZoomY,
bool bWidth, bool bTotalSize )
{
+ if ( nCol >= aCol.size() )
+ return 0;
+
ScNeededSizeOptions aOptions;
aOptions.bSkipMerged = false; // count merged cells
aOptions.bTotalSize = bTotalSize;
@@ -532,7 +538,7 @@ bool ScTable::GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const
bool bFound = false;
SCCOL nMaxX = 0;
SCROW nMaxY = 0;
- for (SCCOL i=0; i<=MAXCOL; i++)
+ for (SCCOL i=0; i<aCol.size(); i++)
{
if (!aCol[i].IsEmptyData())
{
@@ -585,7 +591,7 @@ bool ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, bool bNotes ) const
SCROW nMaxY = 0;
SCCOL i;
- for (i=0; i<=MAXCOL; i++) // Test data
+ for (i=0; i<aCol.size(); i++) // Test data
{
if (!aCol[i].IsEmptyData())
{
@@ -617,7 +623,7 @@ bool ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, bool bNotes ) const
SCCOL nMaxDataX = nMaxX;
- for (i=0; i<=MAXCOL; i++) // Test attribute
+ for (i=0; i<aCol.size(); i++) // Test attribute
{
SCROW nLastRow;
if (aCol[i].GetLastVisibleAttr( nLastRow ))
@@ -643,10 +649,10 @@ bool ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, bool bNotes ) const
else if ( nMaxX > nMaxDataX )
{
SCCOL nAttrStartX = nMaxDataX + 1;
- while ( nAttrStartX < MAXCOL )
+ while ( nAttrStartX < (aCol.size()-1) )
{
SCCOL nAttrEndX = nAttrStartX;
- while ( nAttrEndX < MAXCOL && aCol[nAttrStartX].IsVisibleAttrEqual(aCol[nAttrEndX+1]) )
+ while ( nAttrEndX < (aCol.size()-1) && aCol[nAttrStartX].IsVisibleAttrEqual(aCol[nAttrEndX+1]) )
++nAttrEndX;
if ( nAttrEndX + 1 - nAttrStartX >= SC_COLUMNS_STOP )
{
@@ -675,7 +681,7 @@ bool ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
SCCOL nMaxX = 0;
SCCOL i;
- for (i=0; i<=MAXCOL; i++) // Test attribute
+ for (i=0; i<aCol.size(); i++) // Test attribute
{
if (aCol[i].HasVisibleAttrIn( nStartRow, nEndRow ))
{
@@ -691,7 +697,7 @@ bool ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
--nMaxX;
}
- for (i=0; i<=MAXCOL; i++) // Daten testen
+ for (i=0; i<aCol.size(); i++) // Daten testen
{
if (!aCol[i].IsEmptyBlock( nStartRow, nEndRow )) //TODO: bNotes ??????
{
@@ -708,6 +714,8 @@ bool ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
bool ScTable::GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
SCROW& rEndRow, bool bNotes ) const
{
+ nStartCol = std::min<SCCOL>( nStartCol, aCol.size()-1 );
+ nEndCol = std::min<SCCOL>( nEndCol, aCol.size()-1 );
bool bFound = false;
SCROW nMaxY = 0;
SCCOL i;
@@ -753,11 +761,11 @@ bool ScTable::GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
bool ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
{
bool bFound = false;
- SCCOL nMinX = MAXCOL;
+ SCCOL nMinX = aCol.size()-1;
SCROW nMinY = MAXROW;
SCCOL i;
- for (i=0; i<=MAXCOL; i++) // Test attribute
+ for (i=0; i<aCol.size(); i++) // Test attribute
{
SCROW nFirstRow;
if (aCol[i].GetFirstVisibleAttr( nFirstRow ))
@@ -772,16 +780,16 @@ bool ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
if (nMinX == 0) // omit attribute at the right
{
- if ( aCol[0].IsVisibleAttrEqual(aCol[1]) ) // no single ones
+ if ( aCol.size() > 1 && aCol[0].IsVisibleAttrEqual(aCol[1]) ) // no single ones
{
++nMinX;
- while ( nMinX<MAXCOL && aCol[nMinX].IsVisibleAttrEqual(aCol[nMinX-1]) )
+ while ( nMinX<(aCol.size()-1) && aCol[nMinX].IsVisibleAttrEqual(aCol[nMinX-1]) )
++nMinX;
}
}
bool bDatFound = false;
- for (i=0; i<=MAXCOL; i++) // Test data
+ for (i=0; i<aCol.size(); i++) // Test data
{
if (!aCol[i].IsEmptyData())
{
@@ -823,6 +831,9 @@ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, S
// independently of the emptiness of rows / columns (i.e. does not allow shrinking)
// bOnlyDown = true means extend / shrink the inputed area only down, i.e modifiy only rEndRow
+ rStartCol = std::min<SCCOL>( rStartCol, aCol.size()-1 );
+ rEndCol = std::min<SCCOL>( rEndCol, aCol.size()-1 );
+
bool bLeft = false;
bool bRight = false;
bool bTop = false;
@@ -840,7 +851,7 @@ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, S
if (nStart>0) --nStart;
if (nEnd<MAXROW) ++nEnd;
- if (rEndCol < MAXCOL)
+ if (rEndCol < (aCol.size()-1))
if (!aCol[rEndCol+1].IsEmptyBlock(nStart,nEnd))
{
++rEndCol;
@@ -892,7 +903,7 @@ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, S
if ( !bIncludeOld && !bOnlyDown )
{
if ( !bLeft )
- while ( aCol[rStartCol].IsEmptyBlock(rStartRow,rEndRow) && rStartCol < MAXCOL && rStartCol < rEndCol)
+ while ( aCol[rStartCol].IsEmptyBlock(rStartRow,rEndRow) && rStartCol < (aCol.size()-1) && rStartCol < rEndCol)
++rStartCol;
if ( !bRight )
@@ -928,6 +939,9 @@ bool ScTable::ShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, SCROW& rS
SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly, bool bStickyTopRow, bool bStickyLeftCol,
bool bConsiderCellNotes ) const
{
+ rStartCol = std::min<SCCOL>( rStartCol, aCol.size()-1 );
+ // check for rEndCol is done below.
+
o_bShrunk = false;
PutInOrder( rStartCol, rEndCol);
@@ -942,9 +956,9 @@ bool ScTable::ShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, SCROW& rS
rStartRow = 0;
o_bShrunk = true;
}
- if (rEndCol > MAXCOL)
+ if (rEndCol >= aCol.size())
{
- rEndCol = MAXCOL;
+ rEndCol = aCol.size()-1;
o_bShrunk = true;
}
if (rEndRow > MAXROW)
@@ -1028,6 +1042,11 @@ SCROW ScTable::GetLastDataRow( SCCOL nCol1, SCCOL nCol2, SCROW nLastRow ) const
if (!ValidCol(nCol1) || !ValidCol(nCol2))
return -1;
+ if ( nCol1 >= aCol.size() )
+ return -1;
+
+ nCol2 = std::min<SCCOL>( nCol2, aCol.size()-1 );
+
SCROW nNewLastRow = 0;
for (SCCOL i = nCol1; i <= nCol2; ++i)
{
@@ -1042,6 +1061,18 @@ SCROW ScTable::GetLastDataRow( SCCOL nCol1, SCCOL nCol2, SCROW nLastRow ) const
SCSIZE ScTable::GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow, ScDirection eDir ) const
{
+ SCCOL nStartColOrig = nStartCol;
+ SCCOL nEndColOrig = nEndCol;
+ nStartCol = std::min<SCCOL>( nStartCol, aCol.size()-1 );
+ nEndCol = std::min<SCCOL>( nEndCol, aCol.size()-1 );
+
+ // The region is not allocated and does not contain any data.
+ if ( nStartColOrig != nStartCol )
+ return ( ((eDir == DIR_BOTTOM) || (eDir == DIR_TOP)) ?
+ static_cast<SCSIZE>(nEndRow - nStartRow + 1) :
+ static_cast<SCSIZE>(nEndColOrig - nStartColOrig + 1) );
+
+ SCSIZE nGapRight = static_cast<SCSIZE>(nEndColOrig - nEndCol);
SCSIZE nCount = 0;
SCCOL nCol;
if ((eDir == DIR_BOTTOM) || (eDir == DIR_TOP))
@@ -1059,6 +1090,7 @@ SCSIZE ScTable::GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow,
nCount++;
nCol--;
}
+ nCount += nGapRight;
}
else
{
@@ -1068,12 +1100,23 @@ SCSIZE ScTable::GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow,
nCount++;
nCol++;
}
+
+ // If the area between nStartCol and nEndCol are empty,
+ // add the count of unallocated columns on the right.
+ if ( nCol > nEndCol )
+ nCount += nGapRight;
}
return nCount;
}
bool ScTable::IsEmptyLine( SCROW nRow, SCCOL nStartCol, SCCOL nEndCol ) const
{
+ // The range of columns are unallocated hence empty.
+ if ( nStartCol >= aCol.size() )
+ return true;
+
+ nEndCol = std::min<SCCOL>( nEndCol, aCol.size()-1 );
+
bool bFound = false;
for (SCCOL i=nStartCol; i<=nEndCol && !bFound; i++)
if (aCol[i].HasDataAt(nRow))
@@ -1083,6 +1126,9 @@ bool ScTable::IsEmptyLine( SCROW nRow, SCCOL nStartCol, SCCOL nEndCol ) const
void ScTable::LimitChartArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ) const
{
+ rStartCol = std::min<SCCOL>( rStartCol, aCol.size()-1 );
+ rEndCol = std::min<SCCOL>( rEndCol, aCol.size()-1 );
+
while ( rStartCol<rEndCol && aCol[rStartCol].IsEmptyBlock(rStartRow,rEndRow) )
++rStartCol;
More information about the Libreoffice-commits
mailing list