sc/qa/unit/data/xls/pass/ofz14101-1.xls |binary sc/qa/unit/data/xls/pass/ofz14120-1.xls |binary sc/source/core/data/document.cxx | 2 +- sc/source/core/data/table7.cxx | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 3d57865fa367acf143232373f1096d067128bda6 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Apr 8 09:51:58 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Apr 8 12:11:24 2019 +0200 ofz#14101 another batch of oss-fuzz failures since... commit 7282014e362a1529a36c88eb308df8ed359c2cfa Date: Fri Feb 1 15:15:16 2019 +0100 tdf#50916 Makes numbers of columns dynamic Change-Id: Ibee52867c83393fe1e3d548f6d00d29df78b07e4 Reviewed-on: https://gerrit.libreoffice.org/70408 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sc/qa/unit/data/xls/pass/ofz14101-1.xls b/sc/qa/unit/data/xls/pass/ofz14101-1.xls new file mode 100644 index 000000000000..953f255fb19e Binary files /dev/null and b/sc/qa/unit/data/xls/pass/ofz14101-1.xls differ diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index a3df4639e94b..f41e9e34c1d4 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -6527,7 +6527,7 @@ void ScDocument::SetNote(const ScAddress& rPos, std::unique_ptr<ScPostIt> pNote) void ScDocument::SetNote(SCCOL nCol, SCROW nRow, SCTAB nTab, std::unique_ptr<ScPostIt> pNote) { - return maTabs[nTab]->aCol[nCol].SetCellNote(nRow, std::move(pNote)); + return maTabs[nTab]->CreateColumnIfNotExists(nCol).SetCellNote(nRow, std::move(pNote)); } bool ScDocument::HasNote(const ScAddress& rPos) const commit 368448e7843bf4e58ed5637a731c67c76c3c11cb Author: Caolán McNamara <[email protected]> AuthorDate: Mon Apr 8 09:23:46 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Apr 8 12:11:10 2019 +0200 ofz#14120 another batch of oss-fuzz failures since... commit 7282014e362a1529a36c88eb308df8ed359c2cfa Date: Fri Feb 1 15:15:16 2019 +0100 tdf#50916 Makes numbers of columns dynamic Change-Id: Ic494eb7e6ad13537caf0ac3dde0b6646fd2dcc10 Reviewed-on: https://gerrit.libreoffice.org/70406 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sc/qa/unit/data/xls/pass/ofz14120-1.xls b/sc/qa/unit/data/xls/pass/ofz14120-1.xls new file mode 100644 index 000000000000..5d526b445c9d Binary files /dev/null and b/sc/qa/unit/data/xls/pass/ofz14120-1.xls differ diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx index e0ed0c96bce6..ae67c319651e 100644 --- a/sc/source/core/data/table7.cxx +++ b/sc/source/core/data/table7.cxx @@ -421,10 +421,10 @@ bool ScTable::IsEditActionAllowed( std::unique_ptr<sc::ColumnIterator> ScTable::GetColumnIterator( SCCOL nCol, SCROW nRow1, SCROW nRow2 ) const { - if (!ValidCol(nCol) || nCol >= aCol.size()) + if (!ValidCol(nCol)) return std::unique_ptr<sc::ColumnIterator>(); - return aCol[nCol].GetColumnIterator(nRow1, nRow2); + return CreateColumnIfNotExists(nCol).GetColumnIterator(nRow1, nRow2); } bool ScTable::EnsureFormulaCellResults( const SCCOL nCol1, SCROW nRow1, const SCCOL nCol2, SCROW nRow2, bool bSkipRunning ) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
