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 08:18:27 +0000 |
| commit | 1c81af2c1814e8bd12701f85e09cebf5fe206647 (patch) | |
| tree | ce1f8af648198058fecf52632f6f35f16d14df57 | |
| parent | b184c54a512d05a7c7b80d6f06ec834f6a948a75 (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>
| -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 a95b2acaba48..e2e75f930ab8 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -3807,6 +3807,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 adafe8bbb741..c09a5cabac88 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -3928,6 +3928,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) |