summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2017-05-26 23:16:57 +0900
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-01 11:00:11 +0200
commit96d59ffc572c4cf112405a85aee3366d45bc7757 (patch)
treea800e0c2f9e059cfb14e2492832f59207670f864
parent1d857ca26f60449ef325acd0aac40c11dded128e (diff)
tdf#108024 Keep original selection during DrawViewShell::FuTemporary()
Otherwise it was disposed in the middle of its own mouse event handler FuSelection::MouseButtonUp(). Change-Id: I0d96048526dece7232e5a777364ad4da1d64c904 Reviewed-on: https://gerrit.libreoffice.org/37976 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--sd/source/ui/view/drviews2.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index a189006ea60d..d2a5a202890e 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1110,7 +1110,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
// Set the selection tool as the old one. This in particular important for the
// zoom function, in which clicking without dragging zooms as well, and that
// makes exiting the object editing mode impossible.
- SetOldFunction( FuSelection::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
+ if (dynamic_cast<FuSelection*>( GetOldFunction().get() ) == nullptr)
+ SetOldFunction( FuSelection::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
Cancel();
rReq.Ignore ();
}