summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Dürr <hdu@apache.org>2012-06-19 10:20:57 +0000
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-02-01 17:34:13 +0000
commit75d6a308afb5265c9a8cbcc0e6af2f624b9d1b16 (patch)
tree750989eab938de9e274a5ade428849a29f665fc9
parent87fc06e0209835bc55ceb475cbc8d931ade94755 (diff)
fdo#51232: i#119987# fix Impress crash when pasting text under Outline viewlibreoffice-4-0-0
Patch by: Wang Zhe Testing by: Yan Ji Review by: hdu (cherry picked from commit 484621239c7f743f44579d2b199b0347dc4734cd) Change-Id: I340de4f1b626defa52ecc48938c63ec4d1ce5c1d Signed-off-by: Tor Lillqvist <tml@iki.fi> Reviewed-on: https://gerrit.libreoffice.org/1897 Reviewed-by: Joren De Cuyper <joren.libreoffice@telenet.be> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> (cherry picked from commit 639f739fbcfb5421c7b7173c700136f169e38bc8) Reviewed-on: https://gerrit.libreoffice.org/1933 Reviewed-by: Kohei Yoshida <kohei.yoshida@gmail.com> Tested-by: Kohei Yoshida <kohei.yoshida@gmail.com>
-rw-r--r--sd/source/ui/view/outlnvs2.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index 5a2061edb685..a514bb20ead7 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -243,6 +243,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
else
xPresentation->rehearseTimings();
}
+ Cancel();
rReq.Done();
}
break;