sw/source/core/access/acccontext.cxx         |    3 +--
 sw/source/core/access/accframe.cxx           |    7 ++++---
 sw/source/core/access/accframe.hxx           |    3 +--
 sw/source/core/access/accselectionhelper.cxx |   10 +++-------
 4 files changed, 9 insertions(+), 14 deletions(-)

New commits:
commit e7aa46efdfb67f448d3687131b375ac27a016ea0
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu May 1 16:43:09 2025 +0200
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu May 1 23:10:27 2025 +0200

    sw a11y: Return list instead of using out param
    
    Change-Id: I1fcafa73466fc3da6c0bbfdd605f27c09cf13f17
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184870
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
    Tested-by: Jenkins

diff --git a/sw/source/core/access/acccontext.cxx 
b/sw/source/core/access/acccontext.cxx
index 9e85b88652dd..66a9bbd07124 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -595,8 +595,7 @@ css::uno::Sequence<uno::Reference<XAccessible>> SAL_CALL
 
     ThrowIfDisposed();
 
-    std::list< sw::access::SwAccessibleChild > aChildren;
-    GetChildren( *GetMap(), aChildren );
+    std::list<sw::access::SwAccessibleChild> aChildren = 
GetChildren(*GetMap());
 
     std::vector<uno::Reference<XAccessible>> aRet;
     aRet.reserve(aChildren.size());
diff --git a/sw/source/core/access/accframe.cxx 
b/sw/source/core/access/accframe.cxx
index cce478f09512..83cd21cf6add 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -458,10 +458,11 @@ sw::access::SwAccessibleChild 
SwAccessibleFrame::GetChildAtPixel(
     return GetChildAtPixel( maVisArea, *mpFrame, rPos, IsInPagePreview(), 
rAccMap );
 }
 
-void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap,
-                                     std::list< sw::access::SwAccessibleChild 
>& rChildren ) const
+std::list<SwAccessibleChild> SwAccessibleFrame::GetChildren(SwAccessibleMap& 
rAccMap) const
 {
-    GetChildren( rAccMap, maVisArea, *mpFrame, rChildren, IsInPagePreview() );
+    std::list<SwAccessibleChild> aChildren;
+    GetChildren(rAccMap, maVisArea, *mpFrame, aChildren, IsInPagePreview());
+    return aChildren;
 }
 
 bool SwAccessibleFrame::IsShowing( const SwAccessibleMap& rAccMap,
diff --git a/sw/source/core/access/accframe.hxx 
b/sw/source/core/access/accframe.hxx
index 4ab53cd7136a..5ccb31675d38 100644
--- a/sw/source/core/access/accframe.hxx
+++ b/sw/source/core/access/accframe.hxx
@@ -124,8 +124,7 @@ protected:
                                             sal_Int32 nPos ) const;
     sw::access::SwAccessibleChild GetChildAtPixel( const Point& rPos,
                                                    SwAccessibleMap& rAccMap ) 
const;
-    void GetChildren( SwAccessibleMap& rAccMap,
-                      std::list< sw::access::SwAccessibleChild >& rChildren ) 
const;
+    std::list<sw::access::SwAccessibleChild> GetChildren(SwAccessibleMap& 
rAccMap) const;
 
     void SetVisArea( const SwRect& rNewVisArea )
     {
diff --git a/sw/source/core/access/accselectionhelper.cxx 
b/sw/source/core/access/accselectionhelper.cxx
index 7a83065126b1..fc760bd1ac7f 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -171,9 +171,7 @@ void 
SwAccessibleSelectionHelper::selectAllAccessibleChildren(  )
     if (!pFEShell)
         return;
 
-    std::list< SwAccessibleChild > aChildren;
-    m_rContext.GetChildren( *(m_rContext.GetMap()), aChildren );
-
+    std::list<SwAccessibleChild> aChildren = 
m_rContext.GetChildren(*(m_rContext.GetMap()));
     for( const SwAccessibleChild& rChild : aChildren )
     {
         const SdrObject* pObj = rChild.GetDrawObject();
@@ -202,8 +200,7 @@ sal_Int64 
SwAccessibleSelectionHelper::getSelectedAccessibleChildCount(  )
         return 1;
 
     sal_Int64 nCount = 0;
-    std::list<SwAccessibleChild> aChildren;
-    m_rContext.GetChildren(*(m_rContext.GetMap()), aChildren);
+    std::list<SwAccessibleChild> aChildren = 
m_rContext.GetChildren(*(m_rContext.GetMap()));
 
     const size_t nSelObjs = pFEShell->GetSelectedObjCount();
     if( nSelObjs > 0 )
@@ -272,8 +269,7 @@ Reference<XAccessible> 
SwAccessibleSelectionHelper::getSelectedAccessibleChild(
     }
     else
     {
-        std::list<SwAccessibleChild> aChildren;
-        m_rContext.GetChildren(*(m_rContext.GetMap()), aChildren);
+        std::list<SwAccessibleChild> aChildren = 
m_rContext.GetChildren(*(m_rContext.GetMap()));
 
         const size_t nSelObjs = pFEShell->GetSelectedObjCount();
         if (nSelObjs > 0)

Reply via email to