diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-06-23 22:17:49 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-06-23 22:39:52 +0200 |
| commit | e7d8cb3ec22906d5d45ba65e0a0cfccd68d202e8 (patch) | |
| tree | 2c5005c558047c7cddf7bdaa1abff802c0790c62 /sw/source | |
| parent | 9084c11fb472f2024e609770ce922c911227e7a8 (diff) | |
sw: fix STL asserts in lcl_MoveAllLowerObjs *again*
Comment added in cf91483690291272f48ff95c1aebd165da8ae4f0 evidently
insufficient.
(regression from b415494bf0468b74318b61f114e2ff4ae68c00ee)
Change-Id: I9a017aefc3a77b0760fcdc3b8e43ff7c6ac516ac
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/layout/pagechg.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index c722da9b6e8c..7ea397522d83 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -1763,8 +1763,10 @@ static void lcl_MoveAllLowerObjs( SwFrame* pFrame, const Point& rOffset ) // note: pSortedObj elements may be removed and inserted from // MoveObjectIfActive(), invalidating iterators - for (SwAnchoredObject* pAnchoredObj : *pSortedObj) + // DO NOT CONVERT THIS TO A C++11 FOR LOOP, IT DID NOT WORK THE LAST 2 TIMES + for (size_t i = 0; i < pSortedObj->size(); ++i) { + SwAnchoredObject *const pAnchoredObj = (*pSortedObj)[i]; const SwFrameFormat& rObjFormat = pAnchoredObj->GetFrameFormat(); const SwFormatAnchor& rAnchor = rObjFormat.GetAnchor(); |