include/vcl/accessiblefactory.hxx | 5 -----
vcl/source/accessibility/acc_factory.cxx | 8 --------
vcl/source/control/ivctrl.cxx | 10 ++++------
3 files changed, 4 insertions(+), 19 deletions(-)
New commits:
commit 817e0a27a734c98ea3082b1e7051cf7a02105a89
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Mar 4 16:52:39 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Mar 4 21:35:34 2025 +0100
vcl a11y: Call AccessibleIconChoiceCtrl ctor directly
... and no longer use AccessibleFactory::createAccessibleIconChoiceCtrl,
which
was used in the past to break a dependency cycle between vcl and the
(no longer existing) accessibility module.
Change-Id: I0c7a7bb621b391ec0840abad0ee86b07696ee763
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182490
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/include/vcl/accessiblefactory.hxx
b/include/vcl/accessiblefactory.hxx
index 9174a4189482..553a1bafcb5c 100644
--- a/include/vcl/accessiblefactory.hxx
+++ b/include/vcl/accessiblefactory.hxx
@@ -52,7 +52,6 @@ class PushButton;
class RadioButton;
class ScrollBar;
class SvHeaderTabListBox;
-class SvtIconChoiceCtrl;
class ToolBox;
class SvTreeListBox;
class TextEngine;
@@ -90,10 +89,6 @@ public:
static css::uno::Reference<css::accessibility::XAccessibleContext>
createAccessibleContext(vcl::Window* pWindow);
- static css::uno::Reference<css::accessibility::XAccessible>
createAccessibleIconChoiceCtrl(
- SvtIconChoiceCtrl& _rIconCtrl,
- const css::uno::Reference<css::accessibility::XAccessible>& _xParent);
-
static css::uno::Reference<css::accessibility::XAccessibleContext>
createAccessibleTextWindowContext(vcl::Window* pWindow, TextEngine&
rEngine, TextView& rView);
diff --git a/vcl/source/accessibility/acc_factory.cxx
b/vcl/source/accessibility/acc_factory.cxx
index 282a8ad126eb..c99ca226231c 100644
--- a/vcl/source/accessibility/acc_factory.cxx
+++ b/vcl/source/accessibility/acc_factory.cxx
@@ -40,7 +40,6 @@
#include <accessibility/vclxaccessibletabcontrol.hxx>
#include <accessibility/vclxaccessibletabpagewindow.hxx>
#include <accessibility/accessibletablistbox.hxx>
-#include <accessibility/accessibleiconchoicectrl.hxx>
#include <accessibility/AccessibleIconView.hxx>
#include <accessibility/accessiblelistbox.hxx>
#include <accessibility/textwindowaccessibility.hxx>
@@ -181,13 +180,6 @@ Reference< XAccessibleContext >
AccessibleFactory::createAccessibleContext(Forma
return new SVTXAccessibleNumericField(pFormattedField);
}
-Reference<XAccessible>
-AccessibleFactory::createAccessibleIconChoiceCtrl(SvtIconChoiceCtrl&
_rIconCtrl,
- const
Reference<XAccessible>& _xParent)
-{
- return new AccessibleIconChoiceCtrl( _rIconCtrl, _xParent );
-}
-
Reference<XAccessibleContext>
AccessibleFactory::createAccessibleTextWindowContext(vcl::Window* pWindow,
TextEngine& rEngine,
TextView& rView)
diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx
index c3190c262c97..3b2338116259 100644
--- a/vcl/source/control/ivctrl.cxx
+++ b/vcl/source/control/ivctrl.cxx
@@ -31,6 +31,7 @@
#include <vcl/uitest/uiobject.hxx>
#include <vcl/uitest/logger.hxx>
#include <vcl/uitest/eventdescription.hxx>
+#include <accessibility/accessibleiconchoicectrl.hxx>
#include <verticaltabctrl.hxx>
using namespace ::com::sun::star::accessibility;
@@ -327,14 +328,11 @@ void SvtIconChoiceCtrl::CallImplEventListeners(VclEventId
nEvent, void* pData)
}
css::uno::Reference< XAccessible > SvtIconChoiceCtrl::CreateAccessible()
{
- css::uno::Reference< XAccessible > xAccessible;
css::uno::Reference< XAccessible > xAccParent = GetAccessibleParent();
if ( xAccParent.is() )
- {
- css::uno::Reference< css::awt::XVclWindowPeer >
xHoldAlive(GetComponentInterface());
- xAccessible = AccessibleFactory::createAccessibleIconChoiceCtrl(*this,
xAccParent);
- }
- return xAccessible;
+ return new AccessibleIconChoiceCtrl(*this, xAccParent);
+
+ return nullptr;
}
struct VerticalTabPageData
