use rtl::Reference in SvxShowCharSetItem

instead of raw pointer and uno::Reference

Change-Id: I92eb7f5a2e710eade580af71b157b3d1eee7b79f

3 files changed, 13 insertions, 17 deletions

diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 97f523c5b552..ac60371cbe80 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -225,7 +225,6 @@ void SAL_CALL SvxShowCharSetVirtualAcc::disposing()
 SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc*  _pParent,sal_uInt16 _nPos ) :
     mrParent( rParent )
     ,mnId( _nPos )
-    ,m_pItem(nullptr)
     ,m_pParent(_pParent)
 {
 }
@@ -233,24 +232,22 @@ SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAc
 
 SvxShowCharSetItem::~SvxShowCharSetItem()
 {
-    if ( m_xAcc.is() )
+    if ( m_xItem.is() )
     {
-        m_pItem->ParentDestroyed();
-        m_pItem = nullptr;
-        m_xAcc  = nullptr;
+        m_xItem->ParentDestroyed();
+        m_xItem.clear();
     }
 }
 
 
-uno::Reference< css::accessibility::XAccessible > const & SvxShowCharSetItem::GetAccessible()
+uno::Reference< css::accessibility::XAccessible > SvxShowCharSetItem::GetAccessible()
 {
-    if( !m_xAcc.is() )
+    if( !m_xItem.is() )
     {
-        m_pItem = new SvxShowCharSetItemAcc( this );
-        m_xAcc = m_pItem;
+        m_xItem = new SvxShowCharSetItemAcc( this );
     }
 
-    return m_xAcc;
+    return m_xItem.get();
 }
 
 
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 462a11f81c03..9bfa8d95e3b2 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -632,15 +632,15 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus )
             else
                 m_xAccessible->fireEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED_NOFOCUS, Any(), makeAny(pItem->GetAccessible()) ); // this call assures that m_pItem is set
 
-            assert(pItem->m_pItem && "No accessible created!");
+            assert(pItem->m_xItem.is() && "No accessible created!");
             Any aOldAny, aNewAny;
             aNewAny <<= AccessibleStateType::FOCUSED;
             // Don't fire the focus event.
             if ( bFocus )
-                pItem->m_pItem->fireEvent( AccessibleEventId::STATE_CHANGED, aOldAny, aNewAny );
+                pItem->m_xItem->fireEvent( AccessibleEventId::STATE_CHANGED, aOldAny, aNewAny );
 
             aNewAny <<= AccessibleStateType::SELECTED;
-            pItem->m_pItem->fireEvent( AccessibleEventId::STATE_CHANGED, aOldAny, aNewAny );
+            pItem->m_xItem->fireEvent( AccessibleEventId::STATE_CHANGED, aOldAny, aNewAny );
         }
     }
     aHighHdl.Call( this );
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 73bc31e599fc..3063acb8fcc8 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -101,14 +101,13 @@ namespace svx
         sal_uInt16                  mnId;
         OUString                    maText;
         Rectangle                   maRect;
-        SvxShowCharSetItemAcc*      m_pItem;
+        rtl::Reference<SvxShowCharSetItemAcc>  m_xItem;
         SvxShowCharSetAcc*          m_pParent;
-        css::uno::Reference< css::accessibility::XAccessible > m_xAcc;
 
-        SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc*  _pParent,sal_uInt16 _nPos );
+        SvxShowCharSetItem( SvxShowCharSet& rParent, SvxShowCharSetAcc* _pParent, sal_uInt16 _nPos );
         ~SvxShowCharSetItem();
 
-        css::uno::Reference< css::accessibility::XAccessible > const &    GetAccessible();
+        css::uno::Reference< css::accessibility::XAccessible > GetAccessible();
     };