include/vcl/window.hxx | 5 +---- sw/source/core/access/acccontext.cxx | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-)
New commits: commit cc720ac9dd7e49e04278e7813b6cc9ba0fbe4c50 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Jun 25 12:07:51 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Jun 26 13:11:07 2025 +0200 sw a11y: Use vcl::unohelper::ConvertToAWTRect Change-Id: I7ec2b48d7f5cf0482ade830caf50fd01fda64369 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186965 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 55a5d9159bb6..515ad49c14dc 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -27,6 +27,7 @@ #include <sal/log.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> +#include <vcl/unohelp.hxx> #include <i18nlangtag/languagetag.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <viewsh.hxx> @@ -880,10 +881,7 @@ awt::Rectangle SwAccessibleContext::getBoundsImpl(bool bRelative) } } - awt::Rectangle aBox( aPixBounds.Left(), aPixBounds.Top(), - aPixBounds.GetWidth(), aPixBounds.GetHeight() ); - - return aBox; + return vcl::unohelper::ConvertToAWTRect(aPixBounds); } awt::Rectangle SAL_CALL SwAccessibleContext::getBounds() commit b1e11853f456252835299775a7907f78b84f3dbf Author: Michael Weghorn <[email protected]> AuthorDate: Wed Jun 25 11:30:18 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Jun 26 13:10:59 2025 +0200 vcl a11y: Make vcl::Window::CreateAccessible protected It's not meant to be called from outside, but only from Window::GetAccessible or subclasses that override the Window::CreateAccessible base class implementation. Change-Id: Ifa7b6f389e2d05e6ca0a175107606afd4ae96f48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186964 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index c8f4491caa6a..e548c2aec4d6 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1121,10 +1121,6 @@ public: css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ); - - virtual css::uno::Reference< css::accessibility::XAccessible > - CreateAccessible(); - void SetAccessible( const css::uno::Reference< css::accessibility::XAccessible >& ); vcl::Window* GetAccessibleParentWindow() const; @@ -1159,6 +1155,7 @@ public: KeyEvent GetActivationKey() const; protected: + virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible(); // These eventually are supposed to go when everything is converted to .ui SAL_DLLPRIVATE vcl::Window* getLegacyNonLayoutAccessibleRelationMemberOf() const;
