basctl/source/basicide/baside2b.cxx | 1 -
svtools/source/brwbox/brwbox3.cxx | 1 -
svtools/source/brwbox/editbrowsebox2.cxx | 1 -
toolkit/source/awt/vclxwindows.cxx | 1 -
toolkit/source/controls/table/tablecontrol_impl.cxx | 1 -
vcl/source/control/ivctrl.cxx | 1 -
vcl/source/treelist/iconview.cxx | 1 -
vcl/source/treelist/svtabbx.cxx | 1 -
vcl/source/treelist/treelistbox.cxx | 1 -
vcl/unx/gtk3/a11y/atkwrapper.cxx | 9 +++++----
10 files changed, 5 insertions(+), 13 deletions(-)
New commits:
commit 71ff088c6b3a22600b3b05c1dc3c4ca42548c5c6
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon May 26 09:36:29 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed May 28 18:02:44 2025 +0200
gtk3 a11y: Don't rely on win accessible being VCLXWindow
This is similar to winaccessibility commit
commit ed03c63f00dee22112a8632df45e5e044541960d
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Thu May 22 09:45:02 2025 +0100
wina11y: Don't rely on win accessible being VCLXWindow
, but in gtk3 a11y code.
This commit e.g. makes sure that the combobox inside of Writer's
find toolbar will keep showing up in Accerciser's treeview of the LO
a11y hierarchy after upcoming commit
Change-Id: I25de1ab0f8b47b12346abd01bad05cb54fb75f52
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Mon May 26 09:45:11 2025 +0200
vcl a11y: Let vcl::Window create accessible directly, drop a11y
factory
, as the previous assumption that the vcl::Window's XAccessible
is the VCLXWindow/XWindow will no longer be true after
that commit.
See the winaccessibility commit mentioned above for more
background.
Change-Id: I7b00f8c00aa11d8426026f8ed427fbb13f4d345a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185842
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/unx/gtk3/a11y/atkwrapper.cxx b/vcl/unx/gtk3/a11y/atkwrapper.cxx
index 2087f76ffd38..6bf67a1e3479 100644
--- a/vcl/unx/gtk3/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk3/a11y/atkwrapper.cxx
@@ -44,10 +44,10 @@
#include <rtl/strbuf.hxx>
#include <osl/diagnose.h>
#include <comphelper/diagnose_ex.hxx>
+#include <vcl/accessibility/vclxaccessiblecomponent.hxx>
#include <vcl/syschild.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/toolkit/unowrap.hxx>
#include "atkwrapper.hxx"
#include "atkregistry.hxx"
@@ -1012,10 +1012,11 @@ atk_object_wrapper_new( const css::uno::Reference<
css::accessibility::XAccessib
}
// tdf#141197 if we have a sysobj child then include that in the
hierarchy
- if (UnoWrapperBase* pWrapper = UnoWrapperBase::GetUnoWrapper())
+ rtl::Reference<VCLXAccessibleComponent> pVCLAccComponent
+ =
dynamic_cast<VCLXAccessibleComponent*>(rxAccessible->getAccessibleContext().get());
+ if (pVCLAccComponent.is())
{
- css::uno::Reference<css::awt::XWindow> xAWTWindow(rxAccessible,
css::uno::UNO_QUERY);
- VclPtr<vcl::Window> xWindow = pWrapper->GetWindow(xAWTWindow);
+ VclPtr<vcl::Window> xWindow = pVCLAccComponent->GetWindow();
if (xWindow && xWindow->GetType() == WindowType::SYSTEMCHILDWINDOW)
{
const SystemEnvData* pEnvData =
static_cast<SystemChildWindow*>(xWindow.get())->GetSystemData();
commit a57c6e99c9aa2f0b2099c0ec2d1d7998da11db75
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon May 26 09:36:17 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed May 28 18:02:30 2025 +0200
a11y: Drop unused accessiblefactory.hxx includes
Change-Id: I5b605a32a62dfd17318db5232c59282a6ae1cb7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185841
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index bc89c3f1511b..bb29fc1d9bca 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -48,7 +48,6 @@
#include <sfx2/viewfrm.hxx>
#include <tools/debug.hxx>
#include <utility>
-#include <vcl/accessiblefactory.hxx>
#include <vcl/image.hxx>
#include <vcl/weld.hxx>
#include <vcl/weldutils.hxx>
diff --git a/svtools/source/brwbox/brwbox3.cxx
b/svtools/source/brwbox/brwbox3.cxx
index c54336c43b7d..c8efe278b8a3 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -22,7 +22,6 @@
#include <vcl/accessibility/AccessibleBrowseBoxHeaderCell.hxx>
#include <vcl/accessibility/AccessibleBrowseBoxObjType.hxx>
#include <vcl/accessibility/AccessibleBrowseBoxTableCell.hxx>
-#include <vcl/accessiblefactory.hxx>
#include <sal/log.hxx>
#include <tools/debug.hxx>
#include <tools/multisel.hxx>
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx
b/svtools/source/brwbox/editbrowsebox2.cxx
index 47a1bca8b217..27d10b9dbd70 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -25,7 +25,6 @@
#include <svtools/svtresid.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/accessibility/AccessibleBrowseBoxCheckBoxCell.hxx>
-#include <vcl/accessiblefactory.hxx>
#include <vcl/svapp.hxx>
#include <tools/debug.hxx>
#include <comphelper/diagnose_ex.hxx>
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index e0ae26a51718..1c62f4983b87 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -37,7 +37,6 @@
#include <awt/vclxwindows.hxx>
#include <controls/filectrl.hxx>
#include <controls/svmedit.hxx>
-#include <vcl/accessiblefactory.hxx>
#include <vcl/toolkit/button.hxx>
#include <vcl/toolkit/fmtfield.hxx>
#include <vcl/graph.hxx>
diff --git a/toolkit/source/controls/table/tablecontrol_impl.cxx
b/toolkit/source/controls/table/tablecontrol_impl.cxx
index 8dfb737f64a9..bef96aa7e9e8 100644
--- a/toolkit/source/controls/table/tablecontrol_impl.cxx
+++ b/toolkit/source/controls/table/tablecontrol_impl.cxx
@@ -33,7 +33,6 @@
#include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
#include <comphelper/flagguard.hxx>
-#include <vcl/accessiblefactory.hxx>
#include <vcl/toolkit/scrbar.hxx>
#include <vcl/seleng.hxx>
#include <vcl/settings.hxx>
diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx
index a215cc1680b1..2c4b0fac0c6e 100644
--- a/vcl/source/control/ivctrl.cxx
+++ b/vcl/source/control/ivctrl.cxx
@@ -21,7 +21,6 @@
#include <utility>
#include <vcl/toolkit/ivctrl.hxx>
#include "imivctl.hxx"
-#include <vcl/accessiblefactory.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/mnemonic.hxx>
diff --git a/vcl/source/treelist/iconview.cxx b/vcl/source/treelist/iconview.cxx
index fb204743f642..fb6af8428a41 100644
--- a/vcl/source/treelist/iconview.cxx
+++ b/vcl/source/treelist/iconview.cxx
@@ -24,7 +24,6 @@
#include <vcl/toolkit/viewdataentry.hxx>
#include <iconview.hxx>
#include "iconviewimpl.hxx"
-#include <vcl/accessiblefactory.hxx>
#include <vcl/uitest/uiobject.hxx>
#include <tools/json_writer.hxx>
#include <vcl/toolkit/svlbitm.hxx>
diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index 84cdcfbe5075..e9084cd06b65 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -20,7 +20,6 @@
#include <accessibility/accessibletablistbox.hxx>
#include <comphelper/types.hxx>
-#include <vcl/accessiblefactory.hxx>
#include <vcl/toolkit/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <vcl/toolkit/svlbitm.hxx>
diff --git a/vcl/source/treelist/treelistbox.cxx
b/vcl/source/treelist/treelistbox.cxx
index ba9d0d48ceb9..44815e8aa6c9 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -26,7 +26,6 @@
#include <accessibility/accessiblelistbox.hxx>
#include <vcl/toolkit/treelistbox.hxx>
-#include <vcl/accessiblefactory.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <vcl/help.hxx>
#include <vcl/svapp.hxx>
