Revert my fix for tdf#71409, to hopefully fix tdf#104381.

This reverts commit 87e040fd.
This reverts commit a0ef7474.

Conflicts:
	vcl/unx/gtk/a11y/atkutil.cxx

Change-Id: Ib3a799e27b2495ebd1e7723f1cb5babf0dfbc702
Reviewed-on: https://gerrit.libreoffice.org/34730Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>

vcl/unx/gtk/a11y/atkaction.cxx

@@ -49,11 +49,14 @@ static css::uno::Reference<css::accessibility::XAccessibleAction>
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( action );
 
-    if (pWrap)
+    if( pWrap )
     {
-        uno::Reference<accessibility::XAccessibleAction> xAction(
-            pWrap->mpContext.get(), uno::UNO_QUERY);
-        return xAction;
+        if( !pWrap->mpAction.is() )
+        {
+            pWrap->mpAction.set(pWrap->mpContext, css::uno::UNO_QUERY);
+        }
+
+        return pWrap->mpAction;
     }
 
     return css::uno::Reference<css::accessibility::XAccessibleAction>();

vcl/unx/gtk/a11y/atkcomponent.cxx

@@ -28,11 +28,14 @@ static css::uno::Reference<css::accessibility::XAccessibleComponent>
     getComponent( AtkComponent *pComponent )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pComponent );
-    if (pWrap)
+    if( pWrap )
     {
-        uno::Reference<accessibility::XAccessibleComponent> xComp(
-            pWrap->mpContext.get(), uno::UNO_QUERY);
-        return xComp;
+        if( !pWrap->mpComponent.is() )
+        {
+            pWrap->mpComponent.set(pWrap->mpContext, css::uno::UNO_QUERY);
+        }
+
+        return pWrap->mpComponent;
     }
 
     return css::uno::Reference<css::accessibility::XAccessibleComponent>();

vcl/unx/gtk/a11y/atkeditabletext.cxx

@@ -32,11 +32,14 @@ static css::uno::Reference<css::accessibility::XAccessibleEditableText>
     getEditableText( AtkEditableText *pEditableText )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pEditableText );
-    if (pWrap)
+    if( pWrap )
     {
-        uno::Reference<accessibility::XAccessibleEditableText> xET(
-            pWrap->mpContext.get(), uno::UNO_QUERY);
-        return xET;
+        if( !pWrap->mpEditableText.is() )
+        {
+            pWrap->mpEditableText.set(pWrap->mpContext, css::uno::UNO_QUERY);
+        }
+
+        return pWrap->mpEditableText;
     }
 
     return css::uno::Reference<css::accessibility::XAccessibleEditableText>();

vcl/unx/gtk/a11y/atkhypertext.cxx

@@ -194,11 +194,14 @@ static css::uno::Reference<css::accessibility::XAccessibleHypertext>
     getHypertext( AtkHypertext *pHypertext )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pHypertext );
-    if (pWrap)
+    if( pWrap )
     {
-        uno::Reference<accessibility::XAccessibleHypertext> xAH(
-            pWrap->mpContext.get(), uno::UNO_QUERY);
-        return xAH;
+        if( !pWrap->mpHypertext.is() )
+        {
+            pWrap->mpHypertext.set(pWrap->mpContext, css::uno::UNO_QUERY);
+        }
+
+        return pWrap->mpHypertext;
     }
 
     return css::uno::Reference<css::accessibility::XAccessibleHypertext>();

vcl/unx/gtk/a11y/atkimage.cxx

@@ -40,11 +40,14 @@ static css::uno::Reference<css::accessibility::XAccessibleImage>
     getImage( AtkImage *pImage )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pImage );
-    if (pWrap)
+    if( pWrap )
     {
-        uno::Reference<accessibility::XAccessibleImage> xAI(
-            pWrap->mpContext.get(), uno::UNO_QUERY);
-        return xAI;
+        if( !pWrap->mpImage.is() )
+        {
+            pWrap->mpImage.set(pWrap->mpContext, css::uno::UNO_QUERY);
+        }
+
+        return pWrap->mpImage;
     }
 
     return css::uno::Reference<css::accessibility::XAccessibleImage>();

vcl/unx/gtk/a11y/atklistener.cxx

@@ -129,9 +129,6 @@ void AtkListener::updateChildList(
     css::uno::Reference<css::accessibility::XAccessibleContext> const &
         pContext)
 {
-    if (!pContext.is())
-        return;
-
      m_aChildList.clear();
 
      uno::Reference< accessibility::XAccessibleStateSet > xStateSet = pContext->getAccessibleStateSet();
@@ -266,19 +263,6 @@ void AtkListener::handleInvalidateChildren(
     }
 }
 
-void AtkListener::stopListening()
-{
-    uno::Reference<accessibility::XAccessibleEventBroadcaster> xBroadcaster(
-        mpWrapper->mpContext.get(), uno::UNO_QUERY);
-
-    if (xBroadcaster.is())
-    {
-        uno::Reference<accessibility::XAccessibleEventListener> xListener(this);
-        if (xListener.is())
-            xBroadcaster->removeAccessibleEventListener(xListener);
-    }
-}
-
 /*****************************************************************************/
 
 static uno::Reference< accessibility::XAccessibleContext >
@@ -489,10 +473,6 @@ void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEven
             gboolean bState = eNewState != ATK_STATE_INVALID;
             AtkStateType eRealState = bState ? eNewState : eOldState;
 
-            if (eOldState == ATK_STATE_FOCUSED)
-                // Stop listening to object going out-of-focus.
-                stopListening();
-
             atk_object_notify_state_change( atk_obj, eRealState, bState );
             break;
         }

vcl/unx/gtk/a11y/atklistener.hxx

@@ -64,8 +64,6 @@ private:
     // Process INVALIDATE_ALL_CHILDREN notification
     void handleInvalidateChildren(
         const css::uno::Reference< css::accessibility::XAccessibleContext >& rxParent);
-
-    void stopListening();
 };
 
 #endif // INCLUDED_VCL_UNX_GTK_A11Y_ATKLISTENER_HXX

vcl/unx/gtk/a11y/atkselection.cxx

@@ -28,11 +28,14 @@ static css::uno::Reference<css::accessibility::XAccessibleSelection>
     getSelection( AtkSelection *pSelection )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pSelection );
-    if (pWrap)
+    if( pWrap )
     {
-        uno::Reference<accessibility::XAccessibleSelection> xAS(
-            pWrap->mpContext.get(), uno::UNO_QUERY);
-        return xAS;
+        if( !pWrap->mpSelection.is() )
+        {
+            pWrap->mpSelection.set(pWrap->mpContext, css::uno::UNO_QUERY);
+        }
+
+        return pWrap->mpSelection;
     }
 
     return css::uno::Reference<css::accessibility::XAccessibleSelection>();

vcl/unx/gtk/a11y/atktable.cxx

@@ -53,11 +53,14 @@ static css::uno::Reference<css::accessibility::XAccessibleTable>
     getTable( AtkTable *pTable )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pTable );
-    if (pWrap)
+    if( pWrap )
     {
-        uno::Reference<accessibility::XAccessibleTable> xAT(
-            pWrap->mpContext.get(), uno::UNO_QUERY);
-        return xAT;
+        if( !pWrap->mpTable.is() )
+        {
+            pWrap->mpTable.set(pWrap->mpContext, css::uno::UNO_QUERY);
+        }
+
+        return pWrap->mpTable;
     }
 
     return css::uno::Reference<css::accessibility::XAccessibleTable>();

vcl/unx/gtk/a11y/atktext.cxx

@@ -138,11 +138,14 @@ static css::uno::Reference<css::accessibility::XAccessibleText>
     getText( AtkText *pText )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pText );
-    if (pWrap)
+    if( pWrap )
     {
-        uno::Reference<accessibility::XAccessibleText> xAT(
-            pWrap->mpContext.get(), uno::UNO_QUERY);
-        return xAT;
+        if( !pWrap->mpText.is() )
+        {
+            pWrap->mpText.set(pWrap->mpContext, css::uno::UNO_QUERY);
+        }
+
+        return pWrap->mpText;
     }
 
     return css::uno::Reference<css::accessibility::XAccessibleText>();
@@ -155,11 +158,14 @@ static css::uno::Reference<css::accessibility::XAccessibleTextMarkup>
     getTextMarkup( AtkText *pText )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pText );
-    if (pWrap)
+    if( pWrap )
     {
-        uno::Reference<accessibility::XAccessibleTextMarkup> xATM(
-            pWrap->mpContext.get(), uno::UNO_QUERY);
-        return xATM;
+        if( !pWrap->mpTextMarkup.is() )
+        {
+            pWrap->mpTextMarkup.set(pWrap->mpContext, css::uno::UNO_QUERY);
+        }
+
+        return pWrap->mpTextMarkup;
     }
 
     return css::uno::Reference<css::accessibility::XAccessibleTextMarkup>();
@@ -172,11 +178,14 @@ static css::uno::Reference<css::accessibility::XAccessibleTextAttributes>
     getTextAttributes( AtkText *pText )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pText );
-    if (pWrap)
+    if( pWrap )
     {
-        uno::Reference<accessibility::XAccessibleTextAttributes> xATA(
-            pWrap->mpContext.get(), uno::UNO_QUERY);
-        return xATA;
+        if( !pWrap->mpTextAttributes.is() )
+        {
+            pWrap->mpTextAttributes.set(pWrap->mpContext, css::uno::UNO_QUERY);
+        }
+
+        return pWrap->mpTextAttributes;
     }
 
     return css::uno::Reference<css::accessibility::XAccessibleTextAttributes>();
@@ -189,11 +198,14 @@ static css::uno::Reference<css::accessibility::XAccessibleMultiLineText>
     getMultiLineText( AtkText *pText )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pText );
-    if (pWrap)
+    if( pWrap )
     {
-        uno::Reference<accessibility::XAccessibleMultiLineText> xAML(
-            pWrap->mpContext.get(), uno::UNO_QUERY);
-        return xAML;
+        if( !pWrap->mpMultiLineText.is() )
+        {
+            pWrap->mpMultiLineText.set(pWrap->mpContext, css::uno::UNO_QUERY);
+        }
+
+        return pWrap->mpMultiLineText;
     }
 
     return css::uno::Reference<css::accessibility::XAccessibleMultiLineText>();

