1 files changed, 19 insertions, 31 deletions

diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index b647036c316d..db5e6cf140fe 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -27,13 +27,13 @@
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <comphelper/accessiblecontexthelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <unotools/accessiblestatesethelper.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
+#include <vcl/ctrl.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/unohelp2.hxx>
 #include <vcl/status.hxx>
-#include <vcl/toolkit/controllayout.hxx>
 #include <vcl/settings.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
@@ -128,15 +128,15 @@ OUString VCLXAccessibleStatusBarItem::GetItemText()
 }
 
 
-void VCLXAccessibleStatusBarItem::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
+void VCLXAccessibleStatusBarItem::FillAccessibleStateSet( sal_Int64& rStateSet )
 {
-    rStateSet.AddState( AccessibleStateType::ENABLED );
-    rStateSet.AddState( AccessibleStateType::SENSITIVE );
+    rStateSet |= AccessibleStateType::ENABLED;
+    rStateSet |= AccessibleStateType::SENSITIVE;
 
-    rStateSet.AddState( AccessibleStateType::VISIBLE );
+    rStateSet |= AccessibleStateType::VISIBLE;
 
     if ( IsShowing() )
-        rStateSet.AddState( AccessibleStateType::SHOWING );
+        rStateSet |= AccessibleStateType::SHOWING;
 }
 
 
@@ -176,24 +176,12 @@ void VCLXAccessibleStatusBarItem::implGetSelection( sal_Int32& nStartIndex, sal_
 }
 
 
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleStatusBarItem, AccessibleTextHelper_BASE, VCLXAccessibleStatusBarItem_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleStatusBarItem, AccessibleTextHelper_BASE, VCLXAccessibleStatusBarItem_BASE )
-
-
 // XComponent
 
 
 void VCLXAccessibleStatusBarItem::disposing()
 {
-    AccessibleTextHelper_BASE::disposing();
+    comphelper::OAccessibleTextHelper::disposing();
 
     m_pStatusBar = nullptr;
     m_sItemName.clear();
@@ -206,7 +194,7 @@ void VCLXAccessibleStatusBarItem::disposing()
 
 OUString VCLXAccessibleStatusBarItem::getImplementationName()
 {
-    return "com.sun.star.comp.toolkit.AccessibleStatusBarItem";
+    return u"com.sun.star.comp.toolkit.AccessibleStatusBarItem"_ustr;
 }
 
 
@@ -218,7 +206,7 @@ sal_Bool VCLXAccessibleStatusBarItem::supportsService( const OUString& rServiceN
 
 Sequence< OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames()
 {
-    return { "com.sun.star.awt.AccessibleStatusBarItem" };
+    return { u"com.sun.star.awt.AccessibleStatusBarItem"_ustr };
 }
 
 
@@ -236,7 +224,7 @@ Reference< XAccessibleContext > VCLXAccessibleStatusBarItem::getAccessibleContex
 // XAccessibleContext
 
 
-sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount()
+sal_Int64 VCLXAccessibleStatusBarItem::getAccessibleChildCount()
 {
     OExternalLockGuard aGuard( this );
 
@@ -244,7 +232,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount()
 }
 
 
-Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_Int32 )
+Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_Int64 )
 {
     throw IndexOutOfBoundsException();
 }
@@ -262,11 +250,11 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent(  )
 }
 
 
-sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent(  )
+sal_Int64 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent(  )
 {
     OExternalLockGuard aGuard( this );
 
-    sal_Int32 nIndexInParent = -1;
+    sal_Int64 nIndexInParent = -1;
     if ( m_pStatusBar )
         nIndexInParent = m_pStatusBar->GetItemPos( m_nItemId );
 
@@ -310,22 +298,22 @@ Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRe
 }
 
 
-Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleStateSet(  )
+sal_Int64 VCLXAccessibleStatusBarItem::getAccessibleStateSet(  )
 {
     OExternalLockGuard aGuard( this );
 
-    rtl::Reference<utl::AccessibleStateSetHelper> pStateSetHelper = new utl::AccessibleStateSetHelper;
+    sal_Int64 nStateSet = 0;
 
     if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
     {
-        FillAccessibleStateSet( *pStateSetHelper );
+        FillAccessibleStateSet( nStateSet );
     }
     else
     {
-        pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+        nStateSet |= AccessibleStateType::DEFUNC;
     }
 
-    return pStateSetHelper;
+    return nStateSet;
 }