winaccessibility: don't need 2 global pointers for AccObjectWinManager

Sadly can't use rtl::Static because it needs a ctor parameter...

Change-Id: I98bbfbb4d2ef54f40a5f110527b260c0b5b01eed
(cherry picked from commit ccb1e06bdb3c37c82ddc7b61135eda09fcdecae4)

2 files changed, 3 insertions, 8 deletions

diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx
index 41ae6a267c0c..ab05a212a8e0 100644
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -70,7 +70,6 @@ private:
     com::sun::star::accessibility::XAccessible* oldFocus;
 
     AccObjectManagerAgent*   pAgent;
-    static AccObjectWinManager* me;
     ResIDGenerator ResIdGen;
 
     AccObjectWinManager(AccObjectManagerAgent* Agent=NULL);
diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx
index 5773a631a998..0e9c165024eb 100644
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -54,7 +54,6 @@ using namespace com::sun::star::accessibility::AccessibleStateType;
 using namespace com::sun::star::uno;
 
 AccObjectWinManager* g_acc_manager = NULL;
-AccObjectWinManager* AccObjectWinManager::me = NULL;
 
 /**
    * Implementation of interface XMSAAService's method getAccObjectPtr() that return the
@@ -97,14 +96,11 @@ AccObjectWinManager::AccObjectWinManager( AccObjectManagerAgent* Agent ):
    */
 AccObjectWinManager* AccObjectWinManager::CreateAccObjectWinManagerInstance( AccObjectManagerAgent* Agent )
 {
-    if( me == NULL )
+    if (!g_acc_manager)
     {
-        me = new AccObjectWinManager( Agent );
-        g_acc_manager = me;
-        return me;
+        g_acc_manager = new AccObjectWinManager( Agent );
     }
-
-    return me;
+    return g_acc_manager;
 }