1 files changed, 16 insertions, 18 deletions
diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
index 544be177044b..6fbfc1e55138 100644
--- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
@@ -22,42 +22,40 @@
 #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>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/accessibletexthelper.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/vclptr.hxx>
 
 
-typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE;
-typedef ::cppu::ImplHelper4 < css::accessibility::XAccessible,
-                              css::accessibility::XAccessibleAction,
-                              css::accessibility::XAccessibleValue,
-                              css::lang::XServiceInfo > VCLXAccessibleToolBoxItem_BASE;
-
-class VCLXAccessibleToolBoxItem final : public AccessibleTextHelper_BASE,
-                                        public VCLXAccessibleToolBoxItem_BASE
+class VCLXAccessibleToolBoxItem final : public cppu::ImplInheritanceHelper<
+                                            comphelper::OAccessibleTextHelper,
+                                            css::accessibility::XAccessible,
+                                            css::accessibility::XAccessibleAction,
+                                            css::accessibility::XAccessibleValue,
+                                            css::lang::XServiceInfo>
 {
 private:
     OUString                m_sOldName;
     VclPtr<ToolBox>         m_pToolBox;
     sal_Int32               m_nIndexInParent;
     sal_Int16               m_nRole;
-    sal_uInt16              m_nItemId;
+    ToolBoxItemId           m_nItemId;
     bool                    m_bHasFocus;
     bool                    m_bIsChecked;
     bool                    m_bIndeterminate;
 
     css::uno::Reference< css::accessibility::XAccessible >    m_xChild;
-    OUString GetText();
 
 public:
     sal_Int32    getIndexInParent() const                    { return m_nIndexInParent; }
     void         setIndexInParent( sal_Int32 _nNewIndex )    { m_nIndexInParent = _nNewIndex; }
 
 private:
+    OUString implGetAccessibleName();
+
     virtual ~VCLXAccessibleToolBoxItem() override;
 
     virtual void SAL_CALL                   disposing() override;
@@ -87,8 +85,7 @@ public:
     void                ToggleEnableState();
 
     // XInterface
-    DECLARE_XINTERFACE( )
-    DECLARE_XTYPEPROVIDER( )
+    css::uno::Any SAL_CALL queryInterface(css::uno::Type const & aType) override;
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
@@ -99,15 +96,15 @@ public:
     virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
     virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
     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;
@@ -145,6 +142,7 @@ public:
     virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override;
     virtual css::uno::Any SAL_CALL getMaximumValue(  ) override;
     virtual css::uno::Any SAL_CALL getMinimumValue(  ) override;
+    virtual css::uno::Any SAL_CALL getMinimumIncrement(  ) override;
 };