vcl/unx/gtk/a11y/atktextattributes.cxx

@@ -212,11 +212,14 @@ static css::uno::Reference<css::accessibility::XAccessibleComponent>
     getComponent( AtkText *pText )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pText );
-    if (pWrap)
+    if( pWrap )
     {
-        uno::Reference<accessibility::XAccessibleComponent> xAC(
-            pWrap->mpContext.get(), uno::UNO_QUERY);
-        return xAC;
+        if( !pWrap->mpComponent.is() )
+        {
+            pWrap->mpComponent.set(pWrap->mpContext, css::uno::UNO_QUERY);
+        }
+
+        return pWrap->mpComponent;
     }
 
     return css::uno::Reference<css::accessibility::XAccessibleComponent>();

vcl/unx/gtk/a11y/atkutil.cxx

@@ -87,24 +87,17 @@ atk_wrapper_focus_idle_handler (gpointer data)
             // also emit state-changed:focused event under the same condition.
             {
                 AtkObjectWrapper* wrapper_obj = ATK_OBJECT_WRAPPER (atk_obj);
-
-                if (wrapper_obj)
+                if( wrapper_obj && !wrapper_obj->mpText.is() )
                 {
-                    uno::Reference<accessibility::XAccessibleText> xText(
-                        wrapper_obj->mpContext.get(), uno::UNO_QUERY);
-
-                    if (xText.is())
+                    wrapper_obj->mpText.set(wrapper_obj->mpContext, css::uno::UNO_QUERY);
+                    if ( wrapper_obj->mpText.is() )
                     {
-                        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);
+                        gint caretPos = wrapper_obj->mpText->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 );
                         }
                     }
                 }

vcl/unx/gtk/a11y/atkvalue.cxx

@@ -30,11 +30,14 @@ static css::uno::Reference<css::accessibility::XAccessibleValue>
     getValue( AtkValue *pValue )
 {
     AtkObjectWrapper *pWrap = ATK_OBJECT_WRAPPER( pValue );
-    if (pWrap)
+    if( pWrap )
     {
-        uno::Reference<accessibility::XAccessibleValue> xAV(
-            pWrap->mpContext.get(), uno::UNO_QUERY);
-        return xAV;
+        if( !pWrap->mpValue.is() )
+        {
+            pWrap->mpValue.set(pWrap->mpContext, css::uno::UNO_QUERY);
+        }
+
+        return pWrap->mpValue;
     }
 
     return css::uno::Reference<css::accessibility::XAccessibleValue>();

vcl/unx/gtk/a11y/atkwrapper.hxx

@@ -22,19 +22,49 @@
 
 #include <atk/atk.h>
 #include <com/sun/star/accessibility/XAccessible.hpp>
-#include <cppuhelper/weakref.hxx>
 
 extern "C" {
 
+namespace com { namespace sun { namespace star { namespace accessibility {
+    class XAccessibleAction;
+    class XAccessibleComponent;
+    class XAccessibleEditableText;
+    class XAccessibleHypertext;
+    class XAccessibleImage;
+    class XAccessibleMultiLineText;
+    class XAccessibleSelection;
+    class XAccessibleTable;
+    class XAccessibleText;
+    class XAccessibleTextMarkup;
+    class XAccessibleTextAttributes;
+    class XAccessibleValue;
+} } } }
+
 struct AtkObjectWrapper
 {
     AtkObject aParent;
 
     css::uno::Reference<css::accessibility::XAccessible> mpAccessible;
-    css::uno::WeakReference<css::accessibility::XAccessibleContext> mpContext;
+    css::uno::Reference<css::accessibility::XAccessibleContext> mpContext;
+    css::uno::Reference<css::accessibility::XAccessibleAction> mpAction;
+    css::uno::Reference<css::accessibility::XAccessibleComponent> mpComponent;
+    css::uno::Reference<css::accessibility::XAccessibleEditableText>
+        mpEditableText;
+    css::uno::Reference<css::accessibility::XAccessibleHypertext> mpHypertext;
+    css::uno::Reference<css::accessibility::XAccessibleImage> mpImage;
+    css::uno::Reference<css::accessibility::XAccessibleMultiLineText>
+        mpMultiLineText;
+    css::uno::Reference<css::accessibility::XAccessibleSelection> mpSelection;
+    css::uno::Reference<css::accessibility::XAccessibleTable> mpTable;
+    css::uno::Reference<css::accessibility::XAccessibleText> mpText;
+    css::uno::Reference<css::accessibility::XAccessibleTextMarkup> mpTextMarkup;
+    css::uno::Reference<css::accessibility::XAccessibleTextAttributes>
+        mpTextAttributes;
+    css::uno::Reference<css::accessibility::XAccessibleValue> mpValue;
 
     AtkObject *child_about_to_be_removed;
     gint       index_of_child_about_to_be_removed;
+//    OString * m_pKeyBindings
 };
 
 struct AtkObjectWrapperClass