mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify CreateColumnIfNotExists

Browse Source 
if "if (aOldColSize==0)" check can never be hit since we pre-allocate
these columns to some size.

Also move the cold part of the function out-of-line, doesn't seem useful
to have all of it in a header

Change-Id: If8675ca17d70ee55dde8418ff75e2ddb3c931c58
Reviewed-on: https://gerrit.libreoffice.org/68506
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2019-02-28 14:45:17 +02:00
parent 205e2d6c31
commit f9845d1a2d
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sc/inc/table.hxx
View File

@@ -276,18 +276,11 @@ public:
ScColumn& CreateColumnIfNotExists( const SCCOL nScCol ) ScColumn& CreateColumnIfNotExists( const SCCOL nScCol )
{ {
if ( nScCol >= aCol.size() ) if ( nScCol >= aCol.size() )
{ CreateColumnIfNotExistsImpl(nScCol);
const SCCOL aOldColSize = aCol.size();
bool bUseEmptyAttrArray = false;
if ( aOldColSize == 0 )
bUseEmptyAttrArray = true;
aCol.resize( static_cast< size_t >( nScCol + 1 ) );
for (SCCOL i = aOldColSize; i <= nScCol; i++)
aCol[i].Init( i, nTab, pDocument, bUseEmptyAttrArray );
}
return aCol[nScCol]; return aCol[nScCol];
} }
// out-of-line the cold part of the function
void CreateColumnIfNotExistsImpl( const SCCOL nScCol );
sal_uLong GetCellCount() const; sal_uLong GetCellCount() const;
sal_uLong GetWeightedCount() const; sal_uLong GetWeightedCount() const;
sal_uLong GetWeightedCount(SCROW nStartRow, SCROW nEndRow) const; sal_uLong GetWeightedCount(SCROW nStartRow, SCROW nEndRow) const;

8
sc/source/core/data/table1.cxx
View File

@@ -2533,4 +2533,12 @@ ScColumnsRange ScTable::GetColumnsRange(SCCOL nColBegin, SCCOL nColEnd) const
ScColumnsRange::Iterator( aCol.begin() + nEffEnd)); ScColumnsRange::Iterator( aCol.begin() + nEffEnd));
} }
// out-of-line the cold part of the CreateColumnIfNotExists function
void ScTable::CreateColumnIfNotExistsImpl( const SCCOL nScCol )
{
const SCCOL aOldColSize = aCol.size();
aCol.resize( static_cast< size_t >( nScCol + 1 ) );
for (SCCOL i = aOldColSize; i <= nScCol; i++)
aCol[i].Init( i, nTab, pDocument, false );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */