diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2016-12-05 21:37:25 -0500 |
---|---|---|
committer | Kohei Yoshida <libreoffice@kohei.us> | 2016-12-06 03:23:51 +0000 |
commit | ae923f941f70ebe99cc785076f3357015dd69003 (patch) | |
tree | 7c99451c402165f5fa0bf5a95f17f3da2b313b3f | |
parent | 8a460cfa1b1ce01c7a479ce2e7f21a92a2c50de3 (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>
-rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index f88b6e52ef2f..5d1fa7602453 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1894,7 +1894,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. |