summaryrefslogtreecommitdiffstats
path: root/lotuswordpro/source/filter/lwprowlayout.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-10-17 16:40:28 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-10-18 20:07:48 +0200
commit473c1b05f7a7a5500a2e15b911263b546792b013 (patch)
tree15a4385cb9c769b4cc48a394cea6f392c0517173 /lotuswordpro/source/filter/lwprowlayout.cxx
parentclang-format customize/SvxConfigPageHelper (diff)
downloadcore-473c1b05f7a7a5500a2e15b911263b546792b013.tar.gz
core-473c1b05f7a7a5500a2e15b911263b546792b013.zip
ofz#26357 Timeout in lwpfuzzer, 12s -> 1.3s
Change-Id: I1f1e2f1727b698d761adaf0d388d731fc80e280f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104467 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.cxx7
1 files changed, 2 insertions, 5 deletions
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<XFTable> 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<sal_uInt16>(nMarkConnCell),nEndCol);
@@ -433,8 +431,7 @@ void LwpRowLayout::ConvertCommonRow(rtl::Reference<XFTable> 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);