incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mba...@apache.org
Subject svn commit: r1172379 - in /incubator/ooo/trunk/main/sw: inc/calbck.hxx source/core/attr/calbck.cxx source/core/docnode/section.cxx source/core/docnode/swbaslnk.cxx source/core/edit/edfld.cxx source/core/fields/ddefld.cxx source/core/layout/atrfrm.cxx
Date Sun, 18 Sep 2011 21:53:02 GMT
Author: mbauer
Date: Sun Sep 18 21:53:01 2011
New Revision: 1172379

URL: http://svn.apache.org/viewvc?rev=1172379&view=rev
Log:
cws mba34issues01: #i117985#: fix broken iteration; fix broken semantics in SwClientIter

Modified:
    incubator/ooo/trunk/main/sw/inc/calbck.hxx
    incubator/ooo/trunk/main/sw/source/core/attr/calbck.cxx
    incubator/ooo/trunk/main/sw/source/core/docnode/section.cxx
    incubator/ooo/trunk/main/sw/source/core/docnode/swbaslnk.cxx
    incubator/ooo/trunk/main/sw/source/core/edit/edfld.cxx
    incubator/ooo/trunk/main/sw/source/core/fields/ddefld.cxx
    incubator/ooo/trunk/main/sw/source/core/layout/atrfrm.cxx

Modified: incubator/ooo/trunk/main/sw/inc/calbck.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/inc/calbck.hxx?rev=1172379&r1=1172378&r2=1172379&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/inc/calbck.hxx (original)
+++ incubator/ooo/trunk/main/sw/inc/calbck.hxx Sun Sep 18 21:53:01 2011
@@ -236,7 +236,7 @@ public:
 
 	const SwModify& GetModify() const { return rRoot; }
 
-	SwClient* operator++(int);
+	SwClient* operator++();
 	SwClient* GoStart();
 	SwClient* GoEnd();
 

Modified: incubator/ooo/trunk/main/sw/source/core/attr/calbck.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/core/attr/calbck.cxx?rev=1172379&r1=1172378&r2=1172379&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/core/attr/calbck.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/core/attr/calbck.cxx Sun Sep 18 21:53:01 2011
@@ -142,7 +142,7 @@ SwModify::~SwModify()
 			while ( p )
             {
 				p->pRegisteredIn = 0;
-                p = aIter++;
+                p = ++aIter;
             }
 		}
 		else
@@ -219,7 +219,7 @@ sal_Bool SwModify::GetInfo( SfxPoolItem&
 		SwClient* pLast = aIter.GoStart();
 		if( pLast )
 			while( 0 != ( bRet = pLast->GetInfo( rInfo )) &&
-					0 != ( pLast = aIter++ ) )
+					0 != ( pLast = ++aIter ) )
 				;
 	}
 
@@ -322,7 +322,7 @@ int SwModify::GetClientCount() const
         do
         {
             ++nRet;
-        } while( 0 != ( pLast = aIter++ ));
+        } while( 0 != ( pLast = ++aIter ));
     return nRet;
 }
 
@@ -363,7 +363,7 @@ void SwModify::CallSwClientNotify( const
     while (pClient)
     {
         pClient->SwClientNotify( *this, rHint );
-        pClient = aIter++;
+        pClient = ++aIter;
     }
 }
 
@@ -456,7 +456,7 @@ SwClientIter::~SwClientIter()
 }
 
 
-SwClient* SwClientIter::operator++(int)
+SwClient* SwClientIter::operator++()
 {
 	if( pDelNext == pAct )
 	{

Modified: incubator/ooo/trunk/main/sw/source/core/docnode/section.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/core/docnode/section.cxx?rev=1172379&r1=1172378&r2=1172379&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/core/docnode/section.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/core/docnode/section.cxx Sun Sep 18 21:53:01 2011
@@ -1107,7 +1107,7 @@ void SwSectionFmt::UpdateParent()		// Pa
                     bIsHidden = pSection->IsHidden();
 				}
 			}
-		} while( 0 != ( pLast = aIter++ ));
+		} while( 0 != ( pLast = ++aIter ));
 }
 
 

Modified: incubator/ooo/trunk/main/sw/source/core/docnode/swbaslnk.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/core/docnode/swbaslnk.cxx?rev=1172379&r1=1172378&r2=1172379&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/core/docnode/swbaslnk.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/core/docnode/swbaslnk.cxx Sun Sep 18 21:53:01 2011
@@ -89,7 +89,7 @@ void lcl_CallModify( SwGrfNode& rGrfNd, 
 			do {
 				if( (0 == n) ^ ( 0 != pLast->ISA( SwCntntFrm )) )
 					pLast->ModifyNotification( &rItem, &rItem );
-			} while( 0 != ( pLast = aIter++ ));
+			} while( 0 != ( pLast = ++aIter ));
 		}
 	}
 	rGrfNd.UnlockModify();

Modified: incubator/ooo/trunk/main/sw/source/core/edit/edfld.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/core/edit/edfld.cxx?rev=1172379&r1=1172378&r2=1172379&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/core/edit/edfld.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/core/edit/edfld.cxx Sun Sep 18 21:53:01 2011
@@ -203,7 +203,7 @@ void SwEditShell::FieldToText( SwFieldTy
 
     SwFieldHint aHint( pPaM );
 	SwClientIter aIter( *pType );
-    for ( SwClient* pClient = aIter.GoStart(); pClient; aIter++ )
+    for ( SwClient* pClient = aIter.GoStart(); pClient; pClient = ++aIter )
     {
         pPaM->DeleteMark();
         pClient->SwClientNotifyCall( *pType, aHint );

Modified: incubator/ooo/trunk/main/sw/source/core/fields/ddefld.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/core/fields/ddefld.cxx?rev=1172379&r1=1172378&r2=1172379&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/core/fields/ddefld.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/core/fields/ddefld.cxx Sun Sep 18 21:53:01 2011
@@ -140,7 +140,7 @@ void SwIntrnlRefLink::DataChanged( const
 					pLast->ModifyNotification( 0, &aUpdateDDE );
 					bCallModify = sal_True;
 				}
-			} while( 0 != ( pLast = aIter++ ));
+			} while( 0 != ( pLast = ++aIter ));
 
 		rFldType.UnlockModify();
 
@@ -201,7 +201,7 @@ const SwNode* SwIntrnlRefLink::GetAnchor
 			if( pNd && &rFldType.GetDoc()->GetNodes() == &pNd->GetNodes() )
 				break;
 			pNd = 0;
-		} while( 0 != ( pLast = aIter++ ));
+		} while( 0 != ( pLast = ++aIter ));
 
 	return pNd;
 }
@@ -240,7 +240,7 @@ sal_Bool SwIntrnlRefLink::IsInRange( sal
 						return sal_True;
 				}
 			}
-		} while( 0 != ( pLast = aIter++ ));
+		} while( 0 != ( pLast = ++aIter ));
 
 	return sal_False;
 }

Modified: incubator/ooo/trunk/main/sw/source/core/layout/atrfrm.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/core/layout/atrfrm.cxx?rev=1172379&r1=1172378&r2=1172379&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/core/layout/atrfrm.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/core/layout/atrfrm.cxx Sun Sep 18 21:53:01 2011
@@ -191,7 +191,7 @@ void DelHFFormat( SwClient *pToRemove, S
 			do {
                 bDel = pLast->IsA( TYPE(SwFrm) )
                     || SwXHeadFootText::IsXHeadFootText(pLast);
-			} while( bDel && 0 != ( pLast = aIter++ ));
+			} while( bDel && 0 != ( pLast = ++aIter ));
 	}
 
 	if ( bDel )



Mime
View raw message