summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2017-02-20 10:35:25 +0300
committerJustin Luth <justin_luth@sil.org>2017-02-22 04:29:24 +0000
commitbb183f8a48f678aa4ece5b0058bec90d3d5082e4 (patch)
treef1d3b157f97e0f04dd639541af92305154e91a29
parentcbba64225a2abfdd8b2437e8a06925b15fb15d26 (diff)
tdf#105256 gtk findfocus return only if focused
A patch related to tdf#96685 (commit 598e6a024163f1510d076000788b7745625f5ed5) caused the initial regression that Japanese-mozc would freeze(tdf#100903). That patch only modified what happened when the text was marked as focused. However, the regression fix for Japanese bug 100903 (commit 1c81af2c1814e8bd12701f85e09cebf5fe206647) was not placed inside of the "if focused" code, and so it applies to more situations than were broken by the first regression, thus causing new bug 105256. So, applying fix 100903 ONLY when focused solves both problems. Change-Id: I1d8381f2d8cf793d481287ae975ce8a485b6c573 Reviewed-on: https://gerrit.libreoffice.org/34453 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp> (cherry picked from commit 1c3a784d38fc5986c78bab8d283c4661347baf43) Reviewed-on: https://gerrit.libreoffice.org/34486 Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit c6a48e66deef01aa82409aec0ab3c2a9201d467b) Reviewed-on: https://gerrit.libreoffice.org/34489
-rw-r--r--vcl/unx/gtk/gtksalframe.cxx4
-rw-r--r--vcl/unx/gtk3/gtk3gtkframe.cxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 3eed8905d660..9fd351825da8 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -3822,9 +3822,9 @@ uno::Reference<accessibility::XAccessibleEditableText>
uno::Reference<accessibility::XAccessibleEditableText>(xContext, uno::UNO_QUERY);
if (xText.is())
return xText;
+ if (xState->contains(accessibility::AccessibleStateType::MANAGES_DESCENDANTS))
+ return uno::Reference< accessibility::XAccessibleEditableText >();
}
- 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 1c2486e482ed..f09905b1a30d 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -4002,9 +4002,9 @@ uno::Reference<accessibility::XAccessibleEditableText>
uno::Reference<accessibility::XAccessibleEditableText>(xContext, uno::UNO_QUERY);
if (xText.is())
return xText;
+ if (xState->contains(accessibility::AccessibleStateType::MANAGES_DESCENDANTS))
+ return uno::Reference< accessibility::XAccessibleEditableText >();
}
- if (xState->contains(accessibility::AccessibleStateType::MANAGES_DESCENDANTS))
- return uno::Reference< accessibility::XAccessibleEditableText >();
}
for (sal_Int32 i = 0; i < xContext->getAccessibleChildCount(); ++i)