[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - svx/source

[Caolán McNamara (via logerrit)]

 svx/source/accessibility/ChildrenManagerImpl.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 6a842d1c079ff88e5616d05ec151b647acc25b6e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 22 14:37:41 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Sep 23 11:14:21 2020 +0200

    tdf#121323 avoid fatal exception with a11y enabled
    
    not related to the problem described there, but worth avoiding
    
    Change-Id: I5a33425d856d1a2d31a4e735b9936a89576121b3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103176
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index b24f70688b6f..dbfeb7ce46aa 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -294,7 +294,7 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes (
     }
 
     // Add the visible shapes for which only the XShapes exist.
-    if (mxShapeList.is())
+    if (mxShapeList.is() && mxShapeList->hasElements())
     {
         sal_Int32 nShapeCount = mxShapeList->getCount();
         raDescriptorList.reserve( nShapeCount );
@@ -321,7 +321,6 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes (
     }
 }
 
-
 void ChildrenManagerImpl::RemoveNonVisibleChildren (
     const ChildDescriptorListType& rNewChildList,
     ChildDescriptorListType& rOldChildList)