summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2020-07-31 13:32:29 +0200
committerMichael Stahl <michael.stahl@cib.de>2020-07-31 15:31:39 +0200
commit5f7b937e9f81824f11022bc6b4dd222f700883cd (patch)
tree77ec88cb9a5fc07d518355ecbdc880bb9258876a /sw
parent875b07aa623d2cc5e39b058e326cb0f3b792b905 (diff)
tdf#134931 sw_redlinehide: fix layout following paste of table
The pasted table does get a SwTabFrame but the problem is that TurboAction() is called and formats the pre-existing SwTextFrame and somehow that just sets all the valid flags on the new SwTabFrame without doing any formatting. Previously, SwNodes::CopyNodes(bNewFrames=true) would call SwTabFrame::Paste() which invalidates the page. In InsertCnt_(), for new SwSectionFrames InvalidatePage() is already called so do the same for SwTabFrame which gets rid of the "turbo". (regression from 166b5010b402a41b192b1659093a25acf9065fd9) Change-Id: I970a04bd8e76f5418bddb66af915ac466f44daf3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99867 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/layout/frmtool.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index f7ba92aa4130..7169e865b94f 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1615,6 +1615,10 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
pPageMaker->CheckInsert( nIndex );
pFrame->InsertBehind( pLay, pPrv );
+ if (pPage) // would null in SwCellFrame ctor
+ { // tdf#134931 call ResetTurbo(); not sure if Paste() would be
+ pFrame->InvalidatePage(pPage); // better than InsertBehind()?
+ }
// #i27138#
// notify accessibility paragraphs objects about changed
// CONTENT_FLOWS_FROM/_TO relation.