[API CHANGE] Drop css::accessibility::XAccessibleStateSet

which is internal API, unused (as far as I can tell) by external
users.
This state is purely a bitset
(as implemented by utl::AccessibleStateSetHelper)
so we can just return it as a 64-bit value.

This shaves significant time off the performance profiles
of code that loads very complex shapes, because this state
is frequently used, and we no longer need to allocate a return
value on the heap for every call.

Change-Id: Icf1b3bd367c256646ae9015f9127025f59459c2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136786
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

36 files changed, 53 insertions, 114 deletions

diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index 7e9ada30ab86..b10cb4d7bc7e 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -29,7 +29,6 @@
 #include <cppuhelper/compbase5.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <unotools/accessiblestatesethelper.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
@@ -43,10 +42,6 @@
 
 namespace vcl { class Window; }
 
-namespace utl {
-    class AccessibleStateSetHelper;
-}
-
 namespace vcl {
     class IAccessibleTableProvider;
 }
@@ -131,7 +126,7 @@ public:
     virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override;
 
     /** @return  The set of current states. */
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() override;
+    virtual sal_Int64 SAL_CALL getAccessibleStateSet() override;
 
     /** @return  The parent's locale. */
     virtual css::lang::Locale SAL_CALL getLocale() override;
@@ -248,13 +243,13 @@ protected:
         @return  The bounding box (VCL rect.) in screen coordinates. */
     virtual tools::Rectangle implGetBoundingBoxOnScreen() = 0;
 
-    /** Creates a new AccessibleStateSetHelper and fills it with states of the
+    /** Creates a bitset of states of the
         current object. This method calls FillStateSet at the BrowseBox which
         fills it with more states depending on the object type. Derived classes
         may overwrite this method and add more states.
         @attention  This method requires locked mutex's.
-        @return  A filled AccessibleStateSetHelper. */
-    virtual rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper();
+    */
+    virtual sal_Int64 implCreateStateSet();
 
     // internal helper methods
 
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index 76c70344096c..cb2a771100ae 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -39,7 +39,7 @@ namespace accessibility
 
         virtual ~AccessibleCheckBoxCell() override {}
 
-        virtual rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper() override;
+        virtual sal_Int64 implCreateStateSet() override;
 
     public:
         AccessibleCheckBoxCell(const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
index 1a895a045832..61e667d594c4 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
@@ -54,12 +54,9 @@ namespace accessibility
         */
         virtual OUString SAL_CALL getImplementationName() override;
 
-        /** Creates a new AccessibleStateSetHelper and fills it with states of the
-            current object.
-            @return
-                A filled AccessibleStateSetHelper.
+        /** Return a bitset of states of the current object.
         */
-        rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper() override;
+        sal_Int64 implCreateStateSet() override;
 
     private:
         virtual tools::Rectangle implGetBoundingBox() override;
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
index 2b7e28c7d48f..09ee9c62d26b 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
@@ -84,12 +84,9 @@ namespace accessibility
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
             getAccessibleChild( sal_Int32 nChildIndex ) override;
 
-        /** Creates a new AccessibleStateSetHelper and fills it with states of the
-            current object.
-            @return
-                A filled AccessibleStateSetHelper.
+        /** Return a bitset of states of the current object.
         */
-        rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper() override;
+        sal_Int64 implCreateStateSet() override;
 
         // XAccessible ------------------------------------------------------------
 
diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx
index 8523b78926d6..6338d147d64f 100644
--- a/accessibility/inc/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx
@@ -27,7 +27,6 @@
 #include <cppuhelper/compbase4.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <unotools/accessiblestatesethelper.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
@@ -39,10 +38,6 @@
 
 namespace vcl { class Window; }
 
-namespace utl {
-    class AccessibleStateSetHelper;
-}
-
 
 namespace accessibility {
 
@@ -103,8 +98,7 @@ public:
         getAccessibleRelationSet() override;
 
     /** @return  The set of current states. */
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
-        getAccessibleStateSet() override;
+    virtual sal_Int64 SAL_CALL getAccessibleStateSet() override;
 
     /** @return  The parent's locale. */
     virtual css::lang::Locale SAL_CALL getLocale() override;
@@ -212,13 +206,13 @@ protected:
     //    @return  The bounding box (VCL rect.) in screen coordinates. */
     virtual tools::Rectangle implGetBoundingBoxOnScreen() = 0;
 
-    /** Creates a new AccessibleStateSetHelper and fills it with states of the
+    /** Creates a bitset of states of the
         current object. This method calls FillStateSet at the GridControl which
         fills it with more states depending on the object type. Derived classes
         may overwrite this method and add more states.
         @attention  This method requires locked mutex's.
-        @return  A filled AccessibleStateSetHelper. */
-    virtual rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper();
+    */
+    virtual sal_Int64 implCreateStateSet();
 
     // internal helper methods
 
diff --git a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
index c9a0fde32032..003c3bbb4468 100644
--- a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
@@ -64,12 +64,9 @@ namespace accessibility
         */
         virtual OUString SAL_CALL getImplementationName() override;
 
-        /** Creates a new AccessibleStateSetHelper and fills it with states of the
-            current object.
-            @return
-                A filled AccessibleStateSetHelper.
+        /** Return a bitset of states of the current object.
         */
-        rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper() override;
+        sal_Int64 implCreateStateSet() override;
 
     private:
         virtual tools::Rectangle implGetBoundingBox() override;
diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
index 6e3ee3367ae8..2d89d009153d 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
@@ -112,12 +112,9 @@ namespace accessibility
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
             getAccessibleChild( sal_Int32 nChildIndex ) override;
 
-        /** Creates a new AccessibleStateSetHelper and fills it with states of the
-            current object.
-            @return
-                A filled AccessibleStateSetHelper.
+        /** Return a bitset of states of the current object.
         */
-        rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper() override;
+        sal_Int64 implCreateStateSet() override;
 
         // XAccessible ------------------------------------------------------------
 
diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
index 093a3ade4587..ffb1cf5fb695 100644
--- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
@@ -62,7 +62,7 @@ namespace accessibility
         virtual OUString SAL_CALL getAccessibleDescription(  ) override;
         virtual OUString SAL_CALL getAccessibleName(  ) override;
         virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleStateSet(  ) override;
 
         sal_Int16 SAL_CALL getAccessibleRole() override;
 
diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
index 836956fc4121..9f3f64d2658f 100644
--- a/accessibility/inc/extended/accessibleiconchoicectrl.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
@@ -46,7 +46,7 @@ namespace accessibility
         virtual void SAL_CALL   disposing() override;
 
         virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
-        virtual void    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+        virtual void    FillAccessibleStateSet( sal_Int64& rStateSet ) override;
 
         VclPtr< SvtIconChoiceCtrl > getCtrl() const;
 
diff --git a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
index 915736e95c0e..93077f89bcf2 100644
--- a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
@@ -126,7 +125,7 @@ namespace accessibility
         virtual OUString SAL_CALL getAccessibleDescription(  ) override;
         virtual OUString SAL_CALL getAccessibleName(  ) override;
         virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleStateSet(  ) override;
         virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
         // XAccessibleComponent
diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx
index 40b01ea180a5..abb09388c952 100644
--- a/accessibility/inc/extended/accessiblelistbox.hxx
+++ b/accessibility/inc/extended/accessiblelistbox.hxx
@@ -53,7 +53,7 @@ namespace accessibility
         // VCLXAccessibleComponent
         virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
         virtual void    ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent ) override;
-        virtual void    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+        virtual void    FillAccessibleStateSet( sal_Int64& rStateSet ) override;
 
     private:
         VclPtr< SvTreeListBox > getListBox() const;
diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx
index 449803bc35b5..b065e8947c49 100644
--- a/accessibility/inc/extended/accessiblelistboxentry.hxx
+++ b/accessibility/inc/extended/accessiblelistboxentry.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
@@ -150,7 +149,7 @@ namespace accessibility
         virtual OUString SAL_CALL getAccessibleDescription(  ) override;
         virtual OUString SAL_CALL getAccessibleName(  ) override;
         virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleStateSet(  ) override;
         virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
         // XAccessibleComponent
diff --git a/accessibility/inc/extended/accessibletabbar.hxx b/accessibility/inc/extended/accessibletabbar.hxx
index 973bbbe2e474..f8a9bb2b5eb9 100644
--- a/accessibility/inc/extended/accessibletabbar.hxx
+++ b/accessibility/inc/extended/accessibletabbar.hxx
@@ -26,10 +26,6 @@
 
 #include <vector>
 
-namespace utl {
-class AccessibleStateSetHelper;
-}
-
 
 namespace accessibility
 {
@@ -49,7 +45,7 @@ namespace accessibility
         AccessibleChildren      m_aAccessibleChildren;
 
         virtual void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
-        void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+        void            FillAccessibleStateSet( sal_Int64& rStateSet );
 
         // OCommonAccessibleComponent
         virtual css::awt::Rectangle implGetBounds(  ) override;
@@ -83,7 +79,7 @@ namespace accessibility
         virtual OUString SAL_CALL getAccessibleDescription(  ) override;
         virtual OUString SAL_CALL getAccessibleName(  ) override;
         virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleStateSet(  ) override;
         virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
         // XAccessibleComponent
diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx b/accessibility/inc/extended/accessibletabbarpage.hxx
index 81bf83f24d68..35c0b9baf417 100644
--- a/accessibility/inc/extended/accessibletabbarpage.hxx
+++ b/accessibility/inc/extended/accessibletabbarpage.hxx
@@ -24,10 +24,6 @@
 #include <cppuhelper/implbase2.hxx>
 #include <extended/accessibletabbarbase.hxx>
 
-namespace utl {
-class AccessibleStateSetHelper;
-}
-
 
 namespace accessibility
 {
@@ -62,7 +58,7 @@ namespace accessibility
 
         sal_uInt16              GetPageId() const { return m_nPageId; }
 
-        void                    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+        void                    FillAccessibleStateSet( sal_Int64& rStateSet );
 
         // OCommonAccessibleComponent
         virtual css::awt::Rectangle implGetBounds(  ) override;
@@ -97,7 +93,7 @@ namespace accessibility
         virtual OUString SAL_CALL getAccessibleDescription(  ) override;
         virtual OUString SAL_CALL getAccessibleName(  ) override;
         virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleStateSet(  ) override;
         virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
         // XAccessibleComponent
diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx b/accessibility/inc/extended/accessibletabbarpagelist.hxx
index 89a8c6310f95..18d964b11005 100644
--- a/accessibility/inc/extended/accessibletabbarpagelist.hxx
+++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx
@@ -27,10 +27,6 @@
 
 #include <vector>
 
-namespace utl {
-class AccessibleStateSetHelper;
-}
-
 
 namespace accessibility
 {
@@ -61,7 +57,7 @@ namespace accessibility
         void                    MoveChild( sal_Int32 i, sal_Int32 j );
 
         virtual void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
-        void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+        void            FillAccessibleStateSet( sal_Int64& rStateSet );
 
         // OCommonAccessibleComponent
         virtual css::awt::Rectangle implGetBounds(  ) override;
@@ -95,7 +91,7 @@ namespace accessibility
         virtual OUString SAL_CALL getAccessibleDescription(  ) override;
         virtual OUString SAL_CALL getAccessibleName(  ) override;
         virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleStateSet(  ) override;
         virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
         // XAccessibleComponent
diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx
index f5696d8bfb61..2c8336b8181a 100644
--- a/accessibility/inc/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/extended/textwindowaccessibility.hxx
@@ -180,9 +180,7 @@ private:
     css::uno::Reference< css::accessibility::XAccessibleRelationSet >
     SAL_CALL getAccessibleRelationSet() override;
 
-    virtual
-    css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
-    getAccessibleStateSet() override;
+    virtual sal_Int64 SAL_CALL getAccessibleStateSet() override;
 
     virtual css::lang::Locale SAL_CALL getLocale() override;
 
@@ -479,7 +477,7 @@ private:
     virtual css::uno::Reference< css::accessibility::XAccessible >
     SAL_CALL getAccessibleAtPoint(css::awt::Point const & rPoint) override;
 
-    virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+    virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override;
     virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override;
 
     // ??? Will be called with both the external (Solar) and internal mutex
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx
index 80dd38d70c30..33dcf9125def 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -193,7 +193,6 @@
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
 #include <com/sun/star/accessibility/XAccessibleTable.hpp>
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
@@ -345,7 +344,6 @@
 #include <uno/data.h>
 #include <uno/sequence2.h>
 #include <unotools/accessiblerelationsethelper.hxx>
-#include <unotools/accessiblestatesethelper.hxx>
 #include <unotools/fontdefs.hxx>
 #include <unotools/unotoolsdllapi.h>
 #endif // PCH_LEVEL >= 3
diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
index d6f4713cc284..2d0f838a52d6 100644
--- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
@@ -33,11 +33,6 @@ class Menu;
 class VclSimpleEvent;
 class VclMenuEvent;
 
-namespace utl {
-class AccessibleStateSetHelper;
-}
-
-
 
 typedef ::cppu::ImplHelper2<
     css::accessibility::XAccessible,
@@ -106,7 +101,7 @@ protected:
 
     void                    ProcessMenuEvent( const VclMenuEvent& rVclMenuEvent );
 
-    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) = 0;
+    virtual void            FillAccessibleStateSet( sal_Int64& rStateSet ) = 0;
 
     // XComponent
     virtual void SAL_CALL   disposing() override;
@@ -130,7 +125,7 @@ public:
     virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleContext
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleStateSet(  ) override;
 };
 
 
diff --git a/accessibility/inc/standard/accessiblemenucomponent.hxx b/accessibility/inc/standard/accessiblemenucomponent.hxx
index f1559a46f062..b82a7c0ab57f 100644
--- a/accessibility/inc/standard/accessiblemenucomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenucomponent.hxx
@@ -35,7 +35,7 @@ protected:
     virtual bool            IsEnabled() override;
     virtual bool            IsVisible() override;
 
-    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+    virtual void            FillAccessibleStateSet( sal_Int64& rStateSet ) override;
 
     // OCommonAccessibleComponent
     virtual css::awt::Rectangle implGetBounds(  ) override;
diff --git a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
index cad61500d117..55550d53a36e 100644
--- a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
@@ -48,7 +48,7 @@ protected:
 
     virtual bool            IsMenuHideDisabledEntries() override;
 
-    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+    virtual void            FillAccessibleStateSet( sal_Int64& rStateSet ) override;
 
     // OCommonAccessibleComponent
     virtual css::awt::Rectangle implGetBounds(  ) override;
diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx
index e92ab2bb2c24..dd3f6914c26c 100644
--- a/accessibility/inc/standard/vclxaccessiblebox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblebox.hxx
@@ -150,7 +150,7 @@ protected:
     virtual void ProcessWindowChildEvent (const VclWindowEvent& rVclWindowEvent) override;
     virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) override;
 
-    virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+    virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override;
 
     sal_Int32 implGetAccessibleChildCount();
 };
diff --git a/accessibility/inc/standard/vclxaccessiblebutton.hxx b/accessibility/inc/standard/vclxaccessiblebutton.hxx
index a786f8e0a778..282e7ed7e817 100644
--- a/accessibility/inc/standard/vclxaccessiblebutton.hxx
+++ b/accessibility/inc/standard/vclxaccessiblebutton.hxx
@@ -39,7 +39,7 @@ class VCLXAccessibleButton final : public VCLXAccessibleTextComponent,
     virtual ~VCLXAccessibleButton() override = default;
 
     virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
-    virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+    virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override;
 
 public:
     using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent;
diff --git a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
index f64f5ab980ea..81e36cd42403 100644
--- a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
@@ -51,7 +51,7 @@ private:
     void    SetIndeterminate( bool bIndeterminate );
 
     virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
-    virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+    virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override;
 
 public:
     VCLXAccessibleCheckBox( VCLXWindow* pVCLXindow );
diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx
index 2f2ee88cc29b..81659d2c9ea3 100644
--- a/accessibility/inc/standard/vclxaccessibleedit.hxx
+++ b/accessibility/inc/standard/vclxaccessibleedit.hxx
@@ -45,7 +45,7 @@ protected:
     virtual ~VCLXAccessibleEdit() override = default;
 
     virtual void                ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
-    virtual void                FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+    virtual void                FillAccessibleStateSet( sal_Int64& rStateSet ) override;
     sal_Int16                   implGetAccessibleRole();
 
     // OCommonAccessibleText
diff --git a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx
index 0a79530f2f2b..bce6ef6ec163 100644
--- a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx
+++ b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx
@@ -25,7 +25,7 @@ class VCLXAccessibleFixedText final : public VCLXAccessibleTextComponent
 {
     virtual ~VCLXAccessibleFixedText() override = default;
 
-    virtual void FillAccessibleStateSet(utl::AccessibleStateSetHelper& rStateSet) override;
+    virtual void FillAccessibleStateSet(sal_Int64& rStateSet) override;
 
 public:
     using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent;
diff --git a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
index c7a460770b98..88bbc68e943b 100644
--- a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
+++ b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
@@ -29,10 +29,6 @@ class HeaderBar;
 class VclSimpleEvent;
 class VclWindowEvent;
 
-namespace utl {
-class AccessibleStateSetHelper;
-}
-
 
 //    ----------------------------------------------------
 //    class VCLXAccessibleHeaderBarItem
@@ -49,7 +45,7 @@ private:
     VclPtr<HeaderBar>        m_pHeadBar;
     sal_Int32                m_nIndexInParent;
 
-    void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    void            FillAccessibleStateSet( sal_Int64& rStateSet );
 
     // OCommonAccessibleComponent
     virtual css::awt::Rectangle implGetBounds(  ) override;
@@ -81,7 +77,7 @@ public:
     virtual OUString SAL_CALL getAccessibleDescription(  ) override;
     virtual OUString SAL_CALL getAccessibleName(  ) override;
     virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleStateSet(  ) override;
     virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx
index 619fe23aada8..f1d5520a52da 100644
--- a/accessibility/inc/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelist.hxx
@@ -151,7 +151,7 @@ private:
         AccessibleStateType::MULTI_SELECTABLE to the state set
         of the base classes.
     */
-    virtual void FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) override;
+    virtual void FillAccessibleStateSet (sal_Int64& rStateSet) override;
 
     /** Create the specified child and insert it into the list of children.
         Sets the child's states.
diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
index 6542d7b43425..6952bd5eea1e 100644
--- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -113,7 +112,7 @@ public:
     virtual OUString SAL_CALL getAccessibleDescription(  ) override;
     virtual OUString SAL_CALL getAccessibleName(  ) override;
     virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleStateSet(  ) override;
     virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
diff --git a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
index 646f87aa02c9..e67be7f09e53 100644
--- a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
@@ -47,7 +47,7 @@ protected:
 
     virtual bool            IsHighlighted() override;
 
-    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+    virtual void            FillAccessibleStateSet( sal_Int64& rStateSet ) override;
 
     // OCommonAccessibleText
     virtual OUString                     implGetText() final override;
diff --git a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx
index a9b93b7ac67f..4bffbf267c62 100644
--- a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx
+++ b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx
@@ -40,7 +40,7 @@ class VCLXAccessibleRadioButton final : public VCLXAccessibleTextComponent,
 
     virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
     virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override;
-    virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+    virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override;
 
 public:
     using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent;
diff --git a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
index 0a9e0368ff8e..4476ed7c89a1 100644
--- a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
+++ b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
@@ -39,7 +39,7 @@ class VCLXAccessibleScrollBar final : public VCLXAccessibleComponent,
     virtual ~VCLXAccessibleScrollBar() override = default;
 
     virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
-    virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+    virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override;
 
 public:
     using VCLXAccessibleComponent::VCLXAccessibleComponent;
diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
index 92c39dbd8501..5be9739722dc 100644
--- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
@@ -27,10 +27,6 @@
 #include <vcl/status.hxx>
 #include <vcl/vclptr.hxx>
 
-namespace utl {
-class AccessibleStateSetHelper;
-}
-
 
 
 
@@ -60,7 +56,7 @@ private:
     OUString                GetItemText();
     sal_uInt16              GetItemId() const { return m_nItemId; }
 
-    void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    void            FillAccessibleStateSet( sal_Int64& rStateSet );
 
     // OCommonAccessibleComponent
     virtual css::awt::Rectangle implGetBounds(  ) override;
@@ -99,7 +95,7 @@ public:
     virtual OUString SAL_CALL getAccessibleDescription(  ) override;
     virtual OUString SAL_CALL getAccessibleName(  ) override;
     virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleStateSet(  ) override;
     virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
index 7511e03ebe2a..ab6cdb620eb9 100644
--- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
@@ -55,7 +55,7 @@ private:
 
     virtual void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
     virtual void            ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent ) override;
-    virtual void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+    virtual void            FillAccessibleStateSet( sal_Int64& rStateSet ) override;
 
     // XComponent
     virtual void SAL_CALL   disposing() override;
diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx b/accessibility/inc/standard/vclxaccessibletabpage.hxx
index 8e3c3c8f6c81..2d78f889264f 100644
--- a/accessibility/inc/standard/vclxaccessibletabpage.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx
@@ -29,11 +29,6 @@
 
 class TabControl;
 
-namespace utl {
-class AccessibleStateSetHelper;
-}
-
-
 
 
 typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE;
@@ -68,7 +63,7 @@ private:
 
     sal_uInt16              GetPageId() const { return m_nPageId; }
 
-    void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    void            FillAccessibleStateSet( sal_Int64& rStateSet );
 
     // OCommonAccessibleComponent
     virtual css::awt::Rectangle implGetBounds(  ) override;
@@ -108,7 +103,7 @@ public:
     virtual OUString SAL_CALL getAccessibleDescription(  ) override;
     virtual OUString SAL_CALL getAccessibleName(  ) override;
     virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleStateSet(  ) override;
     virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
diff --git a/accessibility/inc/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/standard/vclxaccessibletoolbox.hxx
index 89bf0a99a011..7518f3f7a154 100644
--- a/accessibility/inc/standard/vclxaccessibletoolbox.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolbox.hxx
@@ -55,7 +55,7 @@ private:
 
     virtual ~VCLXAccessibleToolBox() override;
 
-    virtual void    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+    virtual void    FillAccessibleStateSet( sal_Int64& rStateSet ) override;
     virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
     virtual void    ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent ) override;
 
diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
index 6c60bf4a87c6..9f93f9658791 100644
--- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase4.hxx>
@@ -107,7 +106,7 @@ public:
     virtual OUString SAL_CALL getAccessibleDescription(  ) override;
     virtual OUString SAL_CALL getAccessibleName(  ) override;
     virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleStateSet(  ) override;
 
     // XAccessibleText
     virtual OUString SAL_CALL getText() override;