diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2016-07-19 06:08:36 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-20 10:11:16 +0000 |
| commit | 3af2382e6155abbb3e9e6102878bad1fa3f79373 (patch) | |
| tree | 1c5fd732b9f43dee925fbb13870d7ba68d566b86 | |
| parent | 10b701f36d7455e76b66822cc42d2017bb3d65d1 (diff) | |
Resolves: tdf#100903 Calc hangs when preediting Japanese with GTK plugin
... + Mozc.
This issue shares a common root with tdf#56937.
Change-Id: Ic5720c19f22f7e6b047e1251b34f90d04ce7eee7
Reviewed-on: https://gerrit.libreoffice.org/27305
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 1c81af2c1814e8bd12701f85e09cebf5fe206647)
Reviewed-on: https://gerrit.libreoffice.org/27330
| -rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index eb6ded55e337..031170bec092 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -3823,6 +3823,8 @@ uno::Reference<accessibility::XAccessibleEditableText> if (xText.is()) return xText; } + if (xState->contains(accessibility::AccessibleStateType::MANAGES_DESCENDANTS)) + return uno::Reference< accessibility::XAccessibleEditableText >(); } for (sal_Int32 i = 0; i < xContext->getAccessibleChildCount(); ++i) diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 78c9a716688f..9ea6237eb2e3 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -3984,6 +3984,8 @@ uno::Reference<accessibility::XAccessibleEditableText> if (xText.is()) return xText; } + if (xState->contains(accessibility::AccessibleStateType::MANAGES_DESCENDANTS)) + return uno::Reference< accessibility::XAccessibleEditableText >(); } for (sal_Int32 i = 0; i < xContext->getAccessibleChildCount(); ++i) |