chart2/source/controller/accessibility/AccessibleChartView.cxx | 13 ++++------ chart2/source/controller/accessibility/AccessibleTextHelper.cxx | 11 ++++---- chart2/source/controller/inc/AccessibleChartView.hxx | 12 +-------- chart2/source/controller/inc/AccessibleTextHelper.hxx | 3 +- chart2/source/controller/inc/ChartController.hxx | 4 +-- chart2/source/controller/main/ChartController.cxx | 6 +--- 6 files changed, 20 insertions(+), 29 deletions(-)
New commits: commit 58dc1ed32a45820f6491d8a1909d5afc8fc48a8f Author: Michael Weghorn <[email protected]> AuthorDate: Mon May 26 16:36:42 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Jun 25 07:41:13 2025 +0200 chart2 a11y: Switch param to OAccessibleComponentHelper Change-Id: I8cc0b4bb6fc7464c4f8496af53fdaf72b9a00088 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185856 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index 6e7f6b7650af..cf337c5a8e90 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -52,12 +52,13 @@ AccessibleTextHelper::~AccessibleTextHelper() { } -void AccessibleTextHelper::initialize( const OUString& aCID, - const Reference< XAccessible >& xEventSource, - vcl::Window* pWindow) +void AccessibleTextHelper::initialize( + const OUString& aCID, + const rtl::Reference<comphelper::OAccessibleComponentHelper>& rEventSource, + vcl::Window* pWindow) { OSL_ENSURE( !aCID.isEmpty(), "Empty CID" ); - assert(xEventSource.is() && "Empty Event Source"); + assert(rEventSource.is() && "Empty Event Source"); if (aCID.isEmpty()) return; @@ -73,7 +74,7 @@ void AccessibleTextHelper::initialize( const OUString& aCID, if( pTextObj ) { m_oTextHelper.emplace(std::make_unique<SvxTextEditSource>(*pTextObj, nullptr, *m_pDrawViewWrapper, *pWindow->GetOutDev())); - m_oTextHelper->SetEventSource( xEventSource ); + m_oTextHelper->SetEventSource(rEventSource); } } } diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx index f1d241391e3f..e3b4b2510ae4 100644 --- a/chart2/source/controller/inc/AccessibleTextHelper.hxx +++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <comphelper/accessiblecomponenthelper.hxx> #include <comphelper/compbase.hxx> #include <svx/AccessibleTextHelper.hxx> #include <vcl/window.hxx> @@ -57,7 +58,7 @@ public: text currently. */ void initialize(const OUString& aCID, - const css::uno::Reference< css::accessibility::XAccessible >& xEventSource, + const rtl::Reference<comphelper::OAccessibleComponentHelper>& rEventSource, vcl::Window* pWindow); // ____ XAccessibleContext ____ commit 882bc9dda7aac4d69d35d41a5be683a23e26c5b6 Author: Michael Weghorn <[email protected]> AuthorDate: Mon May 26 15:18:13 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Jun 25 07:41:07 2025 +0200 chart2 a11y: Return concrete AccessibleChartView Change-Id: I18aefc3a40526243e55a29a25628a1310e34a5b4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185855 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index 7fc0f553850a..e86438675e8e 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -20,6 +20,7 @@ #include <LifeTime.hxx> #include <ReferenceSizeProvider.hxx> +#include "AccessibleChartView.hxx" #include "CommandDispatchContainer.hxx" #include "SelectionHelper.hxx" @@ -85,7 +86,6 @@ class DrawModelWrapper; class DrawViewWrapper; class ViewElementListProvider; class Diagram; -class AccessibleChartView; class AccessibleTextHelper; enum ChartDrawMode { CHARTDRAW_INSERT, CHARTDRAW_SELECT }; @@ -303,7 +303,7 @@ public: ::Point aAtLogicPosition, bool bIsBalloonHelp, OUString & rOutQuickHelpText, css::awt::Rectangle & rOutEqualRect ); - css::uno::Reference< css::accessibility::XAccessible > CreateAccessible(); + rtl::Reference<AccessibleChartView> CreateAccessible(); /** Creates a helper accessibility class that must be initialized via initialize(). For parameters see diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 23cd1e1a75fd..06f359f9e3cc 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1640,16 +1640,14 @@ void ChartController::SetAndApplySelection(const Reference<drawing::XShape>& rxS } } - - -uno::Reference< XAccessible > ChartController::CreateAccessible() +rtl::Reference<AccessibleChartView> ChartController::CreateAccessible() { #if !ENABLE_WASM_STRIP_ACCESSIBILITY rtl::Reference< AccessibleChartView > xResult = new AccessibleChartView( GetDrawViewWrapper() ); impl_initializeAccessible( *xResult ); return xResult; #else - return uno::Reference< XAccessible >(); + return {}; #endif } commit 604cea2b98f03fc0428af96b7f2d31aed354121c Author: Michael Weghorn <[email protected]> AuthorDate: Mon May 26 15:07:48 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Jun 25 07:41:00 2025 +0200 chart2 a11y: Drop impl::AccessibleChartView_Base typedef Change-Id: I38ef840bafa7d8302d8508bb0225df72f05a0f78 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185854 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index ce2c7701e6c5..7216c6bbc665 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -47,13 +47,12 @@ using osl::MutexGuard; namespace chart { -AccessibleChartView::AccessibleChartView(SdrView* pView ) : - impl::AccessibleChartView_Base( - AccessibleElementInfo(), // empty for now - true, // has children - true // always transparent - ), - m_pSdrView( pView ) +AccessibleChartView::AccessibleChartView(SdrView* pView) + : ImplInheritanceHelper(AccessibleElementInfo(), // empty for now + true, // has children + true // always transparent + ) + , m_pSdrView(pView) { AddState( AccessibleStateType::OPAQUE ); } diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index 1de67d0654e3..b81913d66509 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -38,16 +38,8 @@ namespace chart { class ChartView; -namespace impl -{ -typedef ::cppu::ImplInheritanceHelper< - ::chart::AccessibleBase, - css::view::XSelectionChangeListener > - AccessibleChartView_Base; -} - -class AccessibleChartView final : - public impl::AccessibleChartView_Base +class AccessibleChartView final + : public cppu::ImplInheritanceHelper<chart::AccessibleBase, css::view::XSelectionChangeListener> { public: AccessibleChartView( SdrView* pView );
