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

[Caolán McNamara]

 vcl/unx/gtk/a11y/atkutil.cxx |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 08e6fe3d120ad3e64c42022686579982a8af11c1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 22 13:19:11 2016 +0000

    Resolves: tdf#104687 gtk2 paste cell text under a11y is fatal
    
    Change-Id: Ia26ecf381e491b5591e05e0051b7162eb1d4bb56
    (cherry picked from commit 88dad8fe1a94055dcbb05a6e6f0df2d007914a45)

diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 3419259..bf80973 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -94,12 +94,16 @@ atk_wrapper_focus_idle_handler (gpointer data)
 
                     if (xText.is())
                     {
-                        gint caretPos = xText->getCaretPosition();
-
-                        if ( caretPos != -1 )
-                        {
-                            atk_object_notify_state_change( atk_obj, ATK_STATE_FOCUSED, TRUE );
-                            g_signal_emit_by_name( atk_obj, "text_caret_moved", caretPos );
+                        try {
+                            gint caretPos = xText->getCaretPosition();
+
+                            if ( caretPos != -1 )
+                            {
+                                atk_object_notify_state_change( atk_obj, ATK_STATE_FOCUSED, TRUE );
+                                g_signal_emit_by_name( atk_obj, "text_caret_moved", caretPos );
+                            }
+                        } catch (const uno::Exception& e) {
+                            SAL_INFO("vcl.a11y", "exception: " << e.Message);
                         }
                     }
                 }