diff options
| author | László Németh <nemeth@numbertext.org> | 2023-05-15 19:11:11 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2023-05-17 19:45:01 +0200 |
| commit | aff269c18b9029fec992135a406dc5031927c401 (patch) | |
| tree | d5280591723728d4570275c7093d9090ab7bc397 /sw/source/core/layout/tabfrm.cxx | |
| parent | 247738a9afeeb2f0644fa0307b7023fe115fae83 (diff) | |
tdf#155345 sw tracked table column: hide them in Hide Changes mode
And if all columns are deleted, hide the table in Hide Changes mode.
Follow-up to commit ffd8d20d368a885d6d786749278fa438573227a7
"tdf#150673 sw xmloff: import/export tracked table column" and
commit f481c2c8e74bded11fac754e493560391229dbcd
"tdf#144057 sw track changes: hide deleted table rows".
Change-Id: Ic8f0254d607d629ed6386df94b16a939cde17506
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151805
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/source/core/layout/tabfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/tabfrm.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 86685f620e37..5ce99f43023d 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -4001,8 +4001,15 @@ SwRowFrame::SwRowFrame(const SwTableLine &rLine, SwFrame* pSib, bool bInsertCont //Create the boxes and insert them. const SwTableBoxes &rBoxes = rLine.GetTabBoxes(); SwFrame *pTmpPrev = nullptr; + + bool bHiddenRedlines = getRootFrame()->IsHideRedlines() && + !GetFormat()->GetDoc()->getIDocumentRedlineAccess().GetRedlineTable().empty(); for ( size_t i = 0; i < rBoxes.size(); ++i ) { + // skip cells deleted with track changes + if ( bHiddenRedlines && RedlineType::Delete == rBoxes[i]->GetRedlineType() ) + continue; + SwCellFrame *pNew = new SwCellFrame( *rBoxes[i], this, bInsertContent ); pNew->InsertBehind( this, pTmpPrev ); pTmpPrev = pNew; |