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

[Caolán McNamara]

 vcl/unx/gtk/window/gtkframe.cxx |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit c5827cd5ef54c189eadbc12ff2f971fe1235723d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 17 09:13:50 2010 +0000

    Resolves: rhbz#654203# crash after unhandled exception
    (cherry picked from commit 4af5d4b6be76231c0db1a0f5dcbfdd5dab293f2c)

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 43833df..18ac631 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -3788,11 +3788,18 @@ uno::Reference<accessibility::XAccessibleEditableText> lcl_GetxText()
     uno::Reference<accessibility::XAccessibleEditableText> xText;
     Window* pFocusWin = ImplGetSVData()->maWinData.mpFocusWin;
     if (!pFocusWin)
-    return xText;
+        return xText;
 
-    uno::Reference< accessibility::XAccessible > xAccessible( pFocusWin->GetAccessible( true ) );
-    if (xAccessible.is())
-        xText = FindFocus(xAccessible->getAccessibleContext());
+    try
+    {
+        uno::Reference< accessibility::XAccessible > xAccessible( pFocusWin->GetAccessible( true ) );
+        if (xAccessible.is())
+            xText = FindFocus(xAccessible->getAccessibleContext());
+    }
+    catch(const uno::Exception& e)
+    {
+        g_warning( "Exception in getting input method surrounding text" );
+    }
     return xText;
 }