vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx | 1
vcl/source/accessibility/AccessibleBrowseBoxBase.cxx | 2 -
vcl/source/accessibility/accessibleiconchoicectrlentry.cxx | 22 +++++--------
vcl/source/accessibility/accessiblelistboxentry.cxx | 9 -----
vcl/source/accessibility/accessiblemenubasecomponent.cxx | 6 ---
vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx | 6 ---
vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx | 6 ---
vcl/source/accessibility/vclxaccessibletabpage.cxx | 6 ---
vcl/source/accessibility/vclxaccessibletoolboxitem.cxx | 2 -
9 files changed, 16 insertions(+), 44 deletions(-)
New commits:
commit c5908d7e7db7177bbb8e376fde41a85af3fa8de9
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Jul 22 10:08:04 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Jul 22 19:40:15 2025 +0200
vcl a11y: Use OAccessible::isAlive
... instead of reimplementing the same logic
again.
Change-Id: I548c457660a86d0a6c3ddab6cd5b08d93797deb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188143
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/source/accessibility/AccessibleBrowseBoxBase.cxx
b/vcl/source/accessibility/AccessibleBrowseBoxBase.cxx
index 54934b39f3bd..6427bf8aeca2 100644
--- a/vcl/source/accessibility/AccessibleBrowseBoxBase.cxx
+++ b/vcl/source/accessibility/AccessibleBrowseBoxBase.cxx
@@ -252,7 +252,7 @@ sal_Int64 AccessibleBrowseBoxBase::implCreateStateSet()
bool AccessibleBrowseBoxBase::isAlive() const
{
- return !rBHelper.bDisposed && !rBHelper.bInDispose && mpBrowseBox;
+ return OAccessible::isAlive() && mpBrowseBox;
}
void AccessibleBrowseBoxBase::ensureIsAlive() const
diff --git a/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx
b/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx
index 2a86ed5af9e7..aeccc0ff6186 100644
--- a/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx
+++ b/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx
@@ -100,7 +100,7 @@ tools::Rectangle
AccessibleIconChoiceCtrlEntry::GetBoundingBox_Impl() const
bool AccessibleIconChoiceCtrlEntry::IsAlive_Impl() const
{
- return ( !rBHelper.bDisposed && !rBHelper.bInDispose && m_pIconCtrl );
+ return isAlive() && m_pIconCtrl;
}
bool AccessibleIconChoiceCtrlEntry::IsShowing_Impl() const
diff --git a/vcl/source/accessibility/accessiblelistboxentry.cxx
b/vcl/source/accessibility/accessiblelistboxentry.cxx
index 321c25741d19..ca01914f5b85 100644
--- a/vcl/source/accessibility/accessiblelistboxentry.cxx
+++ b/vcl/source/accessibility/accessiblelistboxentry.cxx
@@ -116,7 +116,7 @@ tools::Rectangle
AccessibleListBoxEntry::GetBoundingBox_Impl() const
bool AccessibleListBoxEntry::IsAlive_Impl() const
{
- return !rBHelper.bDisposed && !rBHelper.bInDispose && (m_pTreeListBox !=
nullptr);
+ return isAlive() && m_pTreeListBox;
}
bool AccessibleListBoxEntry::IsShowing_Impl() const
diff --git a/vcl/source/accessibility/accessiblemenubasecomponent.cxx
b/vcl/source/accessibility/accessiblemenubasecomponent.cxx
index 83be8e57ca8b..1d700e20b062 100644
--- a/vcl/source/accessibility/accessiblemenubasecomponent.cxx
+++ b/vcl/source/accessibility/accessiblemenubasecomponent.cxx
@@ -641,14 +641,10 @@ sal_Int64
OAccessibleMenuBaseComponent::getAccessibleStateSet( )
sal_Int64 nStateSet = 0;
- if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
- {
+ if (isAlive())
FillAccessibleStateSet( nStateSet );
- }
else
- {
nStateSet |= AccessibleStateType::DEFUNC;
- }
return nStateSet;
}
diff --git a/vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx
b/vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx
index d320a5e21255..64b4cae7502c 100644
--- a/vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx
+++ b/vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx
@@ -176,14 +176,10 @@ sal_Int64
VCLXAccessibleHeaderBarItem::getAccessibleStateSet( )
sal_Int64 nStateSet = 0;
- if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
- {
+ if (isAlive())
FillAccessibleStateSet( nStateSet );
- }
else
- {
nStateSet |= AccessibleStateType::DEFUNC;
- }
return nStateSet;
}
diff --git a/vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx
b/vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx
index 0548ec387fe5..f497b0320ff4 100644
--- a/vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx
+++ b/vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx
@@ -290,14 +290,10 @@ sal_Int64
VCLXAccessibleStatusBarItem::getAccessibleStateSet( )
sal_Int64 nStateSet = 0;
- if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
- {
+ if (isAlive())
FillAccessibleStateSet( nStateSet );
- }
else
- {
nStateSet |= AccessibleStateType::DEFUNC;
- }
return nStateSet;
}
diff --git a/vcl/source/accessibility/vclxaccessibletabpage.cxx
b/vcl/source/accessibility/vclxaccessibletabpage.cxx
index dda56ad202b5..f30a05a48f5c 100644
--- a/vcl/source/accessibility/vclxaccessibletabpage.cxx
+++ b/vcl/source/accessibility/vclxaccessibletabpage.cxx
@@ -357,14 +357,10 @@ sal_Int64 VCLXAccessibleTabPage::getAccessibleStateSet( )
sal_Int64 nStateSet = 0;
- if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
- {
+ if (isAlive())
FillAccessibleStateSet( nStateSet );
- }
else
- {
nStateSet |= AccessibleStateType::DEFUNC;
- }
return nStateSet;
}
diff --git a/vcl/source/accessibility/vclxaccessibletoolboxitem.cxx
b/vcl/source/accessibility/vclxaccessibletoolboxitem.cxx
index 61090ced9420..4098b63da620 100644
--- a/vcl/source/accessibility/vclxaccessibletoolboxitem.cxx
+++ b/vcl/source/accessibility/vclxaccessibletoolboxitem.cxx
@@ -373,7 +373,7 @@ sal_Int64 SAL_CALL
VCLXAccessibleToolBoxItem::getAccessibleStateSet( )
sal_Int64 nStateSet = 0;
- if ( m_pToolBox && !rBHelper.bDisposed && !rBHelper.bInDispose )
+ if (m_pToolBox && isAlive())
{
nStateSet |= AccessibleStateType::FOCUSABLE;
if (m_pToolBox->GetItemBits(m_nItemId) & ToolBoxItemBits::CHECKABLE)
commit c9d06d6fdb7a2750b2a8723fe12bff55c72d52bb
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Jul 22 10:05:18 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Jul 22 19:40:09 2025 +0200
vcl a11y: Drop commented code + other comments not adding value
Change-Id: I137c417d478e6c240e68d86d879d62930bc4b3c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188142
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/vcl/source/accessibility/accessiblelistboxentry.cxx
b/vcl/source/accessibility/accessiblelistboxentry.cxx
index 106e9cb691e2..321c25741d19 100644
--- a/vcl/source/accessibility/accessiblelistboxentry.cxx
+++ b/vcl/source/accessibility/accessiblelistboxentry.cxx
@@ -37,17 +37,12 @@
#include <svdata.hxx>
#include <strings.hrc>
-// class AccessibleListBoxEntry
-----------------------------------------------------
-
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star;
using namespace ::comphelper;
-
-// Ctor() and Dtor()
-
AccessibleListBoxEntry::AccessibleListBoxEntry( SvTreeListBox& _rListBox,
SvTreeListEntry& rEntry,
AccessibleListBox & rListBox)
@@ -999,7 +994,6 @@ Any AccessibleListBoxEntry::getMaximumValue( )
::osl::MutexGuard aGuard( m_aMutex );
Any aValue;
- // SvTreeListBox* pBox = m_pTreeListBox;
switch(getAccessibleRole())
{
case AccessibleRole::CHECK_BOX:
@@ -1019,7 +1013,6 @@ Any AccessibleListBoxEntry::getMinimumValue( )
::osl::MutexGuard aGuard( m_aMutex );
Any aValue;
- // SvTreeListBox* pBox = m_pTreeListBox;
switch(getAccessibleRole())
{
case AccessibleRole::CHECK_BOX:
commit 30c748068f020d03c7b31d5c6e1db28c16a1878b
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Jul 22 09:52:01 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Jul 22 19:40:03 2025 +0200
vcl icon choice ctrl a11y: Merge GetBoundingBoxOnScreen{,Impl}
Change-Id: I2cbd8d427e7875171e522384db1229583d6bce93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188141
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx
b/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx
index 7892a377bd4f..bdf630a6e88c 100644
--- a/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx
+++ b/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx
@@ -48,7 +48,6 @@ class AccessibleIconChoiceCtrlEntry final : public
AccessibleIconChoiceCtrlEntry
css::uno::Reference< css::accessibility::XAccessible > m_xParent;
tools::Rectangle GetBoundingBox_Impl() const;
- AbsoluteScreenPixelRectangle GetBoundingBoxOnScreen_Impl() const;
bool IsAlive_Impl() const;
bool IsShowing_Impl() const;
diff --git a/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx
b/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx
index bccd6d2af576..2a86ed5af9e7 100644
--- a/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx
+++ b/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx
@@ -98,17 +98,6 @@ tools::Rectangle
AccessibleIconChoiceCtrlEntry::GetBoundingBox_Impl() const
return aRect;
}
-AbsoluteScreenPixelRectangle
AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen_Impl() const
-{
- SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry( m_nIndex );
- if ( !pEntry )
- return AbsoluteScreenPixelRectangle();
- tools::Rectangle aRect = m_pIconCtrl->GetBoundingBox( pEntry );
- AbsoluteScreenPixelPoint aTopLeft =
m_pIconCtrl->GetWindowExtentsAbsolute().TopLeft();
- aTopLeft += AbsoluteScreenPixelPoint(aRect.TopLeft());
- return AbsoluteScreenPixelRectangle( aTopLeft, aRect.GetSize() );
-}
-
bool AccessibleIconChoiceCtrlEntry::IsAlive_Impl() const
{
return ( !rBHelper.bDisposed && !rBHelper.bInDispose && m_pIconCtrl );
@@ -136,7 +125,14 @@ AbsoluteScreenPixelRectangle
AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScre
::osl::MutexGuard aGuard( m_aMutex );
EnsureIsAlive();
- return GetBoundingBoxOnScreen_Impl();
+
+ SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry(m_nIndex);
+ if (!pEntry)
+ return AbsoluteScreenPixelRectangle();
+ tools::Rectangle aRect = m_pIconCtrl->GetBoundingBox(pEntry);
+ AbsoluteScreenPixelPoint aTopLeft =
m_pIconCtrl->GetWindowExtentsAbsolute().TopLeft();
+ aTopLeft += AbsoluteScreenPixelPoint(aRect.TopLeft());
+ return AbsoluteScreenPixelRectangle(aTopLeft, aRect.GetSize());
}
void AccessibleIconChoiceCtrlEntry::EnsureIsAlive() const
