| commit | e06b83be93139f7ae3b28fb43a17bec78ed7647b | |
| author | Michael Stahl <Michael.Stahl@cib.de> | |
| Wed, 10 Jun 2020 09:59:00 +0000 (10 11:59 +0200) | ||
| committer | Andras Timar <andras.timar@collabora.com> | |
| Thu, 11 Jun 2020 11:18:03 +0000 (11 13:18 +0200) | ||
| tree | 9a59c9933500c063a2c1df95c283879e275b006d | treesnapshot (tar.gz zip) |
| parent | b4c6ebec50543c9f86744c4ab4028be41c18167a | commitdiff |
tdf#132725 sw: SwUndoDelete: don't group if flys are be deleted
The fly would not be deleted by CanGrouping() but would be deleted later
in RedoImpl() via the IsAtStartOfSection() check so just force a new
Undo action in this case.
(regression from 91b2325808a75174f284c48c8b8afc118fad74e4
and 28b77c89dfcafae82cf2a6d85731b643ff9290e5)
Change-Id: I68f9f6b7fd0306bc0853a370b1030463a0024edc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96002
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit 32c162ad1723512763b74d01eaec32c1296f3a55)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96037
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
The fly would not be deleted by CanGrouping() but would be deleted later
in RedoImpl() via the IsAtStartOfSection() check so just force a new
Undo action in this case.
(regression from 91b2325808a75174f284c48c8b8afc118fad74e4
and 28b77c89dfcafae82cf2a6d85731b643ff9290e5)
Change-Id: I68f9f6b7fd0306bc0853a370b1030463a0024edc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96002
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit 32c162ad1723512763b74d01eaec32c1296f3a55)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96037
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
| sw/source/core/undo/undel.cxx | diffblobblamehistory |