ooo-build r15284 - in branches/opensuse-11-1: . patches/dev300

[freuter svn gnome org]

Author: freuter
Date: Wed Feb  4 14:57:04 2009
New Revision: 15284
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15284&view=rev

Log:
n#472351#; fixed field export problem when more than one field is in a paragraph.

Modified:
   branches/opensuse-11-1/ChangeLog
   branches/opensuse-11-1/patches/dev300/sw-field-patch.diff

Modified: branches/opensuse-11-1/patches/dev300/sw-field-patch.diff
==============================================================================
--- branches/opensuse-11-1/patches/dev300/sw-field-patch.diff	(original)
+++ branches/opensuse-11-1/patches/dev300/sw-field-patch.diff	Wed Feb  4 14:57:04 2009
@@ -1851,14 +1851,14 @@
      xub_StrLen nMinPos = STRING_MAXLEN;
      xub_StrLen i=0;
  
-+	const String aTxt = rNd.GetTxt();
-+	xub_StrLen pos=aTxt.Search(CH_TXT_ATR_FIELDSTART, nStartPos);
-+	if (pos==STRING_NOTFOUND) 
-+		pos=aTxt.Search(CH_TXT_ATR_FIELDEND, nStartPos);
-+	if (pos==STRING_NOTFOUND) 
-+		pos=aTxt.Search(CH_TXT_ATR_FORMELEMENT, nStartPos);
-+	if (pos!=STRING_NOTFOUND)  
-+		nMinPos=pos;
++	xub_StrLen posStart = aTxt.Search(CH_TXT_ATR_FIELDSTART, nStartPos);
++	xub_StrLen posEnd=aTxt.Search(CH_TXT_ATR_FIELDEND, nStartPos);
++	xub_StrLen posForm=aTxt.Search(CH_TXT_ATR_FORMELEMENT, nStartPos);
++
++	if (posStart!=STRING_NOTFOUND) nMinPos=std::min(nMinPos, posStart);
++	if (posEnd!=STRING_NOTFOUND) nMinPos=std::min(nMinPos, posEnd);
++	if (posForm!=STRING_NOTFOUND) nMinPos=std::min(nMinPos, posForm);
++	
 +
      // first the redline, then the attributes
      if( pCurRedline )