ooo-build r14199 - in trunk: . patches/dev300

[strba svn gnome org]

Author: strba
Date: Fri Oct  3 14:00:48 2008
New Revision: 14199
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14199&view=rev

Log:
IMHO, a better fix

Modified:
   trunk/ChangeLog
   trunk/patches/dev300/sw-filter-import-TOX.diff

Modified: trunk/patches/dev300/sw-filter-import-TOX.diff
==============================================================================
--- trunk/patches/dev300/sw-filter-import-TOX.diff	(original)
+++ trunk/patches/dev300/sw-filter-import-TOX.diff	Fri Oct  3 14:00:48 2008
@@ -75,7 +75,7 @@
  	for( nCnt = 0; nCnt < aSortArr.Count(); ++nCnt )
  	{
  		::SetProgressState( 0, pDoc->GetDocShell() );
-@@ -1040,7 +1060,18 @@
+@@ -1040,7 +1060,20 @@
  		}
  
  		// Generierung: dynamische TabStops setzen
@@ -85,9 +85,11 @@
 +		SwNodeIndex aInx( aInsPos, nCnt );
 +		if ( pDoc->IsUpdatePgNumOfTOX() )
 +		{
-+                        pTOXNd = (SwTxtNode*)aInx.GetNode().GetCntntNode();
-+			if ( !pTOXNd || !pTOXNd->GetTxt().Len() )
-+           	break;
++           pTOXNd = (SwTxtNode*)aInx.GetNode().GetCntntNode();
++			if ( !pTOXNd )
++               break;
++			if ( !pTOXNd->GetTxt().Len() )
++               continue;
 +		}
 +		else
 +			pTOXNd = pDoc->GetNodes().MakeTxtNode( aInsPos , pColl );