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

[Stephan Bergmann]

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

New commits:
commit 18744f661be29d5f41421c5b71b2434097e8ef4c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 29 21:59:28 2011 +0100

    help gcc 4.6.1 out with ambiguity

diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 68bb949..e662f6e 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -312,8 +312,12 @@ void DocumentFocusListener::attachRecursive(
     uno::Reference< accessibility::XAccessibleEventBroadcaster > xBroadcaster =
         uno::Reference< accessibility::XAccessibleEventBroadcaster >(xContext, uno::UNO_QUERY);
 
+    if (!xBroadcaster.is())
+        return;
+
     // If not already done, add the broadcaster to the list and attach as listener.
-    if( xBroadcaster.is() && m_aRefList.insert(xBroadcaster).second )
+    uno::Reference< uno::XInterface > xInterface = xBroadcaster;
+    if( m_aRefList.insert(xInterface).second )
     {
         xBroadcaster->addEventListener(static_cast< accessibility::XAccessibleEventListener *>(this));