From 473c1b05f7a7a5500a2e15b911263b546792b013 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 17 Oct 2020 16:40:28 +0100 Subject: ofz#26357 Timeout in lwpfuzzer, 12s -> 1.3s MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1f1e2f1727b698d761adaf0d388d731fc80e280f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104467 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- lotuswordpro/source/filter/lwprowlayout.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'lotuswordpro/source/filter/lwprowlayout.cxx') diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx index 3321f294469e..9590e41d9670 100644 --- a/lotuswordpro/source/filter/lwprowlayout.cxx +++ b/lotuswordpro/source/filter/lwprowlayout.cxx @@ -238,9 +238,7 @@ void LwpRowLayout::ConvertRow(rtl::Reference const & pXFTable,sal_uInt8 m_ConnCellList[nMarkConnCell]->GetColID()); //set all cell in this merge cell to cellsmap - for (sal_uInt16 nRowLoop = crowid; nRowLoop < nRowMark; nRowLoop++) - for (sal_uInt16 nColLoop = i; nColLoop < nColID+1; nColLoop++) - pTableLayout->SetCellsMap(nRowLoop,nColLoop, xXFCell.get()); + pTableLayout->SetCellsMap(crowid, i, nRowMark - 1, nColID, xXFCell.get()); i += m_ConnCellList[nMarkConnCell]->GetNumcols(); nMarkConnCell = FindNextMarkConnCell(static_cast(nMarkConnCell),nEndCol); @@ -433,8 +431,7 @@ void LwpRowLayout::ConvertCommonRow(rtl::Reference const & pXFTable, sa } xRow->AddCell(xCell); - for (sal_uInt8 j=nCellStartCol;j<=nCellEndCol;j++) - pTableLayout->SetCellsMap(crowid,j, xCell.get());//set to cellsmap + pTableLayout->SetCellsMap(crowid, nCellStartCol, crowid, nCellEndCol, xCell.get()); //set to cellsmap } pXFTable->AddRow(xRow); -- cgit