reorg to silence coverity#1358586 Using invalid iterator

Change-Id: If93cead2f4caa203b2d1a3e9c787625e6386dc3e

1 files changed, 3 insertions, 4 deletions

diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 35c11e4cb294..5e5e6f3d8088 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -367,17 +367,17 @@ void ChildrenManagerImpl::RemoveNonVisibleChildren (
     }
 }
 
-
 void ChildrenManagerImpl::MergeAccessibilityInformation (
     ChildDescriptorListType& raNewChildList)
 {
-    ChildDescriptorListType::iterator aOldChildDescriptor;
+    ChildDescriptorListType::const_iterator aStartVisibleChildren = maVisibleChildren.begin();
     ChildDescriptorListType::const_iterator aEndVisibleChildren = maVisibleChildren.end();
 
     ChildDescriptorListType::const_iterator aEnd = raNewChildList.end();
     for (ChildDescriptorListType::iterator I=raNewChildList.begin(); I != aEnd; ++I)
     {
-        aOldChildDescriptor = ::std::find (maVisibleChildren.begin(), maVisibleChildren.end(), *I);
+        ChildDescriptorListType::const_iterator aOldChildDescriptor =
+            std::find(aStartVisibleChildren, aEndVisibleChildren, *I);
 
         // Copy accessible shape if that exists in the old descriptor.
         bool bRegistrationIsNecessary = true;
@@ -393,7 +393,6 @@ void ChildrenManagerImpl::MergeAccessibilityInformation (
     }
 }
 
-
 void ChildrenManagerImpl::SendVisibleAreaEvents (
     ChildDescriptorListType& raNewChildList)
 {