convert AccessibleBrowseBoxObjType to scoped enum

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

18 files changed, 52 insertions, 52 deletions

diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx
index c854ffef52f0..f6109299e333 100644
--- a/accessibility/inc/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx
@@ -120,7 +120,7 @@ public:
     */
     css::uno::Reference<
         css::accessibility::XAccessible >
-        getHeaderBar( ::vcl::AccessibleBrowseBoxObjType _eObjType )
+        getHeaderBar( AccessibleBrowseBoxObjType _eObjType )
         {
             return implGetHeaderBar(_eObjType);
         }
@@ -157,7 +157,7 @@ protected:
         @return  The XAccessible interface of the header bar. */
     css::uno::Reference<
         css::accessibility::XAccessible >
-        implGetHeaderBar( ::vcl::AccessibleBrowseBoxObjType eObjType );
+        implGetHeaderBar( AccessibleBrowseBoxObjType eObjType );
 
     /** This method returns one of the children that are always present:
         Data table, row and column header bar or corner control.
@@ -231,7 +231,7 @@ private:
         return m_xContext.is() && m_xContext->isAlive();
     }
     virtual css::uno::Reference< css::accessibility::XAccessible >
-        getHeaderBar( ::vcl::AccessibleBrowseBoxObjType _eObjType ) override
+        getHeaderBar( AccessibleBrowseBoxObjType _eObjType ) override
     {
         css::uno::Reference< css::accessibility::XAccessible > xAccessible;
         AccessibleBrowseBox* pContext( getContext() );
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index 7f7788fe3d35..71cde0280ad2 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -83,7 +83,7 @@ public:
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
         ::vcl::IAccessibleTableProvider& rBrowseBox,
         const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
-        ::vcl::AccessibleBrowseBoxObjType eObjType );
+        AccessibleBrowseBoxObjType eObjType );
 
     /** Constructor sets specified name and description.
         @param rxParent         XAccessible interface of the parent object.
@@ -96,7 +96,7 @@ public:
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
         ::vcl::IAccessibleTableProvider& rBrowseBox,
         const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
-        ::vcl::AccessibleBrowseBoxObjType eObjType,
+        AccessibleBrowseBoxObjType eObjType,
         const OUString& rName,
         const OUString& rDescription );
 
@@ -214,7 +214,7 @@ public:
     // helper methods
 
     /** @return  The BrowseBox object type. */
-    inline ::vcl::AccessibleBrowseBoxObjType getType() const;
+    inline AccessibleBrowseBoxObjType getType() const;
 
     /** Changes the name of the object and notifies listeners. */
     void setAccessibleName( const OUString& rName );
@@ -305,7 +305,7 @@ private:
     OUString maDescription;
 
     /** The type of this object (for names, descriptions, state sets, ...). */
-    ::vcl::AccessibleBrowseBoxObjType meObjType;
+    AccessibleBrowseBoxObjType meObjType;
 
     ::comphelper::AccessibleEventNotifier::TClientId    m_aClientId;
 };
@@ -337,7 +337,7 @@ protected:
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
         ::vcl::IAccessibleTableProvider& rBrowseBox,
         const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
-        ::vcl::AccessibleBrowseBoxObjType eObjType );
+        AccessibleBrowseBoxObjType eObjType );
 
     /** Constructor sets specified name and description.
 
@@ -352,7 +352,7 @@ protected:
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
         ::vcl::IAccessibleTableProvider& rBrowseBox,
         const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
-        ::vcl::AccessibleBrowseBoxObjType eObjType,
+        AccessibleBrowseBoxObjType eObjType,
         const OUString& rName,
         const OUString& rDescription );
 
@@ -390,7 +390,7 @@ public:
 
 // inlines
 
-inline ::vcl::AccessibleBrowseBoxObjType AccessibleBrowseBoxBase::getType() const
+inline AccessibleBrowseBoxObjType AccessibleBrowseBoxBase::getType() const
 {
     return meObjType;
 }
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
index 5c76747f6cd9..64d41cb6d2d9 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
@@ -42,12 +42,12 @@ class AccessibleBrowseBoxHeaderBar final :
 public:
     /** @param rxParent         Parent that holds the browsebox headerbar control
         @param rBrowseBox       The BrowseBox control.
-        @param eObjType  One of the two allowed types BBTYPE_ROWHEADERBAR or
-                         BBTYPE_COLUMNHEADERBAR. */
+        @param eObjType  One of the two allowed types AccessibleBrowseBoxObjType::RowHeaderBar or
+                         AccessibleBrowseBoxObjType::ColumnHeaderBar. */
     AccessibleBrowseBoxHeaderBar(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
         ::vcl::IAccessibleTableProvider& rBrowseBox,
-        ::vcl::AccessibleBrowseBoxObjType eObjType );
+        AccessibleBrowseBoxObjType eObjType );
 
 private:
     virtual ~AccessibleBrowseBoxHeaderBar() override;
@@ -203,12 +203,12 @@ private:
 
 inline bool AccessibleBrowseBoxHeaderBar::isRowBar() const
 {
-    return getType() == ::vcl::BBTYPE_ROWHEADERBAR;
+    return getType() == AccessibleBrowseBoxObjType::RowHeaderBar;
 }
 
 inline bool AccessibleBrowseBoxHeaderBar::isColumnBar() const
 {
-    return getType() == ::vcl::BBTYPE_COLUMNHEADERBAR;
+    return getType() == AccessibleBrowseBoxObjType::ColumnHeaderBar;
 }
 
 
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
index 366a7c12997b..1a895a045832 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
@@ -30,7 +30,7 @@ namespace accessibility
                                           const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
                                           ::vcl::IAccessibleTableProvider&                  _rBrowseBox,
                                           const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
-                                          ::vcl::AccessibleBrowseBoxObjType  _eObjType);
+                                          AccessibleBrowseBoxObjType  _eObjType);
         /** @return  The count of visible children. */
         virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
 
@@ -46,7 +46,7 @@ namespace accessibility
 
         bool isRowBarCell() const
         {
-            return getType() == ::vcl::BBTYPE_ROWHEADERCELL;
+            return getType() == AccessibleBrowseBoxObjType::RowHeaderCell;
         }
 
         /** @return
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
index ff56b92c9f48..b482ab0d8b4f 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
@@ -50,7 +50,7 @@ public:
     AccessibleBrowseBoxTableBase(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
         ::vcl::IAccessibleTableProvider& rBrowseBox,
-        ::vcl::AccessibleBrowseBoxObjType eObjType );
+        AccessibleBrowseBoxObjType eObjType );
 
 protected:
     virtual ~AccessibleBrowseBoxTableBase() override = default;
diff --git a/accessibility/inc/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
index 00a6d45220da..ba4654654a1f 100644
--- a/accessibility/inc/extended/accessiblebrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
@@ -56,7 +56,7 @@ namespace accessibility
             const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
             sal_Int32 _nRowPos,
             sal_uInt16 _nColPos,
-            ::vcl::AccessibleBrowseBoxObjType _eType = ::vcl::BBTYPE_TABLECELL
+            AccessibleBrowseBoxObjType _eType = AccessibleBrowseBoxObjType::TableCell
         );
 
         virtual ~AccessibleBrowseBoxCell() override;
diff --git a/accessibility/inc/extended/accessibletablistbox.hxx b/accessibility/inc/extended/accessibletablistbox.hxx
index 02704ea872c2..17f30ce60fbe 100644
--- a/accessibility/inc/extended/accessibletablistbox.hxx
+++ b/accessibility/inc/extended/accessibletablistbox.hxx
@@ -77,7 +77,7 @@ public:
     css::uno::Reference< css::accessibility::XAccessible >
         getHeaderBar() override
     {
-        return AccessibleBrowseBox::getHeaderBar( vcl::BBTYPE_COLUMNHEADERBAR );
+        return AccessibleBrowseBox::getHeaderBar( AccessibleBrowseBoxObjType::ColumnHeaderBar );
     }
 
 private:
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index 5500397b70c6..4a5b27f5249f 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::accessibility;
 AccessibleBrowseBox::AccessibleBrowseBox(
             const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator,
             ::vcl::IAccessibleTableProvider& _rBrowseBox )
-    : AccessibleBrowseBoxBase( _rxParent, _rBrowseBox,nullptr, vcl::BBTYPE_BROWSEBOX ),
+    : AccessibleBrowseBoxBase( _rxParent, _rBrowseBox,nullptr, AccessibleBrowseBoxObjType::BrowseBox ),
       m_aCreator(_rxCreator)
 {
     m_xFocusWindow = VCLUnoHelper::GetInterface(mpBrowseBox->GetWindowInstance());
@@ -198,14 +198,14 @@ css::uno::Reference< css::accessibility::XAccessible > AccessibleBrowseBox::impl
 }
 
 css::uno::Reference< css::accessibility::XAccessible >
-AccessibleBrowseBox::implGetHeaderBar(vcl::AccessibleBrowseBoxObjType eObjType)
+AccessibleBrowseBox::implGetHeaderBar(AccessibleBrowseBoxObjType eObjType)
 {
     css::uno::Reference< css::accessibility::XAccessible > xRet;
     rtl::Reference< AccessibleBrowseBoxHeaderBar >* pxMember = nullptr;
 
-    if( eObjType == vcl::BBTYPE_ROWHEADERBAR )
+    if( eObjType == AccessibleBrowseBoxObjType::RowHeaderBar )
         pxMember = &mxRowHeaderBar;
-    else if( eObjType == vcl::BBTYPE_COLUMNHEADERBAR )
+    else if( eObjType == AccessibleBrowseBoxObjType::ColumnHeaderBar )
         pxMember = &mxColumnHeaderBar;
 
     if( pxMember )
@@ -228,10 +228,10 @@ AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex )
     switch( nChildIndex )
     {
         case vcl::BBINDEX_COLUMNHEADERBAR:
-            xRet = implGetHeaderBar( vcl::BBTYPE_COLUMNHEADERBAR );
+            xRet = implGetHeaderBar( AccessibleBrowseBoxObjType::ColumnHeaderBar );
         break;
         case vcl::BBINDEX_ROWHEADERBAR:
-            xRet = implGetHeaderBar( vcl::BBTYPE_ROWHEADERBAR );
+            xRet = implGetHeaderBar( AccessibleBrowseBoxObjType::RowHeaderBar );
         break;
         case vcl::BBINDEX_TABLE:
             xRet = implGetTable();
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 01b94d335857..40ffe655ba76 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -52,7 +52,7 @@ AccessibleBrowseBoxBase::AccessibleBrowseBoxBase(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
         ::vcl::IAccessibleTableProvider&                      rBrowseBox,
         const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
-        ::vcl::AccessibleBrowseBoxObjType      eObjType ) :
+        AccessibleBrowseBoxObjType      eObjType ) :
     AccessibleBrowseBoxImplHelper( m_aMutex ),
     mxParent( rxParent ),
     mpBrowseBox( &rBrowseBox ),
@@ -70,7 +70,7 @@ AccessibleBrowseBoxBase::AccessibleBrowseBoxBase(
         const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
         ::vcl::IAccessibleTableProvider&                      rBrowseBox,
         const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
-        ::vcl::AccessibleBrowseBoxObjType      eObjType,
+        AccessibleBrowseBoxObjType      eObjType,
         const OUString&          rName,
         const OUString&          rDescription ) :
     AccessibleBrowseBoxImplHelper( m_aMutex ),
@@ -440,24 +440,24 @@ sal_Int16 SAL_CALL AccessibleBrowseBoxBase::getAccessibleRole()
     sal_Int16 nRole = AccessibleRole::UNKNOWN;
     switch ( meObjType )
     {
-        case vcl::BBTYPE_ROWHEADERCELL:
+        case AccessibleBrowseBoxObjType::RowHeaderCell:
             nRole = AccessibleRole::ROW_HEADER;
             break;
-        case vcl::BBTYPE_COLUMNHEADERCELL:
+        case AccessibleBrowseBoxObjType::ColumnHeaderCell:
             nRole = AccessibleRole::COLUMN_HEADER;
             break;
-        case vcl::BBTYPE_COLUMNHEADERBAR:
-        case vcl::BBTYPE_ROWHEADERBAR:
-        case vcl::BBTYPE_TABLE:
+        case AccessibleBrowseBoxObjType::ColumnHeaderBar:
+        case AccessibleBrowseBoxObjType::RowHeaderBar:
+        case AccessibleBrowseBoxObjType::Table:
             nRole = AccessibleRole::TABLE;
             break;
-        case vcl::BBTYPE_TABLECELL:
+        case AccessibleBrowseBoxObjType::TableCell:
             nRole = AccessibleRole::TABLE_CELL;
             break;
-        case vcl::BBTYPE_BROWSEBOX:
+        case AccessibleBrowseBoxObjType::BrowseBox:
             nRole = AccessibleRole::PANEL;
             break;
-        case vcl::BBTYPE_CHECKBOXCELL:
+        case AccessibleBrowseBoxObjType::CheckBoxCell:
             nRole = AccessibleRole::CHECK_BOX;
             break;
     }
@@ -535,14 +535,14 @@ Reference< css::accessibility::XAccessibleContext > SAL_CALL BrowseBoxAccessible
 
 
 BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::IAccessibleTableProvider& rBrowseBox,
-        const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::vcl::AccessibleBrowseBoxObjType  eObjType )
+        const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType  eObjType )
     :AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType )
 {
 }
 
 
 BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::IAccessibleTableProvider& rBrowseBox,
-        const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::vcl::AccessibleBrowseBoxObjType  eObjType,
+        const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType  eObjType,
         const OUString& rName, const OUString& rDescription )
     :AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType, rName, rDescription )
 {
diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
index 2972b6e0002b..e798cb954ec0 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
@@ -36,7 +36,7 @@ namespace accessibility
                                 sal_uInt16 _nColPos
                                 ,const TriState& _eState,
                                 bool _bIsTriState)
-        :AccessibleBrowseBoxCell(_rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos, vcl::BBTYPE_CHECKBOXCELL)
+        :AccessibleBrowseBoxCell(_rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos, AccessibleBrowseBoxObjType::CheckBoxCell)
         ,m_eState(_eState)
         ,m_bIsTriState(_bIsTriState)
     {
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index 7513b542f9c4..3d3541e4a19b 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -38,7 +38,7 @@ namespace accessibility {
 AccessibleBrowseBoxHeaderBar::AccessibleBrowseBoxHeaderBar(
         const Reference< XAccessible >& rxParent,
         vcl::IAccessibleTableProvider& rBrowseBox,
-        vcl::AccessibleBrowseBoxObjType eObjType ) :
+        AccessibleBrowseBoxObjType eObjType ) :
     AccessibleBrowseBoxTableBase( rxParent, rBrowseBox,eObjType )
 {
     OSL_ENSURE( isRowBar() || isColumnBar(),
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
index a88198d49f7f..81b3bfa4e7e4 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -33,7 +33,7 @@ AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnR
                                   const Reference< XAccessible >& rxParent,
                                   vcl::IAccessibleTableProvider& rBrowseBox,
                                   const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
-                                  vcl::AccessibleBrowseBoxObjType eObjType)
+                                  AccessibleBrowseBoxObjType eObjType)
 : BrowseBoxAccessibleElement(rxParent,
                           rBrowseBox,
                           _xFocusWindow,
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index 150e87fbe62f..d245c5155ba8 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -38,7 +38,7 @@ namespace accessibility {
 AccessibleBrowseBoxTable::AccessibleBrowseBoxTable(
         const Reference< XAccessible >& rxParent,
         vcl::IAccessibleTableProvider& rBrowseBox ) :
-    AccessibleBrowseBoxTableBase( rxParent, rBrowseBox, vcl::BBTYPE_TABLE )
+    AccessibleBrowseBoxTableBase( rxParent, rBrowseBox, AccessibleBrowseBoxObjType::Table )
 {
 }
 
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
index 1b80edcdd3d7..ebb6e06e099d 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
@@ -40,7 +40,7 @@ namespace accessibility {
 AccessibleBrowseBoxTableBase::AccessibleBrowseBoxTableBase(
         const Reference< XAccessible >& rxParent,
         vcl::IAccessibleTableProvider& rBrowseBox,
-        vcl::AccessibleBrowseBoxObjType eObjType ) :
+        AccessibleBrowseBoxObjType eObjType ) :
     BrowseBoxAccessibleElement( rxParent, rBrowseBox,nullptr, eObjType )
 {
 }
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index 0b7706099bbb..13cdb63e24dd 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -75,8 +75,8 @@ namespace accessibility
     {
         m_nOffset = ( _nOffset == OFFSET_DEFAULT ) ? sal_Int32(vcl::BBINDEX_FIRSTCONTROL) : _nOffset;
         sal_Int32 nIndex = getIndex_Impl( _nRowPos, _nColPos, _rBrowseBox.GetColumnCount() );
-        setAccessibleName( _rBrowseBox.GetAccessibleObjectName( vcl::BBTYPE_TABLECELL, nIndex ) );
-        setAccessibleDescription( _rBrowseBox.GetAccessibleObjectDescription( vcl::BBTYPE_TABLECELL, nIndex ) );
+        setAccessibleName( _rBrowseBox.GetAccessibleObjectName( AccessibleBrowseBoxObjType::TableCell, nIndex ) );
+        setAccessibleDescription( _rBrowseBox.GetAccessibleObjectDescription( AccessibleBrowseBoxObjType::TableCell, nIndex ) );
         // Need to register as event listener
         Reference< XComponent > xComponent(_rxParent, UNO_QUERY);
         if( xComponent.is() )
diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx
index 5b22181bd6f3..4996b7eedcd2 100644
--- a/accessibility/source/extended/accessiblebrowseboxcell.cxx
+++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx
@@ -31,7 +31,7 @@ namespace accessibility
     AccessibleBrowseBoxCell::AccessibleBrowseBoxCell(
             const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::vcl::IAccessibleTableProvider& _rBrowseBox,
             const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
-            sal_Int32 _nRowPos, sal_uInt16 _nColPos, ::vcl::AccessibleBrowseBoxObjType _eType )
+            sal_Int32 _nRowPos, sal_uInt16 _nColPos, AccessibleBrowseBoxObjType _eType )
         :AccessibleBrowseBoxBase( _rxParent, _rBrowseBox, _xFocusWindow, _eType )
         ,m_nRowPos( _nRowPos )
         ,m_nColPos( _nColPos )
@@ -39,7 +39,7 @@ namespace accessibility
         // set accessible name here, because for that we need the position of the cell
         // and so the base class isn't capable of doing this
         sal_Int32 nPos = _nRowPos * _rBrowseBox.GetColumnCount() + _nColPos;
-        OUString aAccName = _rBrowseBox.GetAccessibleObjectName( vcl::BBTYPE_TABLECELL, nPos );
+        OUString aAccName = _rBrowseBox.GetAccessibleObjectName( AccessibleBrowseBoxObjType::TableCell, nPos );
         implSetName( aAccName );
     }
 
diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx
index f5cdfc75837b..e34f1896f307 100644
--- a/accessibility/source/extended/accessibletablistbox.cxx
+++ b/accessibility/source/extended/accessibletablistbox.cxx
@@ -94,7 +94,7 @@ namespace accessibility
         if (nChildIndex == 0)
         {
             //! so far the actual implementation object only supports column headers
-            xRet = implGetHeaderBar( ::vcl::BBTYPE_COLUMNHEADERBAR );
+            xRet = implGetHeaderBar( AccessibleBrowseBoxObjType::ColumnHeaderBar );
         }
         else if (nChildIndex == 1)
             xRet = implGetTable();
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index fef3214b321f..720ecda1808b 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -155,7 +155,7 @@ public:
         createAccessibleBrowseBoxHeaderBar(
             const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
             vcl::IAccessibleTableProvider& _rOwningTable,
-            vcl::AccessibleBrowseBoxObjType _eObjType
+            AccessibleBrowseBoxObjType _eObjType
         ) const override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible >
@@ -174,7 +174,7 @@ public:
             const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
             vcl::IAccessibleTableProvider& _rBrowseBox,
             const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
-            vcl::AccessibleBrowseBoxObjType  _eObjType
+            AccessibleBrowseBoxObjType  _eObjType
         ) const override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible >
@@ -395,7 +395,7 @@ Reference< XAccessible > AccessibleFactory::createAccessibleTreeListBox(
 
 Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderBar(
     const Reference< XAccessible >& rxParent, vcl::IAccessibleTableProvider& _rOwningTable,
-    vcl::AccessibleBrowseBoxObjType _eObjType ) const
+    AccessibleBrowseBoxObjType _eObjType ) const
 {
     return new AccessibleBrowseBoxHeaderBar( rxParent, _rOwningTable, _eObjType );
 }
@@ -410,7 +410,7 @@ Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxTableCell(
 
 Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderCell(
     sal_Int32 _nColumnRowId, const Reference< XAccessible >& rxParent, vcl::IAccessibleTableProvider& _rBrowseBox,
-    const Reference< XWindow >& _xFocusWindow, vcl::AccessibleBrowseBoxObjType  _eObjType ) const
+    const Reference< XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType  _eObjType ) const
 {
     return new AccessibleBrowseBoxHeaderCell( _nColumnRowId, rxParent, _rBrowseBox,
         _xFocusWindow, _eObjType );