summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2014-11-23 00:32:48 +0200
committerMaxim Monastirsky <momonasmon@gmail.com>2014-11-23 10:48:19 +0200
commit2497285dcaf135e55daf273607ed86575c8032ac (patch)
treeacd807b0bade057363fb3b268dcd1c81329f73ff
parent2d25ddb385b0a5b5803f03441f38fee11ce9a556 (diff)
Related: fdo#83572 Deactivate previous function when inserting object
Change-Id: I790202676210e6724c369996f26651ab5307ee72
-rw-r--r--sd/source/ui/view/drviews2.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index c8b6c07f498e..00d1b0dd01be 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1159,7 +1159,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_ATTR_TABLE:
{
SetCurrentFunction( FuInsertOLE::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), 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 ) );
Cancel();
rReq.Ignore ();