diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2019-07-02 00:01:01 +0200 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-07-03 12:36:16 +0200 |
| commit | 1aa93766ee3994af9975e96e8ea60e02078de2d8 (patch) | |
| tree | eaf6510a0712f7975333d2840fc6d3b27445a6bc /include/svx | |
| parent | update groupedbar NB layouts for more consistent between different apps (diff) | |
| download | core-1aa93766ee3994af9975e96e8ea60e02078de2d8.tar.gz core-1aa93766ee3994af9975e96e8ea60e02078de2d8.zip | |
tdf#126180: EndTextEdit on all views before delete/cut slide
This also reworks the fixes tdf#125824 and tdf#111522 to use EndTextEdit
instead of blocking the undoing
Change-Id: I73c2289a9d950465f020f684e9e736148380f5c5
Reviewed-on: https://gerrit.libreoffice.org/74989
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit e6c7a018a0cfee395ce2886d41c908a2447ef5cc)
Reviewed-on: https://gerrit.libreoffice.org/75027
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/svdedtv.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 0305b7fb144c..87fd275b187d 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -186,10 +186,9 @@ public: bool IsUndoEnabled() const; /** - * Checks if this or other views have an active text edit, in which case object undos are not - * created. + * Checks if this or other views have an active text edit, if true, end them. */ - bool CanDoSdrUndo() const; + void EndTextEditAllViews() const; std::vector< std::unique_ptr<SdrUndoAction> > CreateConnectorUndo( SdrObject& rO ); void AddUndoActions( std::vector< std::unique_ptr<SdrUndoAction> > ); |