core.git: chart2/source

[Michael Weghorn (via logerrit)]

 chart2/source/controller/accessibility/AccessibleBase.cxx |    9 ++++-----
 chart2/source/controller/inc/AccessibleBase.hxx           |    5 +----
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 34bfb9f506fa661a19498176f20bf3dfb7d8ff6c
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri May 10 08:18:56 2024 +0200
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri May 10 16:23:27 2024 +0200

    chart2 a11y: Drop ChildListVectorType typedef
    
    Change-Id: Ie7ad5157bdcd261c8e5e6507b93b2820424c9125
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167432
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
    Tested-by: Jenkins

diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx 
b/chart2/source/controller/accessibility/AccessibleBase.cxx
index a823cf25c003..c297814bebcd 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -144,7 +144,7 @@ bool AccessibleBase::NotifyEvent( EventType eEventType, 
const AccessibleUniqueId
 
         ClearableMutexGuard aGuard( m_aMutex );
         // make local copy for notification
-        ChildListVectorType aLocalChildList( m_aChildList );
+        std::vector<Reference<XAccessible>> aLocalChildList(m_aChildList);
         aGuard.clear();
 
         for (auto const& localChild : aLocalChildList)
@@ -285,8 +285,7 @@ void AccessibleBase::RemoveChildByOId( const 
ObjectIdentifier& rOId )
     m_aChildOIDMap.erase( aIt );
 
     // search child in vector
-    ChildListVectorType::iterator aVecIter =
-        std::find( m_aChildList.begin(), m_aChildList.end(), xChild );
+    auto aVecIter = std::find(m_aChildList.begin(), m_aChildList.end(), 
xChild);
 
     OSL_ENSURE( aVecIter != m_aChildList.end(),
                 "Inconsistent ChildMap" );
@@ -361,7 +360,7 @@ void AccessibleBase::KillAllChildren()
     ClearableMutexGuard aGuard( m_aMutex );
 
     // make local copy for notification, and remove all children
-    ChildListVectorType aLocalChildList;
+    std::vector<Reference<XAccessible>> aLocalChildList;
     aLocalChildList.swap( m_aChildList );
     m_aChildOIDMap.clear();
 
@@ -586,7 +585,7 @@ Reference< XAccessible > SAL_CALL 
AccessibleBase::getAccessibleAtPoint( const aw
         ( aRect.Y <= aPoint.Y && aPoint.Y <= (aRect.Y + aRect.Height)))
     {
         ClearableMutexGuard aGuard( m_aMutex );
-        ChildListVectorType aLocalChildList( m_aChildList );
+        std::vector<Reference<XAccessible>> aLocalChildList( m_aChildList );
         aGuard.clear();
 
         Reference< XAccessibleComponent > aComp;
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx 
b/chart2/source/controller/inc/AccessibleBase.hxx
index b7ccbac900da..788de8cebcae 100644
--- a/chart2/source/controller/inc/AccessibleBase.hxx
+++ b/chart2/source/controller/inc/AccessibleBase.hxx
@@ -283,9 +283,6 @@ private:
     Color getColor( eColorType eColType );
 
 private:
-    /** type of the vector containing the accessible children
-     */
-    typedef std::vector< css::uno::Reference< css::accessibility::XAccessible 
> > ChildListVectorType;
     /** type of the hash containing a vector index for every AccessibleUniqueId
         of the object in the child list
      */
@@ -294,7 +291,7 @@ private:
     bool                                  m_bIsDisposed;
     const bool                            m_bMayHaveChildren;
     bool                                  m_bChildrenInitialized;
-    ChildListVectorType                   m_aChildList;
+    std::vector<css::uno::Reference<css::accessibility::XAccessible>> 
m_aChildList;
 
     ChildOIDMap                           m_aChildOIDMap;