summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2016-12-05 21:37:25 -0500
committerAndras Timar <andras.timar@collabora.com>2017-02-17 21:36:07 +0100
commit530baebae5d7aa9d70aa2956e6179059316903ae (patch)
treebaedbc0f01e0c9bbae74697e5daacd7a536e0dda /sc/source/ui
parent8cce9a168a97f82760845adc440be1ca7e7e9629 (diff)
tdf#71409: Let's not crash the function wizard dialog.
It's a long story, but here is a short summary: When the function wizard dialog launches, it uses an edit engine instance to process text input, and that edit engine instance comes from the input window (for whatever reason). And, we are supposed to get ScTextWnd::MakeDialogEditView() called to instantiate such edit engine instance for the function wizard dialog. My previous change, however, changed this and ScTextWnd::InitEditEngine() ended up getting called to instantiate the edit engine instance. These two functions create edit engine instances with different settings intended for different use cases... The crash we saw is just one manifestation of such differences. Change-Id: I7fd84c1b1eca2351b9ecc87e325c2fd3787369eb Reviewed-on: https://gerrit.libreoffice.org/31664 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> (cherry picked from commit ae923f941f70ebe99cc785076f3357015dd69003)
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/app/inputhdl.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 3e9a9647f446..241d866c365c 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1892,7 +1892,7 @@ void ScInputHandler::UpdateActiveView()
}
}
- if (pInputWin)
+ if (pInputWin && (eMode == SC_INPUT_TOP || eMode == SC_INPUT_TABLE))
{
// tdf#71409: Always create the edit engine instance for the input
// window, in order to properly manage accessibility events.