include/vcl/accessibility/AccessibleBrowseBox.hxx | 28 ++--------------------
vcl/source/accessibility/AccessibleBrowseBox.cxx | 20 ++++++---------
vcl/source/accessibility/accessibletablistbox.cxx | 2 -
3 files changed, 12 insertions(+), 38 deletions(-)
New commits:
commit 5de8de26c3fa1db288f4cff66eeb7d68f2bbcc3e
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Sep 10 14:50:07 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Sep 10 20:48:18 2025 +0200
vcl a11y: Simplify AccessibleBrowseBox::implGetFixedChild
Return right away instead of assigning to local var first.
Change-Id: Ie98cd2e94b2009d401bd2603f11a243a13ddae72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190767
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/vcl/source/accessibility/AccessibleBrowseBox.cxx
b/vcl/source/accessibility/AccessibleBrowseBox.cxx
index 1540909719fb..602789b90843 100644
--- a/vcl/source/accessibility/AccessibleBrowseBox.cxx
+++ b/vcl/source/accessibility/AccessibleBrowseBox.cxx
@@ -190,20 +190,17 @@
AccessibleBrowseBox::getHeaderBar(AccessibleBrowseBoxObjType eObjType)
css::uno::Reference< css::accessibility::XAccessible >
AccessibleBrowseBox::implGetFixedChild( sal_Int64 nChildIndex )
{
- css::uno::Reference< css::accessibility::XAccessible > xRet;
switch( nChildIndex )
{
case vcl::BBINDEX_COLUMNHEADERBAR:
- xRet = getHeaderBar(AccessibleBrowseBoxObjType::ColumnHeaderBar);
- break;
+ return getHeaderBar(AccessibleBrowseBoxObjType::ColumnHeaderBar);
case vcl::BBINDEX_ROWHEADERBAR:
- xRet = getHeaderBar(AccessibleBrowseBoxObjType::RowHeaderBar);
- break;
+ return getHeaderBar(AccessibleBrowseBoxObjType::RowHeaderBar);
case vcl::BBINDEX_TABLE:
- xRet = getTable();
- break;
+ return getTable();
}
- return xRet;
+
+ return {};
}
rtl::Reference<AccessibleBrowseBoxTable>
AccessibleBrowseBox::createAccessibleTable()
commit 8bda88cede74ffa656bee352e0593027c3816f1c
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Sep 10 14:47:59 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Sep 10 20:48:12 2025 +0200
vcl a11y: Merge AccessibleBrowseBox::{implG,g}etTable
Change-Id: I40609ad0d0e4e2779ba24c8854c22d80c0a65c2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190766
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/include/vcl/accessibility/AccessibleBrowseBox.hxx
b/include/vcl/accessibility/AccessibleBrowseBox.hxx
index fd769ee23f3f..77f9a91aef17 100644
--- a/include/vcl/accessibility/AccessibleBrowseBox.hxx
+++ b/include/vcl/accessibility/AccessibleBrowseBox.hxx
@@ -112,12 +112,7 @@ public:
/** returns the accessible object for the table representation
*/
- css::uno::Reference<
- css::accessibility::XAccessible >
- getTable( )
- {
- return implGetTable();
- }
+ css::uno::Reference<css::accessibility::XAccessible> getTable();
protected:
// internal virtual methods
@@ -128,12 +123,6 @@ protected:
// internal helper methods
- /** This method creates (once) and returns the accessible data table child.
- @attention This method requires locked mutex's and a living object.
- @return The XAccessible interface of the data table. */
- css::uno::Reference<
- css::accessibility::XAccessible > implGetTable();
-
/** This method returns one of the children that are always present:
Data table, row and column header bar or corner control.
@attention This method requires locked mutex's and a living object.
diff --git a/vcl/source/accessibility/AccessibleBrowseBox.cxx
b/vcl/source/accessibility/AccessibleBrowseBox.cxx
index 5806d494a92b..1540909719fb 100644
--- a/vcl/source/accessibility/AccessibleBrowseBox.cxx
+++ b/vcl/source/accessibility/AccessibleBrowseBox.cxx
@@ -158,8 +158,7 @@ tools::Rectangle AccessibleBrowseBox::implGetBoundingBox()
return mpBrowseBox->GetWindowExtentsRelative( *pParent );
}
-// internal helper methods
-css::uno::Reference< css::accessibility::XAccessible >
AccessibleBrowseBox::implGetTable()
+css::uno::Reference<css::accessibility::XAccessible>
AccessibleBrowseBox::getTable()
{
if( !mxTable.is() )
{
@@ -201,7 +200,7 @@ AccessibleBrowseBox::implGetFixedChild( sal_Int64
nChildIndex )
xRet = getHeaderBar(AccessibleBrowseBoxObjType::RowHeaderBar);
break;
case vcl::BBINDEX_TABLE:
- xRet = implGetTable();
+ xRet = getTable();
break;
}
return xRet;
diff --git a/vcl/source/accessibility/accessibletablistbox.cxx
b/vcl/source/accessibility/accessibletablistbox.cxx
index 281ec34a2145..5e08e5ceee74 100644
--- a/vcl/source/accessibility/accessibletablistbox.cxx
+++ b/vcl/source/accessibility/accessibletablistbox.cxx
@@ -72,7 +72,7 @@ AccessibleTabListBox::getAccessibleChild( sal_Int64
nChildIndex )
if (nChildIndex != 0)
throw IndexOutOfBoundsException();
- return implGetTable();
+ return getTable();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 346939479fde9aec6f71a010f33a3a085476e932
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Sep 10 14:43:35 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Sep 10 20:48:06 2025 +0200
vcl a11y: Merge AccessibleBrowseBox::{implG,g}etHeaderBar
Change-Id: I9628421ec379abc48fb3163419722af876617b03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190765
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/include/vcl/accessibility/AccessibleBrowseBox.hxx
b/include/vcl/accessibility/AccessibleBrowseBox.hxx
index fd070e44e034..fd769ee23f3f 100644
--- a/include/vcl/accessibility/AccessibleBrowseBox.hxx
+++ b/include/vcl/accessibility/AccessibleBrowseBox.hxx
@@ -107,12 +107,8 @@ public:
/** returns the accessible object for the row or the column header bar
*/
- css::uno::Reference<
- css::accessibility::XAccessible >
- getHeaderBar( AccessibleBrowseBoxObjType _eObjType )
- {
- return implGetHeaderBar(_eObjType);
- }
+ css::uno::Reference<css::accessibility::XAccessible>
+ getHeaderBar(AccessibleBrowseBoxObjType eObjType);
/** returns the accessible object for the table representation
*/
@@ -138,13 +134,6 @@ protected:
css::uno::Reference<
css::accessibility::XAccessible > implGetTable();
- /** This method creates (once) and returns the specified header bar.
- @attention This method requires locked mutex's and a living object.
- @return The XAccessible interface of the header bar. */
- css::uno::Reference<
- css::accessibility::XAccessible >
- implGetHeaderBar( AccessibleBrowseBoxObjType eObjType );
-
/** This method returns one of the children that are always present:
Data table, row and column header bar or corner control.
@attention This method requires locked mutex's and a living object.
diff --git a/vcl/source/accessibility/AccessibleBrowseBox.cxx
b/vcl/source/accessibility/AccessibleBrowseBox.cxx
index 8cc43e2678bc..5806d494a92b 100644
--- a/vcl/source/accessibility/AccessibleBrowseBox.cxx
+++ b/vcl/source/accessibility/AccessibleBrowseBox.cxx
@@ -169,8 +169,8 @@ css::uno::Reference< css::accessibility::XAccessible >
AccessibleBrowseBox::impl
return mxTable;
}
-css::uno::Reference< css::accessibility::XAccessible >
-AccessibleBrowseBox::implGetHeaderBar(AccessibleBrowseBoxObjType eObjType)
+css::uno::Reference<css::accessibility::XAccessible>
+AccessibleBrowseBox::getHeaderBar(AccessibleBrowseBoxObjType eObjType)
{
if( eObjType == AccessibleBrowseBoxObjType::RowHeaderBar )
{
@@ -195,14 +195,14 @@ AccessibleBrowseBox::implGetFixedChild( sal_Int64
nChildIndex )
switch( nChildIndex )
{
case vcl::BBINDEX_COLUMNHEADERBAR:
- xRet = implGetHeaderBar(
AccessibleBrowseBoxObjType::ColumnHeaderBar );
- break;
+ xRet = getHeaderBar(AccessibleBrowseBoxObjType::ColumnHeaderBar);
+ break;
case vcl::BBINDEX_ROWHEADERBAR:
- xRet = implGetHeaderBar( AccessibleBrowseBoxObjType::RowHeaderBar
);
- break;
+ xRet = getHeaderBar(AccessibleBrowseBoxObjType::RowHeaderBar);
+ break;
case vcl::BBINDEX_TABLE:
xRet = implGetTable();
- break;
+ break;
}
return xRet;
}
