include/vcl/window.hxx | 7 ++++++- qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java | 2 -- vcl/source/window/accessibility.cxx | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-)
New commits: commit 0c31a8cd708fa29b4202243238863b4c939cd221 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jun 26 15:48:16 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jun 27 09:09:36 2025 +0200 sw java a11y test: Drop unused imports Change-Id: I91672b687a75c1ed9c52fe245baf6bf285d57a05 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187055 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java index ff4a87b13da4..c8431e06c9b8 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java @@ -32,7 +32,6 @@ import com.sun.star.accessibility.XAccessible; import com.sun.star.accessibility.XAccessibleContext; import com.sun.star.awt.XWindow; import com.sun.star.beans.XPropertySet; -import com.sun.star.frame.XController; import com.sun.star.frame.XModel; import com.sun.star.text.XText; import com.sun.star.text.XTextContent; @@ -40,7 +39,6 @@ import com.sun.star.text.XTextCursor; import com.sun.star.text.XTextDocument; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.UnoRuntime; -import com.sun.star.view.XViewSettingsSupplier; /** * Test of accessible object for the graphic object of a text document.<p> commit b9b9b4b8e70ba91f3e7efbd49a299e40fb8d05e6 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jun 26 15:23:52 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jun 27 09:09:27 2025 +0200 vcl a11y: Switch Window::SetAccessible param to OAccessible ... to make clear that subclasses of that type are always passed when the accessible is explicitly set this way. Change-Id: Ia4632c7dddfe14083fd1af89c2df1562272c80b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187051 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index e548c2aec4d6..aed1f59a49d3 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -81,6 +81,11 @@ namespace com::sun::star { } } +namespace comphelper +{ +class OAccessible; +} + namespace vcl { struct ControlLayoutData; } @@ -1121,7 +1126,7 @@ public: css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ); - void SetAccessible( const css::uno::Reference< css::accessibility::XAccessible >& ); + void SetAccessible(const rtl::Reference<comphelper::OAccessible>& rpAccessible); vcl::Window* GetAccessibleParentWindow() const; sal_uInt16 GetAccessibleChildWindowCount(); diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index 1dfc1f319c80..061b4181280d 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -115,12 +115,12 @@ css::uno::Reference< css::accessibility::XAccessible > Window::CreateAccessible( return new VCLXAccessibleComponent(this); } -void Window::SetAccessible( const css::uno::Reference< css::accessibility::XAccessible >& x ) +void Window::SetAccessible(const rtl::Reference<comphelper::OAccessible>& rpAccessible) { if (!mpWindowImpl) return; - mpWindowImpl->mxAccessible = x; + mpWindowImpl->mxAccessible = rpAccessible; } // skip all border windows that are not top level frames
