diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-11-22 19:36:04 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-11-24 01:00:53 +0100 |
commit | ccb1e06bdb3c37c82ddc7b61135eda09fcdecae4 (patch) | |
tree | 0e38b3e9482d3bdf0588da5cf15b28ed783a980f /winaccessibility/source | |
parent | a5e281ff0468416e5bb20b16ccac16550a83a9fd (diff) |
winaccessibility: don't need 2 global pointers for AccObjectWinManager
Sadly can't use rtl::Static because it needs a ctor parameter...
Change-Id: I98bbfbb4d2ef54f40a5f110527b260c0b5b01eed
Diffstat (limited to 'winaccessibility/source')
-rw-r--r-- | winaccessibility/source/service/AccObjectWinManager.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
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; } |