diff options
| author | Muhammet Kara <muhammet.kara@collabora.com> | 2019-11-09 00:14:11 +0300 |
|---|---|---|
| committer | Muhammet Kara <muhammet.kara@collabora.com> | 2019-11-09 17:21:09 +0100 |
| commit | 947e9ffba8e5a8b18b46efcf06de998cea6edaa6 (patch) | |
| tree | 4990c8a81ecfdd1cdec635bba7650b6bd00e3c68 /sd | |
| parent | partial revert tdf#116071 import to XATTR_FILL not RES_BACKGROUND (diff) | |
| download | core-947e9ffba8e5a8b18b46efcf06de998cea6edaa6.tar.gz core-947e9ffba8e5a8b18b46efcf06de998cea6edaa6.zip | |
Fix tdf#124708: CRASH: Selecting all and deleting
Change-Id: I0de912dad97f266a56ab52a351b0676f17675ed5
Reviewed-on: https://gerrit.libreoffice.org/82332
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
(cherry picked from commit 8023a613e978be42758c88d23f1973f7b9661676)
Reviewed-on: https://gerrit.libreoffice.org/82354
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/CustomAnimationCloner.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx index 281ad7f7affe..154e8ab6ecac 100644 --- a/sd/source/core/CustomAnimationCloner.cxx +++ b/sd/source/core/CustomAnimationCloner.cxx @@ -294,9 +294,13 @@ namespace sd Reference< XAnimationNode > CustomAnimationClonerImpl::getClonedNode( const Reference< XAnimationNode >& xSource ) const { - sal_Int32 nNode, nNodeCount = maSourceNodeVector.size(); + std::size_t nNodeCount = maSourceNodeVector.size(); + std::size_t nCloneNodeCount = maCloneNodeVector.size(); - for( nNode = 0; nNode < nNodeCount; nNode++ ) + if (nNodeCount != nCloneNodeCount) + SAL_WARN("sd.core", "Sizes of maSourceNodeVector and maCloneNodeVector mismatch!"); + + for( std::size_t nNode = 0; nNode < nNodeCount && nNode < nCloneNodeCount; ++nNode ) { if( maSourceNodeVector[nNode] == xSource ) return maCloneNodeVector[nNode]; |