use actual type in AccessibleImageBullet

instead of casting everywhere

Change-Id: I954f6f1ef18baa7888d7447d64e8e7a8e5141a13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131709
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 16 insertions, 20 deletions

diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index a83f427bfeba..fbe9bee21571 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -65,14 +65,13 @@ namespace accessibility
         try
         {
             // Create the state set.
-            rtl::Reference<::utl::AccessibleStateSetHelper> pStateSet  = new ::utl::AccessibleStateSetHelper ();
-            mxStateSet = pStateSet;
+            mxStateSet  = new ::utl::AccessibleStateSetHelper ();
 
             // these are always on
-            pStateSet->AddState( AccessibleStateType::VISIBLE );
-            pStateSet->AddState( AccessibleStateType::SHOWING );
-            pStateSet->AddState( AccessibleStateType::ENABLED );
-            pStateSet->AddState( AccessibleStateType::SENSITIVE );
+            mxStateSet->AddState( AccessibleStateType::VISIBLE );
+            mxStateSet->AddState( AccessibleStateType::SHOWING );
+            mxStateSet->AddState( AccessibleStateType::ENABLED );
+            mxStateSet->AddState( AccessibleStateType::SENSITIVE );
         }
         catch( const uno::Exception& ) {}
     }
@@ -160,12 +159,11 @@ namespace accessibility
         SolarMutexGuard aGuard;
 
         // Create a copy of the state set and return it.
-        ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
 
-        if( !pStateSet )
+        if( !mxStateSet )
             return uno::Reference<XAccessibleStateSet>();
 
-        return uno::Reference<XAccessibleStateSet>( new ::utl::AccessibleStateSetHelper (*pStateSet) );
+        return uno::Reference<XAccessibleStateSet>( new ::utl::AccessibleStateSetHelper (*mxStateSet) );
     }
 
     lang::Locale SAL_CALL AccessibleImageBullet::getLocale()
@@ -429,24 +427,20 @@ namespace accessibility
 
     void AccessibleImageBullet::SetState( const sal_Int16 nStateId )
     {
-
-        ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
-        if( pStateSet != nullptr &&
-            !pStateSet->contains(nStateId) )
+        if( mxStateSet != nullptr &&
+            !mxStateSet->contains(nStateId) )
         {
-            pStateSet->AddState( nStateId );
+            mxStateSet->AddState( nStateId );
             FireEvent( AccessibleEventId::STATE_CHANGED, uno::makeAny( nStateId ) );
         }
     }
 
     void AccessibleImageBullet::UnSetState( const sal_Int16 nStateId )
     {
-
-        ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
-        if( pStateSet != nullptr &&
-            pStateSet->contains(nStateId) )
+        if( mxStateSet != nullptr &&
+            mxStateSet->contains(nStateId) )
         {
-            pStateSet->RemoveState( nStateId );
+            mxStateSet->RemoveState( nStateId );
             FireEvent( AccessibleEventId::STATE_CHANGED, uno::Any(), uno::makeAny( nStateId ) );
         }
     }
diff --git a/editeng/source/accessibility/AccessibleImageBullet.hxx b/editeng/source/accessibility/AccessibleImageBullet.hxx
index b1041ce4aa56..a679d8366af4 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.hxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.hxx
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <rtl/ref.hxx>
 #include <tools/gen.hxx>
 #include <cppuhelper/implbase.hxx>
 
@@ -32,6 +33,7 @@
 class SvxEditSource;
 class SvxTextForwarder;
 class SvxViewForwarder;
+namespace utl { class AccessibleStateSetHelper; }
 
 namespace accessibility
 {
@@ -186,7 +188,7 @@ namespace accessibility
         Point maEEOffset;
 
         // the current state set (updated from SetState/UnSetState and guarded by solar mutex)
-        css::uno::Reference< css::accessibility::XAccessibleStateSet > mxStateSet;
+        rtl::Reference< utl::AccessibleStateSetHelper > mxStateSet;
 
         /// The shape we're the accessible for (unguarded)
         css::uno::Reference< css::accessibility::XAccessible > mxParent;