Kaydet (Commit) 90e3b47b authored tarafından Noel Grandin's avatar Noel Grandin

tdf#124896 CRASH: deleting sheet

regression from
    commit 7282014e
    Date:   Fri Feb 1 15:15:16 2019 +0100
    tdf#50916 Makes numbers of columns dynamic.

Change-Id: I3913e14cadc11efa1d9e7405cdbaf96fe094508a
Reviewed-on: https://gerrit.libreoffice.org/71220
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 4dba49c9
......@@ -529,7 +529,8 @@ void ScDocument::SetChartRangeList( const OUString& rChartName,
bool ScDocument::HasData( SCCOL nCol, SCROW nRow, SCTAB nTab )
{
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab])
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]
&& nCol < maTabs[nTab]->GetAllocatedColumnsCount())
return maTabs[nTab]->HasData( nCol, nRow );
else
return false;
......
......@@ -3765,7 +3765,8 @@ void ScDocument::GetCellType( SCCOL nCol, SCROW nRow, SCTAB nTab,
bool ScDocument::HasStringData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
{
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]
&& nCol < maTabs[nTab]->GetAllocatedColumnsCount())
return maTabs[nTab]->HasStringData( nCol, nRow );
else
return false;
......@@ -3773,7 +3774,8 @@ bool ScDocument::HasStringData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
bool ScDocument::HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const
{
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]
&& nCol < maTabs[nTab]->GetAllocatedColumnsCount())
return maTabs[nTab]->HasValueData( nCol, nRow );
else
return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment