accessibility/inc/extended/AccessibleGridControlHeader.hxx | 8 -
accessibility/source/extended/AccessibleGridControl.cxx | 16 ++-
accessibility/source/extended/AccessibleGridControlBase.cxx | 14 +--
accessibility/source/extended/AccessibleGridControlHeader.cxx | 22 ++---
accessibility/source/extended/AccessibleGridControlHeaderCell.cxx | 4
accessibility/source/extended/AccessibleGridControlTable.cxx | 2
accessibility/source/extended/AccessibleGridControlTableBase.cxx | 6 -
accessibility/source/extended/AccessibleGridControlTableCell.cxx | 17 ++-
include/vcl/accessibletable.hxx | 16 +--
toolkit/source/controls/table/tablecontrol.cxx | 44
+++++-----
10 files changed, 79 insertions(+), 70 deletions(-)
New commits:
commit e4ec702df16e04e66af42e2e35a607cb67d7d2c1
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Aug 1 21:11:57 2023 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Aug 2 05:09:54 2023 +0200
a11y: Convert AccessibleTableControlObjType to enum class
Change-Id: I227ca242ae8fa22940b1bf302541f8d9b7b40eb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155199
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/accessibility/inc/extended/AccessibleGridControlHeader.hxx
b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
index 680b1ceced6a..419ec28233cd 100644
--- a/accessibility/inc/extended/AccessibleGridControlHeader.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
@@ -33,8 +33,8 @@ class AccessibleGridControlHeader final : public
AccessibleGridControlTableBase
public:
/** @param rxParent accessible parent control
@param rTable accessible table
- @param eObjType One of the two allowed types TCTYPE_ROWHEADERBAR or
- TCTYPE_COLUMNHEADERBAR. */
+ @param eObjType One of the two allowed types
AccessibleTableControlObjType::ROWHEADERBAR or
+ AccessibleTableControlObjType::COLUMNHEADERBAR. */
AccessibleGridControlHeader(
const css::uno::Reference<
css::accessibility::XAccessible >& rxParent,
@@ -139,12 +139,12 @@ private:
inline bool AccessibleGridControlHeader::isRowBar() const
{
- return getType() == ::vcl::table::TCTYPE_ROWHEADERBAR;
+ return getType() ==
::vcl::table::AccessibleTableControlObjType::ROWHEADERBAR;
}
inline bool AccessibleGridControlHeader::isColumnBar() const
{
- return getType() == ::vcl::table::TCTYPE_COLUMNHEADERBAR;
+ return getType() ==
::vcl::table::AccessibleTableControlObjType::COLUMNHEADERBAR;
}
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx
b/accessibility/source/extended/AccessibleGridControl.cxx
index 37d5013c8fa6..a9d946c9eea7 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -41,7 +41,7 @@ using namespace ::vcl::table;
AccessibleGridControl::AccessibleGridControl(
const css::uno::Reference< css::accessibility::XAccessible >&
_rxParent, const css::uno::Reference< css::accessibility::XAccessible >&
_rxCreator,
::vcl::table::IAccessibleTable& _rTable )
- : AccessibleGridControlBase( _rxParent, _rTable, TCTYPE_GRIDCONTROL ),
+ : AccessibleGridControlBase(_rxParent, _rTable,
AccessibleTableControlObjType::GRIDCONTROL),
m_aCreator(_rxCreator)
{
}
@@ -102,7 +102,8 @@ AccessibleGridControl::getAccessibleChild( sal_Int64
nChildIndex )
{
if(!m_xColumnHeaderBar.is())
{
- m_xColumnHeaderBar = new
AccessibleGridControlHeader(m_aCreator, m_aTable,
vcl::table::TCTYPE_COLUMNHEADERBAR);
+ m_xColumnHeaderBar = new
AccessibleGridControlHeader(m_aCreator, m_aTable,
+
vcl::table::AccessibleTableControlObjType::COLUMNHEADERBAR);
}
xChild = m_xColumnHeaderBar.get();
}
@@ -110,7 +111,8 @@ AccessibleGridControl::getAccessibleChild( sal_Int64
nChildIndex )
{
if(!m_xRowHeaderBar.is())
{
- m_xRowHeaderBar = new AccessibleGridControlHeader(m_aCreator,
m_aTable, vcl::table::TCTYPE_ROWHEADERBAR);
+ m_xRowHeaderBar = new AccessibleGridControlHeader(m_aCreator,
m_aTable,
+
vcl::table::AccessibleTableControlObjType::ROWHEADERBAR);
}
xChild = m_xRowHeaderBar.get();
}
@@ -215,9 +217,9 @@ AccessibleGridControl::implGetHeaderBar(
AccessibleTableControlObjType eObjType
css::uno::Reference< css::accessibility::XAccessible > xRet;
rtl::Reference< AccessibleGridControlHeader >* pxMember = nullptr;
- if( eObjType == TCTYPE_ROWHEADERBAR )
+ if (eObjType == AccessibleTableControlObjType::ROWHEADERBAR)
pxMember = &m_xRowHeaderBar;
- else if( eObjType == TCTYPE_COLUMNHEADERBAR )
+ else if (eObjType == AccessibleTableControlObjType::COLUMNHEADERBAR)
pxMember = &m_xColumnHeaderBar;
if( pxMember )
@@ -240,11 +242,11 @@ AccessibleGridControl::implGetFixedChild( sal_Int64
nChildIndex )
{
/** Child index of the column header bar (first row). */
case 0:
- xRet = implGetHeaderBar( TCTYPE_COLUMNHEADERBAR );
+ xRet =
implGetHeaderBar(AccessibleTableControlObjType::COLUMNHEADERBAR);
break;
/** Child index of the row header bar ("handle column"). */
case 1:
- xRet = implGetHeaderBar( TCTYPE_ROWHEADERBAR );
+ xRet =
implGetHeaderBar(AccessibleTableControlObjType::ROWHEADERBAR);
break;
/** Child index of the data table. */
case 2:
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx
b/accessibility/source/extended/AccessibleGridControlBase.cxx
index 4777b159f309..fe00a2aaf266 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -357,21 +357,21 @@ sal_Int16 SAL_CALL
AccessibleGridControlBase::getAccessibleRole()
sal_Int16 nRole = AccessibleRole::UNKNOWN;
switch ( m_eObjType )
{
- case TCTYPE_ROWHEADERCELL:
+ case AccessibleTableControlObjType::ROWHEADERCELL:
nRole = AccessibleRole::ROW_HEADER;
break;
- case TCTYPE_COLUMNHEADERCELL:
+ case AccessibleTableControlObjType::COLUMNHEADERCELL:
nRole = AccessibleRole::COLUMN_HEADER;
break;
- case TCTYPE_COLUMNHEADERBAR:
- case TCTYPE_ROWHEADERBAR:
- case TCTYPE_TABLE:
+ case AccessibleTableControlObjType::COLUMNHEADERBAR:
+ case AccessibleTableControlObjType::ROWHEADERBAR:
+ case AccessibleTableControlObjType::TABLE:
nRole = AccessibleRole::TABLE;
break;
- case TCTYPE_TABLECELL:
+ case AccessibleTableControlObjType::TABLECELL:
nRole = AccessibleRole::TABLE_CELL;
break;
- case TCTYPE_GRIDCONTROL:
+ case AccessibleTableControlObjType::GRIDCONTROL:
nRole = AccessibleRole::PANEL;
break;
}
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx
b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index b3651f792790..20a91ceb7b7b 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -59,14 +59,16 @@ AccessibleGridControlHeader::getAccessibleChild( sal_Int64
nChildIndex )
throw IndexOutOfBoundsException();
ensureIsAlive();
Reference< XAccessible > xChild;
- if(m_eObjType == vcl::table::TCTYPE_COLUMNHEADERBAR)
+ if (m_eObjType ==
vcl::table::AccessibleTableControlObjType::COLUMNHEADERBAR)
{
- rtl::Reference<AccessibleGridControlHeaderCell> pColHeaderCell = new
AccessibleGridControlHeaderCell(nChildIndex, this, m_aTable,
vcl::table::TCTYPE_COLUMNHEADERCELL);
+ rtl::Reference<AccessibleGridControlHeaderCell> pColHeaderCell = new
AccessibleGridControlHeaderCell(nChildIndex, this, m_aTable,
+
vcl::table::AccessibleTableControlObjType::COLUMNHEADERCELL);
xChild = pColHeaderCell;
}
- else if(m_eObjType == vcl::table::TCTYPE_ROWHEADERBAR)
+ else if (m_eObjType ==
vcl::table::AccessibleTableControlObjType::ROWHEADERBAR)
{
- rtl::Reference<AccessibleGridControlHeaderCell> pRowHeaderCell = new
AccessibleGridControlHeaderCell(nChildIndex, this, m_aTable,
vcl::table::TCTYPE_ROWHEADERCELL);
+ rtl::Reference<AccessibleGridControlHeaderCell> pRowHeaderCell = new
AccessibleGridControlHeaderCell(nChildIndex, this, m_aTable,
+
vcl::table::AccessibleTableControlObjType::ROWHEADERCELL);
xChild = pRowHeaderCell;
}
return xChild;
@@ -77,7 +79,7 @@ sal_Int64 SAL_CALL
AccessibleGridControlHeader::getAccessibleIndexInParent()
SolarMutexGuard aSolarGuard;
ensureIsAlive();
- if(m_eObjType == vcl::table::TCTYPE_ROWHEADERBAR &&
m_aTable.HasColHeader())
+ if (m_eObjType == vcl::table::AccessibleTableControlObjType::ROWHEADERBAR
&& m_aTable.HasColHeader())
return 1;
else
return 0;
@@ -213,14 +215,16 @@ Reference< XAccessible >
AccessibleGridControlHeader::implGetChild(
sal_Int32 nRow, sal_uInt32 nColumnPos )
{
Reference< XAccessible > xChild;
- if(m_eObjType == vcl::table::TCTYPE_COLUMNHEADERBAR)
+ if (m_eObjType ==
vcl::table::AccessibleTableControlObjType::COLUMNHEADERBAR)
{
- rtl::Reference<AccessibleGridControlHeaderCell> pColHeaderCell = new
AccessibleGridControlHeaderCell(nColumnPos, this, m_aTable,
vcl::table::TCTYPE_COLUMNHEADERCELL);
+ rtl::Reference<AccessibleGridControlHeaderCell> pColHeaderCell = new
AccessibleGridControlHeaderCell(nColumnPos, this, m_aTable,
+
vcl::table::AccessibleTableControlObjType::COLUMNHEADERCELL);
xChild = pColHeaderCell;
}
- else if(m_eObjType == vcl::table::TCTYPE_ROWHEADERBAR)
+ else if (m_eObjType ==
vcl::table::AccessibleTableControlObjType::ROWHEADERBAR)
{
- rtl::Reference<AccessibleGridControlHeaderCell> pRowHeaderCell = new
AccessibleGridControlHeaderCell(nRow, this, m_aTable,
vcl::table::TCTYPE_ROWHEADERCELL);
+ rtl::Reference<AccessibleGridControlHeaderCell> pRowHeaderCell = new
AccessibleGridControlHeaderCell(nRow, this, m_aTable,
+
vcl::table::AccessibleTableControlObjType::ROWHEADERCELL);
xChild = pRowHeaderCell;
}
return xChild;
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
index 6e9e6014ee8e..7275934b4c65 100644
--- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
@@ -128,7 +128,7 @@ tools::Rectangle
AccessibleGridControlHeaderCell::implGetBoundingBox()
tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( *pParent )
);
sal_Int32 nIndex = getAccessibleIndexInParent();
tools::Rectangle aCellRect;
- if(m_eObjType == TCTYPE_COLUMNHEADERCELL)
+ if (m_eObjType == AccessibleTableControlObjType::COLUMNHEADERCELL)
aCellRect = m_aTable.calcHeaderCellRect(true, nIndex);
else
aCellRect = m_aTable.calcHeaderCellRect(false, nIndex);
@@ -141,7 +141,7 @@ tools::Rectangle
AccessibleGridControlHeaderCell::implGetBoundingBoxOnScreen()
tools::Rectangle aGridRect( m_aTable.GetWindowExtentsAbsolute() );
sal_Int32 nIndex = getAccessibleIndexInParent();
tools::Rectangle aCellRect;
- if(m_eObjType == TCTYPE_COLUMNHEADERCELL)
+ if (m_eObjType == AccessibleTableControlObjType::COLUMNHEADERCELL)
aCellRect = m_aTable.calcHeaderCellRect(true, nIndex);
else
aCellRect = m_aTable.calcHeaderCellRect(false, nIndex);
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx
b/accessibility/source/extended/AccessibleGridControlTable.cxx
index e0c1a9a1d27f..f2dd9bbba8ec 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -44,7 +44,7 @@ namespace accessibility {
AccessibleGridControlTable::AccessibleGridControlTable(
const Reference< XAccessible >& rxParent,
IAccessibleTable& rTable) :
- AccessibleGridControlTableBase( rxParent, rTable, TCTYPE_TABLE )
+ AccessibleGridControlTableBase(rxParent, rTable,
AccessibleTableControlObjType::TABLE)
{
}
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index cc600760cfe9..691568a6341a 100644
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -53,11 +53,11 @@ sal_Int64 SAL_CALL
AccessibleGridControlTableBase::getAccessibleChildCount()
ensureIsAlive();
sal_Int64 nChildren = 0;
- if(m_eObjType == TCTYPE_ROWHEADERBAR)
+ if (m_eObjType == AccessibleTableControlObjType::ROWHEADERBAR)
nChildren = m_aTable.GetRowCount();
- else if(m_eObjType == TCTYPE_TABLE)
+ else if (m_eObjType == AccessibleTableControlObjType::TABLE)
nChildren = static_cast<sal_Int64>(m_aTable.GetRowCount()) *
static_cast<sal_Int64>(m_aTable.GetColumnCount());
- else if(m_eObjType == TCTYPE_COLUMNHEADERBAR)
+ else if (m_eObjType == AccessibleTableControlObjType::COLUMNHEADERBAR)
nChildren = m_aTable.GetColumnCount();
return nChildren;
}
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index fe59b7eab296..a81886977cba 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -74,12 +74,15 @@ namespace accessibility
ensureIsAlive();
OUString sAccName;
- if (m_eObjType == TCTYPE_TABLECELL)
- sAccName = m_aTable.GetAccessibleObjectName(TCTYPE_TABLECELL,
m_nRowPos, m_nColPos);
- else if (m_eObjType == TCTYPE_ROWHEADERCELL)
- sAccName = m_aTable.GetAccessibleObjectName(TCTYPE_ROWHEADERCELL,
m_nRowPos, 0);
- else if (m_eObjType == TCTYPE_COLUMNHEADERCELL)
- sAccName =
m_aTable.GetAccessibleObjectName(TCTYPE_COLUMNHEADERCELL, 0, m_nRowPos);
+ if (m_eObjType == AccessibleTableControlObjType::TABLECELL)
+ sAccName =
m_aTable.GetAccessibleObjectName(AccessibleTableControlObjType::TABLECELL,
+ m_nRowPos, m_nColPos);
+ else if (m_eObjType == AccessibleTableControlObjType::ROWHEADERCELL)
+ sAccName =
m_aTable.GetAccessibleObjectName(AccessibleTableControlObjType::ROWHEADERCELL,
+ m_nRowPos, 0);
+ else if (m_eObjType == AccessibleTableControlObjType::COLUMNHEADERCELL)
+ sAccName =
m_aTable.GetAccessibleObjectName(AccessibleTableControlObjType::COLUMNHEADERCELL,
+ 0, m_nRowPos);
else
assert(false && "Unhandled table cell type");
return sAccName;
@@ -108,7 +111,7 @@ namespace accessibility
::vcl::table::IAccessibleTable& _rTable,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos)
- :AccessibleGridControlCell( _rxParent, _rTable, _nRowPos, _nColPos,
TCTYPE_TABLECELL )
+ :AccessibleGridControlCell(_rxParent, _rTable, _nRowPos, _nColPos,
AccessibleTableControlObjType::TABLECELL)
{
}
diff --git a/include/vcl/accessibletable.hxx b/include/vcl/accessibletable.hxx
index 5eeaa528bdd9..f5cdad02c0ef 100644
--- a/include/vcl/accessibletable.hxx
+++ b/include/vcl/accessibletable.hxx
@@ -32,15 +32,15 @@ namespace vcl::table
typedef sal_Int32 RowPos;
-enum AccessibleTableControlObjType
+enum class AccessibleTableControlObjType
{
- TCTYPE_GRIDCONTROL, /// The GridControl itself.
- TCTYPE_TABLE, /// The data table.
- TCTYPE_ROWHEADERBAR, /// The row header bar.
- TCTYPE_COLUMNHEADERBAR, /// The horizontal column header bar.
- TCTYPE_TABLECELL, /// A cell of the data table.
- TCTYPE_ROWHEADERCELL, /// A cell of the row header bar.
- TCTYPE_COLUMNHEADERCELL, /// A cell of the column header bar.
+ GRIDCONTROL, /// The GridControl itself.
+ TABLE, /// The data table.
+ ROWHEADERBAR, /// The row header bar.
+ COLUMNHEADERBAR, /// The horizontal column header bar.
+ TABLECELL, /// A cell of the data table.
+ ROWHEADERCELL, /// A cell of the row header bar.
+ COLUMNHEADERCELL, /// A cell of the column header bar.
};
diff --git a/toolkit/source/controls/table/tablecontrol.cxx
b/toolkit/source/controls/table/tablecontrol.cxx
index 92ec7535f04c..0ce943f1698f 100644
--- a/toolkit/source/controls/table/tablecontrol.cxx
+++ b/toolkit/source/controls/table/tablecontrol.cxx
@@ -299,19 +299,19 @@ namespace svt::table
//Window* pWin;
switch( eObjType )
{
- case vcl::table::TCTYPE_GRIDCONTROL:
+ case vcl::table::AccessibleTableControlObjType::GRIDCONTROL:
aRetText = "Grid control";
break;
- case vcl::table::TCTYPE_TABLE:
+ case vcl::table::AccessibleTableControlObjType::TABLE:
aRetText = "Grid control";
break;
- case vcl::table::TCTYPE_ROWHEADERBAR:
+ case vcl::table::AccessibleTableControlObjType::ROWHEADERBAR:
aRetText = "RowHeaderBar";
break;
- case vcl::table::TCTYPE_COLUMNHEADERBAR:
+ case vcl::table::AccessibleTableControlObjType::COLUMNHEADERBAR:
aRetText = "ColumnHeaderBar";
break;
- case vcl::table::TCTYPE_TABLECELL:
+ case vcl::table::AccessibleTableControlObjType::TABLECELL:
//the name of the cell consists of column name and row name if
defined
//if the name is equal to cell content, it'll be read twice
if(GetModel()->hasColumnHeaders())
@@ -324,10 +324,10 @@ namespace svt::table
}
//aRetText = GetAccessibleCellText(_nRow, _nCol);
break;
- case vcl::table::TCTYPE_ROWHEADERCELL:
+ case vcl::table::AccessibleTableControlObjType::ROWHEADERCELL:
aRetText = GetRowName(_nRow);
break;
- case vcl::table::TCTYPE_COLUMNHEADERCELL:
+ case vcl::table::AccessibleTableControlObjType::COLUMNHEADERCELL:
aRetText = GetColumnName(_nCol);
break;
default:
@@ -342,19 +342,19 @@ namespace svt::table
OUString aRetText;
switch( eObjType )
{
- case vcl::table::TCTYPE_GRIDCONTROL:
+ case vcl::table::AccessibleTableControlObjType::GRIDCONTROL:
aRetText = "Grid control description";
break;
- case vcl::table::TCTYPE_TABLE:
+ case vcl::table::AccessibleTableControlObjType::TABLE:
aRetText = "TABLE description";
break;
- case vcl::table::TCTYPE_ROWHEADERBAR:
+ case vcl::table::AccessibleTableControlObjType::ROWHEADERBAR:
aRetText = "ROWHEADERBAR description";
break;
- case vcl::table::TCTYPE_COLUMNHEADERBAR:
+ case vcl::table::AccessibleTableControlObjType::COLUMNHEADERBAR:
aRetText = "COLUMNHEADERBAR description";
break;
- case vcl::table::TCTYPE_TABLECELL:
+ case vcl::table::AccessibleTableControlObjType::TABLECELL:
// the description of the cell consists of column name and row
name if defined
// if the name is equal to cell content, it'll be read twice
if ( GetModel()->hasColumnHeaders() )
@@ -366,10 +366,10 @@ namespace svt::table
aRetText += GetRowName( GetCurrentRow() );
}
break;
- case vcl::table::TCTYPE_ROWHEADERCELL:
+ case vcl::table::AccessibleTableControlObjType::ROWHEADERCELL:
aRetText = "ROWHEADERCELL description";
break;
- case vcl::table::TCTYPE_COLUMNHEADERCELL:
+ case vcl::table::AccessibleTableControlObjType::COLUMNHEADERCELL:
aRetText = "COLUMNHEADERCELL description";
break;
}
@@ -403,8 +403,8 @@ namespace svt::table
{
switch( eObjType )
{
- case vcl::table::TCTYPE_GRIDCONTROL:
- case vcl::table::TCTYPE_TABLE:
+ case vcl::table::AccessibleTableControlObjType::GRIDCONTROL:
+ case vcl::table::AccessibleTableControlObjType::TABLE:
rStateSet |= AccessibleStateType::FOCUSABLE;
@@ -426,21 +426,21 @@ namespace svt::table
if ( IsReallyVisible() )
rStateSet |= AccessibleStateType::VISIBLE;
- if ( eObjType == vcl::table::TCTYPE_TABLE )
+ if ( eObjType ==
vcl::table::AccessibleTableControlObjType::TABLE )
rStateSet |= AccessibleStateType::MANAGES_DESCENDANTS;
break;
- case vcl::table::TCTYPE_ROWHEADERBAR:
+ case vcl::table::AccessibleTableControlObjType::ROWHEADERBAR:
rStateSet |= AccessibleStateType::VISIBLE;
rStateSet |= AccessibleStateType::MANAGES_DESCENDANTS;
break;
- case vcl::table::TCTYPE_COLUMNHEADERBAR:
+ case vcl::table::AccessibleTableControlObjType::COLUMNHEADERBAR:
rStateSet |= AccessibleStateType::VISIBLE;
rStateSet |= AccessibleStateType::MANAGES_DESCENDANTS;
break;
- case vcl::table::TCTYPE_TABLECELL:
+ case vcl::table::AccessibleTableControlObjType::TABLECELL:
{
rStateSet |= AccessibleStateType::FOCUSABLE;
if ( HasChildPathFocus() )
@@ -456,12 +456,12 @@ namespace svt::table
}
break;
- case vcl::table::TCTYPE_ROWHEADERCELL:
+ case vcl::table::AccessibleTableControlObjType::ROWHEADERCELL:
rStateSet |= AccessibleStateType::VISIBLE;
rStateSet |= AccessibleStateType::TRANSIENT;
break;
- case vcl::table::TCTYPE_COLUMNHEADERCELL:
+ case vcl::table::AccessibleTableControlObjType::COLUMNHEADERCELL:
rStateSet |= AccessibleStateType::VISIBLE;
break;
}
