diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-04-17 19:41:35 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-04-17 22:16:22 +0200 |
| commit | c80c8ac4eb58812c1b72aa0b0cef01ebb5337359 (patch) | |
| tree | 92facdf5e07c0aa67b39ebdf8ad97917d0948d20 /lotuswordpro/source/filter/lwprowlayout.cxx | |
| parent | b236b36475ed9a204ac931c34ccc23205296a0a6 (diff) | |
ofz#27296 Out-of-memory and ofz#27384 Indirect-leak
Revert "ofz#27012 detect deletion of XFCell"
This reverts commit e40d28d65222ba462c20ede17da5ef54751932e3.
and
Revert "ofz#26357 Timeout in lwpfuzzer, 12s -> 1.3s"
This reverts commit 473c1b05f7a7a5500a2e15b911263b546792b013.
Change-Id: Ia4d37148745259a285523b1b45ca9838c4122b89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114234
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'lotuswordpro/source/filter/lwprowlayout.cxx')
| -rw-r--r-- | lotuswordpro/source/filter/lwprowlayout.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx index 9590e41d9670..3321f294469e 100644 --- a/lotuswordpro/source/filter/lwprowlayout.cxx +++ b/lotuswordpro/source/filter/lwprowlayout.cxx @@ -238,7 +238,9 @@ void LwpRowLayout::ConvertRow(rtl::Reference<XFTable> const & pXFTable,sal_uInt8 m_ConnCellList[nMarkConnCell]->GetColID()); //set all cell in this merge cell to cellsmap - pTableLayout->SetCellsMap(crowid, i, nRowMark - 1, nColID, xXFCell.get()); + for (sal_uInt16 nRowLoop = crowid; nRowLoop < nRowMark; nRowLoop++) + for (sal_uInt16 nColLoop = i; nColLoop < nColID+1; nColLoop++) + pTableLayout->SetCellsMap(nRowLoop,nColLoop, xXFCell.get()); i += m_ConnCellList[nMarkConnCell]->GetNumcols(); nMarkConnCell = FindNextMarkConnCell(static_cast<sal_uInt16>(nMarkConnCell),nEndCol); @@ -431,7 +433,8 @@ void LwpRowLayout::ConvertCommonRow(rtl::Reference<XFTable> const & pXFTable, sa } xRow->AddCell(xCell); - pTableLayout->SetCellsMap(crowid, nCellStartCol, crowid, nCellEndCol, xCell.get()); //set to cellsmap + for (sal_uInt8 j=nCellStartCol;j<=nCellEndCol;j++) + pTableLayout->SetCellsMap(crowid,j, xCell.get());//set to cellsmap } pXFTable->AddRow(xRow); |