diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-26 19:37:50 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-28 00:59:50 +0100 |
| commit | ef3f28d0ce641e9d51d91412b176a1ecbdc69773 (patch) | |
| tree | f75e024c02daf971dad8d2f1523850c3b32b7505 /winaccessibility/inc | |
| parent | 576ba8ce8238f6a092c74750a895e2e77297fc7e (diff) | |
winaccessibility: use rtl::Reference for listener lifecycle
The manual acquire() call was apparently not coupled with a release()?
Change-Id: I069c969619e9afce2a4b836642cc1675025b11d0
Diffstat (limited to 'winaccessibility/inc')
| -rw-r--r-- | winaccessibility/inc/AccObject.hxx | 6 | ||||
| -rw-r--r-- | winaccessibility/inc/AccObjectWinManager.hxx | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/winaccessibility/inc/AccObject.hxx b/winaccessibility/inc/AccObject.hxx index 4f19c0fa8fd4..934b95db1297 100644 --- a/winaccessibility/inc/AccObject.hxx +++ b/winaccessibility/inc/AccObject.hxx @@ -25,6 +25,8 @@ #include <oleacc.h> #include <windows.h> +#include <rtl/ref.hxx> + #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/accessibility/XAccessibleAction.hpp> @@ -51,7 +53,7 @@ private: IMAccessible* m_pIMAcc; AccObject* m_pParentObj; IAccChildList m_childrenList; - AccEventListener* m_accListener; + ::rtl::Reference<AccEventListener> m_pListener; IAccSelectionList m_selectionList; ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible > m_xAccRef; @@ -86,7 +88,7 @@ public: void SetParentHWND(HWND hWnd);//need to set top window handle when send event to AT HWND GetParentHWND(); - void SetListener( AccEventListener* Listener ); + void SetListener(::rtl::Reference<AccEventListener> const& pListener); AccEventListener* getListener(); void SetParentObj(AccObject* pParentAccObj); diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx index ab05a212a8e0..afe4fe0adbc8 100644 --- a/winaccessibility/inc/AccObjectWinManager.hxx +++ b/winaccessibility/inc/AccObjectWinManager.hxx @@ -26,7 +26,7 @@ #include <map> #include <windows.h> #include <osl/mutex.hxx> -#include <vcl/dllapi.h> +#include <rtl/ref.hxx> #include "ResIDGenerator.hxx" #include "UAccCOM.h" @@ -90,7 +90,8 @@ private: void DeleteFromHwndXAcc(com::sun::star::accessibility::XAccessible* pXAcc ); int UpdateAccSelection(com::sun::star::accessibility::XAccessible* pXAcc); - AccEventListener* createAccEventListener(com::sun::star::accessibility::XAccessible* pXAcc, AccObjectManagerAgent* Agent); + ::rtl::Reference<AccEventListener> CreateAccEventListener( + com::sun::star::accessibility::XAccessible* pXAcc); public: virtual ~AccObjectWinManager(); sal_Bool InsertAccObj( com::sun::star::accessibility::XAccessible* pXAcc,com::sun::star::accessibility::XAccessible* pParentXAcc,HWND pWnd); |