Kaydet (Commit) ccb1e06b authored tarafından Michael Stahl's avatar Michael Stahl

winaccessibility: don't need 2 global pointers for AccObjectWinManager

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

Change-Id: I98bbfbb4d2ef54f40a5f110527b260c0b5b01eed
üst a5e281ff
......@@ -70,7 +70,6 @@ private:
com::sun::star::accessibility::XAccessible* oldFocus;
AccObjectManagerAgent* pAgent;
static AccObjectWinManager* me;
ResIDGenerator ResIdGen;
AccObjectWinManager(AccObjectManagerAgent* Agent=NULL);
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment