From f36b39e6d068fcdbfc1c3b295a8aac79f89798fd Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Fri, 18 Sep 2009 14:11:07 +0000
Subject: CWS-TOOLING: integrate CWS sw32bf03 2009-09-11 16:05:24 +0200 od 
 r276069 : CWS-TOOLING: rebase CWS sw32bf03 to trunk@276043 (milestone:
 DEV300:m58) 2009-09-10 15:26:00 +0200 od  r276036 : #i104937# method
 <template<FlyCntType T> SwXFrameEnumeration<T>::SwXFrameEnumeration(..)> 
   - Correct iteration on <SwSpzFrmFmts> instance.

---
 sw/source/core/unocore/unocoll.cxx | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 7743ea61e43d..323b7302da1f 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -898,10 +898,20 @@ SwXFrameEnumeration<T>::SwXFrameEnumeration(const SwDoc* const pDoc)
     const SwSpzFrmFmts* const pFmts = pDoc->GetSpzFrmFmts();
     if(!pFmts->Count())
         return;
-    const SwFrmFmt* const pFmtsEnd = (*pFmts)[pFmts->Count()];
+    // --> OD 2009-09-10 #i104937#
+//    const SwFrmFmt* const pFmtsEnd = (*pFmts)[pFmts->Count()];
+    const USHORT nSize = pFmts->Count();
+    // <--
     ::std::insert_iterator<frmcontainer_t> pInserter = ::std::insert_iterator<frmcontainer_t>(m_aFrames, m_aFrames.begin());
-    for(SwFrmFmt* pFmt = (*pFmts)[0]; pFmt < pFmtsEnd; ++pFmt)
+    // --> OD 2009-09-10 #i104937#
+    SwFrmFmt* pFmt( 0 );
+    for( USHORT i = 0; i < nSize; ++i )
+//    for(SwFrmFmt* pFmt = (*pFmts)[0]; pFmt < pFmtsEnd; ++pFmt)
+    // <--
     {
+        // --> OD 2009-09-10 #i104937#
+        pFmt = (*pFmts)[i];
+        // <--
         if(pFmt->Which() != RES_FLYFRMFMT)
             continue;
         const SwNodeIndex* pIdx =  pFmt->GetCntnt().GetCntntIdx();
-- 
cgit