ofz#20635 infinite loop
Change-Id: I7b40df05307e3dd7768e9407040eb4fa285d51e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90174 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
parent
1e95c2c17a
commit
17cf56c127
1 changed files with 4 additions and 1 deletions
|
@ -403,7 +403,10 @@ void LwpRowLayout::ConvertCommonRow(rtl::Reference<XFTable> const & pXFTable, sa
|
|||
if (pCellLayout->GetLayoutType() == LWP_CONNECTED_CELL_LAYOUT)
|
||||
{
|
||||
LwpConnectedCellLayout* pConnCell = static_cast<LwpConnectedCellLayout*>(pCellLayout);
|
||||
nCellEndCol = i+pConnCell->GetNumcols()-1;
|
||||
auto nNumCols = pConnCell->GetNumcols();
|
||||
if (!nNumCols)
|
||||
throw std::runtime_error("loop in conversion");
|
||||
nCellEndCol = i + nNumCols - 1;
|
||||
i = nCellEndCol;
|
||||
}
|
||||
xCell = pCellLayout->DoConvertCell(pTable->GetObjectID(),crowid,i);
|
||||
|
|
Loading…
Reference in a new issue