[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-0' - vcl/unx

[Takeshi Abe]

 vcl/unx/gtk/gtksalframe.cxx   |    2 ++
 vcl/unx/gtk3/gtk3gtkframe.cxx |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit b39b835e1728a8871f017f1af3b3b642fdbff1d8
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Tue Jul 19 06:08:36 2016 +0900

    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 at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 1c81af2c1814e8bd12701f85e09cebf5fe206647)
    Reviewed-on: https://gerrit.libreoffice.org/27330
    (cherry picked from commit 3af2382e6155abbb3e9e6102878bad1fa3f79373)
    Reviewed-on: https://gerrit.libreoffice.org/27357
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 0d8e153..070d98a 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 e8d12e3..21c5bf8 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3949,6 +3949,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)