sw/source/core/undo/untblk.cxx | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit c263c25052ca7812ec8789b8825bca11da845054
Author: Fyodor Yemelyanenko <fyodo...@hotmail.com>
Date: Thu Oct 26 11:12:39 2017 +1000
tdf#108124 fix: crash during redo, when document contains images
Redo action fixed to reinsert images to document correctly.
For details, pls see
https://bugs.documentfoundation.org/show_bug.cgi?id=108124
Change-Id: Ie20dfcc8b9bfd5096c3c9459446c2a972129f3bf
Reviewed-on: https://gerrit.libreoffice.org/43862
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx
index 9c5ac1eb8ec0..9b44e00522ea 100644
--- a/sw/source/core/undo/untblk.cxx
+++ b/sw/source/core/undo/untblk.cxx
@@ -285,9 +285,17 @@ void SwUndoInserts::RedoImpl(::sw::UndoRedoContext &
rContext)
pTextNd->ChgFormatColl( pLastNdColl );
}
- for (size_t n = m_FlyUndos.size(); 0 < n; --n)
+ // tdf#108124 (10/25/2017)
+ // During UNDO we call SwUndoInsLayFormat::UndoImpl in reverse order,
+ // firstly for m_FlyUndos[ m_FlyUndos.size()-1 ], etc.
+ // As absolute node index of fly stored in SwUndoFlyBase::nNdPgPos we
+ // should recover from Undo in direct order (last should be recovered
first)
+ // During REDO we should recover Flys (Images) in direct order,
+ // firstly m_FlyUndos[0], then with m_FlyUndos[1] index, etc.
+
+ for (size_t n = 0; m_FlyUndos.size() > n; ++n)
{
- m_FlyUndos[ n-1 ]->RedoImpl(rContext);
+ m_FlyUndos[n]->RedoImpl(rContext);
}
pHistory->Rollback( pDoc, nSetPos );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
