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

[Caolán McNamara]

 vcl/unx/gtk/a11y/atkutil.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 2bde5822604f0cd7f52e2a72899b8464ae7d2d5d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 18 09:15:23 2017 +0100

    catch exception like text_wrapper_get_caret_offset does
    
    Change-Id: I7d681a5cd58af60005eefa9969ec975d5cfc5580
    (cherry picked from commit 0d2a607a849e3f1b51092c7d96bc5529420cfab2)
    Reviewed-on: https://gerrit.libreoffice.org/36637
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 160a6f6c7ef2..031290147b45 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -90,7 +90,14 @@ atk_wrapper_focus_idle_handler (gpointer data)
                     wrapper_obj->mpText.set(wrapper_obj->mpContext, css::uno::UNO_QUERY);
                     if ( wrapper_obj->mpText.is() )
                     {
-                        gint caretPos = wrapper_obj->mpText->getCaretPosition();
+                        gint caretPos = -1;
+
+                        try {
+                            caretPos = wrapper_obj->mpText->getCaretPosition();
+                        }
+                        catch(const uno::Exception&) {
+                            g_warning( "Exception in getCaretPosition()" );
+                        }
 
                         if ( caretPos != -1 )
                         {