diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-16 15:37:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-17 11:00:06 +0200 |
| commit | be0089b58b1a4a2f2d73a8da0b40b7b029c277a2 (patch) | |
| tree | 7c70a7eab3572a4281116c7de206fc4d5e61f85b /accessibility/inc/extended | |
| parent | 76f81d58ab0cd701182f2d55281546ecd8b08c2c (diff) | |
use rtl::Reference in AccessibleBrowseBoxAccess
instead of storing a raw pointer and a uno::Reference
Change-Id: I4326cbda900e053599f1e753cb1bff122bdecc44
Diffstat (limited to 'accessibility/inc/extended')
| -rw-r--r-- | accessibility/inc/extended/AccessibleBrowseBox.hxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx index bc6f1a5ea384..69debf478f35 100644 --- a/accessibility/inc/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx @@ -195,15 +195,12 @@ class AccessibleBrowseBoxAccess: public ::svt::IAccessibleBrowseBox { private: - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; css::uno::Reference< css::accessibility::XAccessible > m_xParent; ::svt::IAccessibleTableProvider& m_rBrowseBox; - css::uno::Reference< css::accessibility::XAccessibleContext > - m_xContext; - AccessibleBrowseBox* m_pContext; - // note that this pointer is valid as long as m_xContext is valid! + rtl::Reference<AccessibleBrowseBox> m_xContext; public: AccessibleBrowseBoxAccess( @@ -212,7 +209,7 @@ public: ); /// returns the AccessibleContext belonging to this Accessible - inline AccessibleBrowseBox* getContext() { return m_pContext; } + inline AccessibleBrowseBox* getContext() { return m_xContext.get(); } protected: virtual ~AccessibleBrowseBoxAccess() override; @@ -230,7 +227,7 @@ protected: void dispose() override; virtual bool isAlive() const override { - return m_pContext && m_pContext->isAlive(); + return m_xContext.is() && m_xContext->isAlive(); } virtual css::uno::Reference< css::accessibility::XAccessible > getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) override |