sw/source/core/table/swtable.cxx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
New commits: commit 12cac92a7f803808d971071fb091ba8572db587a Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Thu Oct 14 12:06:09 2021 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Oct 14 13:21:58 2021 +0200 tdf#144840 Special Paste RTF: Table with merged cells messed up Revert "tdf#135683 speed up large writer table load" This reverts commit e3ea0e32657a41b48d9d9d28f6ad15af4c2a7abc. Change-Id: If36077de62cbff8a3157b0824d4713c10e90f45e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123580 Tested-by: Noel Grandin <noel.gran...@collabora.co.uk> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 3e05628b58b4..ff85241e1cdf 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -1768,7 +1768,6 @@ SwFrameFormat* SwTableBox::ClaimFrameFormat() // If other SwTableBox objects currently listen to the same SwTableBoxFormat as // this one, something needs to be done SwTableBoxFormat *pRet = static_cast<SwTableBoxFormat*>(GetFrameFormat()); - const bool bInImport = pRet->GetDoc()->IsInWriterfilterImport(); SwIterator<SwTableBox,SwFormat> aIter( *pRet ); for( SwTableBox* pLast = aIter.First(); pLast; pLast = aIter.Next() ) { @@ -1784,13 +1783,10 @@ SwFrameFormat* SwTableBox::ClaimFrameFormat() pNewFormat->UnlockModify(); // re-register SwCellFrame objects that know me - if (!bInImport) - { - SwIterator<SwCellFrame,SwFormat> aFrameIter( *pRet ); - for( SwCellFrame* pCell = aFrameIter.First(); pCell; pCell = aFrameIter.Next() ) - if( pCell->GetTabBox() == this ) - pCell->RegisterToFormat( *pNewFormat ); - } + SwIterator<SwCellFrame,SwFormat> aFrameIter( *pRet ); + for( SwCellFrame* pCell = aFrameIter.First(); pCell; pCell = aFrameIter.Next() ) + if( pCell->GetTabBox() == this ) + pCell->RegisterToFormat( *pNewFormat ); // re-register myself pNewFormat->Add( this );