Kaydet (Commit) 68880a30 authored tarafından Michael Stahl's avatar Michael Stahl

tdf#121031 sw_redlinehide: fix SwUndoDelete of table: create table frames

(regression from 723728cd)

Change-Id: I7a52b8499f05e9e8cbf81330ea264fbbfe3bac87
Reviewed-on: https://gerrit.libreoffice.org/63462
Tested-by: Jenkins
Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
üst 5edc23db
...@@ -1113,10 +1113,13 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext) ...@@ -1113,10 +1113,13 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & rContext)
// create frames after SetSaveData has recreated redlines // create frames after SetSaveData has recreated redlines
if (0 != m_nNode) if (0 != m_nNode)
{ {
// tdf#121031 if the start node is a text node, it already has a frame;
// if it's a table, it does not
SwNodeIndex const start(rDoc.GetNodes(), nSttNode +
((m_bDelFullPara || !rDoc.GetNodes()[nSttNode]->IsTextNode()) ? 0 : 1));
// don't include end node in the range: it may have been merged already // don't include end node in the range: it may have been merged already
// by the start node, or it may be merged by one of the moved nodes, // by the start node, or it may be merged by one of the moved nodes,
// but if it isn't merged, its current frame(s) should be good... // but if it isn't merged, its current frame(s) should be good...
SwNodeIndex const start(rDoc.GetNodes(), nSttNode + (m_bDelFullPara ? 0 : 1));
SwNodeIndex const end(rDoc.GetNodes(), m_bDelFullPara ? delFullParaEndNode : nEndNode); SwNodeIndex const end(rDoc.GetNodes(), m_bDelFullPara ? delFullParaEndNode : nEndNode);
::MakeFrames(&rDoc, start, end); ::MakeFrames(&rDoc, start, end);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment