diff options
Diffstat (limited to 'sw/source/core/frmedt/fetab.cxx')
| -rw-r--r-- | sw/source/core/frmedt/fetab.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 678ebfc2fac7..a87e79affbc6 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -282,7 +282,15 @@ bool SwFEShell::DeleteCol() // search boxes via the layout bool bRet; SwSelBoxes aBoxes; - GetTableSel( *this, aBoxes, SwTableSearchType::Col ); + SwTableSearchType eSearchType = SwTableSearchType::Col; + + // NewModel tables already ExpandColumnSelection, so don't do it here also. + const SwContentNode* pContentNd = getShellCursor(false)->GetNode().GetContentNode(); + const SwTableNode* pTableNd = pContentNd ? pContentNd->FindTableNode() : nullptr; + if (pTableNd && pTableNd->GetTable().IsNewModel()) + eSearchType = SwTableSearchType::NONE; + + GetTableSel(*this, aBoxes, eSearchType); if ( !aBoxes.empty() ) { TableWait aWait( aBoxes.size(), pFrame, *GetDoc()->GetDocShell() ); |