editeng/source/accessibility/AccessibleParaManager.cxx | 7 ++++--- include/editeng/AccessibleParaManager.hxx | 5 ++--- svx/source/accessibility/AccessibleTextHelper.cxx | 9 +++++---- 3 files changed, 11 insertions(+), 10 deletions(-)
New commits: commit 03c1d20c42d33a7c85ef335f41722945f276263d Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Thu Aug 14 18:21:55 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Fri Aug 15 06:47:02 2025 +0200 a11y: Return OAccessible in AccessibleParaManager::CreateChild Change-Id: Ic6cc6d6751637f32f3d192448184fe5c4aa0fb95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189622 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx index 4e3692393046..959261ceea36 100644 --- a/editeng/source/accessibility/AccessibleParaManager.cxx +++ b/editeng/source/accessibility/AccessibleParaManager.cxx @@ -153,7 +153,7 @@ bool AccessibleParaManager::HasCreatedChild( sal_Int32 nParagraphIndex ) const return false; } -css::uno::Reference<css::accessibility::XAccessible> +rtl::Reference<comphelper::OAccessible> AccessibleParaManager::CreateChild(sal_Int32 nChild, const rtl::Reference<comphelper::OAccessible>& pFrontEnd, SvxEditSourceAdapter& rEditSource, sal_Int32 nParagraphIndex) diff --git a/include/editeng/AccessibleParaManager.hxx b/include/editeng/AccessibleParaManager.hxx index 429564570c06..0587ba9923ef 100644 --- a/include/editeng/AccessibleParaManager.hxx +++ b/include/editeng/AccessibleParaManager.hxx @@ -86,7 +86,7 @@ public: static bool IsReferencable(rtl::Reference<AccessibleEditableTextPara> const & aChild); bool IsReferencable( sal_Int32 nChild ) const; - css::uno::Reference<css::accessibility::XAccessible> + rtl::Reference<comphelper::OAccessible> CreateChild(sal_Int32 nChild, const rtl::Reference<comphelper::OAccessible>& pFrontEnd, SvxEditSourceAdapter& rEditSource, sal_Int32 nParagraphIndex); diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 0a51e5a8b9c1..a29efbb76ece 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -765,10 +765,11 @@ void AccessibleTextHelper_Impl::UpdateVisibleChildren( bool bBroadcastEvents ) // child not yet created? if (!maParaManager.HasCreatedChild(nCurrPara)) { - FireEvent(AccessibleEventId::CHILD, - uno::Any(maParaManager.CreateChild(nCurrPara - mnFirstVisibleChild, - mpFrontEnd, GetEditSource(), - nCurrPara))); + FireEvent( + AccessibleEventId::CHILD, + uno::Any(css::uno::Reference<css::accessibility::XAccessible>( + maParaManager.CreateChild(nCurrPara - mnFirstVisibleChild, mpFrontEnd, + GetEditSource(), nCurrPara)))); } } } commit 76fafc4ecc006ab5b10a645a4714c74e782051aa Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Thu Aug 14 18:18:57 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Fri Aug 15 06:46:56 2025 +0200 editeng a11y: Switch AccessibleParaManager::CreateChild param to OAccessible Change-Id: Idab02c758a769a822291acd1692ce290b81c6d74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189621 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx index d78eda7230b3..4e3692393046 100644 --- a/editeng/source/accessibility/AccessibleParaManager.cxx +++ b/editeng/source/accessibility/AccessibleParaManager.cxx @@ -154,7 +154,8 @@ bool AccessibleParaManager::HasCreatedChild( sal_Int32 nParagraphIndex ) const } css::uno::Reference<css::accessibility::XAccessible> -AccessibleParaManager::CreateChild(sal_Int32 nChild, const uno::Reference<XAccessible>& xFrontEnd, +AccessibleParaManager::CreateChild(sal_Int32 nChild, + const rtl::Reference<comphelper::OAccessible>& pFrontEnd, SvxEditSourceAdapter& rEditSource, sal_Int32 nParagraphIndex) { DBG_ASSERT( 0 <= nParagraphIndex && maChildren.size() > o3tl::make_unsigned(nParagraphIndex), @@ -169,7 +170,7 @@ AccessibleParaManager::CreateChild(sal_Int32 nChild, const uno::Reference<XAcces { // there is no hard reference available, create object then // #i27138# - xChild = new AccessibleEditableTextPara(xFrontEnd, this); + xChild = new AccessibleEditableTextPara(pFrontEnd, this); InitChild(*xChild, rEditSource, nChild, nParagraphIndex); diff --git a/include/editeng/AccessibleParaManager.hxx b/include/editeng/AccessibleParaManager.hxx index f6ec8cb53300..429564570c06 100644 --- a/include/editeng/AccessibleParaManager.hxx +++ b/include/editeng/AccessibleParaManager.hxx @@ -87,8 +87,7 @@ public: bool IsReferencable( sal_Int32 nChild ) const; css::uno::Reference<css::accessibility::XAccessible> - CreateChild(sal_Int32 nChild, - const css::uno::Reference<css::accessibility::XAccessible>& xFrontEnd, + CreateChild(sal_Int32 nChild, const rtl::Reference<comphelper::OAccessible>& pFrontEnd, SvxEditSourceAdapter& rEditSource, sal_Int32 nParagraphIndex); WeakChild GetChild( sal_Int32 nParagraphIndex ) const;