editeng a11y: Simplify AccessibleParaManager::CreateChild

Both callers are only interested in the XAccessible
in the returned std::pair, so let the method only
return that instead of the pair.

Drop the now unused AccessibleParaManager::Child typedef.

Change-Id: I2b271de7b3e668be982b01bd183e0c39d47f444d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183670
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>

3 files changed, 11 insertions, 14 deletions

diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx
index a587b832771d..379ff46199ae 100644
--- a/editeng/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -153,10 +153,9 @@ bool AccessibleParaManager::HasCreatedChild( sal_Int32 nParagraphIndex ) const
         return false;
 }
 
-AccessibleParaManager::Child AccessibleParaManager::CreateChild( sal_Int32                              nChild,
-                                                                 const uno::Reference< XAccessible >&   xFrontEnd,
-                                                                 SvxEditSourceAdapter&                  rEditSource,
-                                                                 sal_Int32                              nParagraphIndex )
+css::uno::Reference<css::accessibility::XAccessible>
+AccessibleParaManager::CreateChild(sal_Int32 nChild, const uno::Reference<XAccessible>& xFrontEnd,
+                                   SvxEditSourceAdapter& rEditSource, sal_Int32 nParagraphIndex)
 {
     DBG_ASSERT( 0 <= nParagraphIndex && maChildren.size() > o3tl::make_unsigned(nParagraphIndex),
             "AccessibleParaManager::CreateChild: invalid index" );
@@ -177,11 +176,11 @@ AccessibleParaManager::Child AccessibleParaManager::CreateChild( sal_Int32
             maChildren[nParagraphIndex] = WeakChild(xChild, xChild->getBounds());
         }
 
-        return Child(xChild.get(), GetChild(nParagraphIndex).second);
+        return xChild;
     }
     else
     {
-        return Child();
+        return nullptr;
     }
 }
 
diff --git a/include/editeng/AccessibleParaManager.hxx b/include/editeng/AccessibleParaManager.hxx
index 91b73b8097be..b6df448c9a36 100644
--- a/include/editeng/AccessibleParaManager.hxx
+++ b/include/editeng/AccessibleParaManager.hxx
@@ -92,8 +92,6 @@ class UNLESS_MERGELIBS(EDITENG_DLLPUBLIC) AccessibleParaManager
 public:
     typedef WeakCppRef < css::accessibility::XAccessible, AccessibleEditableTextPara > WeakPara;
     typedef ::std::pair< WeakPara, css::awt::Rectangle > WeakChild;
-    typedef ::std::pair< css::uno::Reference<
-        css::accessibility::XAccessible > , css::awt::Rectangle > Child;
     typedef ::std::vector< WeakChild > VectorOfChildren;
 
     AccessibleParaManager();
@@ -131,10 +129,10 @@ public:
     static bool IsReferencable(rtl::Reference<AccessibleEditableTextPara> const & aChild);
     bool IsReferencable( sal_Int32 nChild ) const;
 
-    Child CreateChild( sal_Int32                                                                                        nChild,
-                       const css::uno::Reference< css::accessibility::XAccessible >& xFrontEnd,
-                       SvxEditSourceAdapter&                                                                            rEditSource,
-                       sal_Int32                                                                                       nParagraphIndex );
+    css::uno::Reference<css::accessibility::XAccessible>
+    CreateChild(sal_Int32 nChild,
+                const css::uno::Reference<css::accessibility::XAccessible>& xFrontEnd,
+                SvxEditSourceAdapter& rEditSource, sal_Int32 nParagraphIndex);
 
     WeakChild GetChild( sal_Int32 nParagraphIndex ) const;
     bool HasCreatedChild( sal_Int32 nParagraphIndex ) const;
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index c37845cff514..43993b383d09 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -770,7 +770,7 @@ namespace accessibility
                     if (!maParaManager.HasCreatedChild(nCurrPara))
                     {
                         FireEvent(AccessibleEventId::CHILD, uno::Any(maParaManager.CreateChild(nCurrPara - mnFirstVisibleChild,
-                                                                                               mxFrontEnd, GetEditSource(), nCurrPara).first));
+                                                                                               mxFrontEnd, GetEditSource(), nCurrPara)));
                     }
                 }
             }
@@ -1444,7 +1444,7 @@ namespace accessibility
         DBG_ASSERT(mxFrontEnd.is(), "AccessibleTextHelper_Impl::UpdateVisibleChildren: no frontend set");
 
         if( mxFrontEnd.is() )
-            return maParaManager.CreateChild( i, mxFrontEnd, GetEditSource(), mnFirstVisibleChild + i ).first;
+            return maParaManager.CreateChild(i, mxFrontEnd, GetEditSource(), mnFirstVisibleChild + i);
         else
             return nullptr;
     }