View | Details | Raw Unified | Return to issue 3232
Collapse All | Expand All

(-)porfld.cxx (-16 / +10 lines)
Lines 347-368 Link Here
347
		SwFldSlot aDiffTxt( &rInf, this );
347
		SwFldSlot aDiffTxt( &rInf, this );
348
		const xub_StrLen nOldFullLen = rInf.GetLen();
348
		const xub_StrLen nOldFullLen = rInf.GetLen();
349
		const MSHORT nFollow = IsFollow() ? 0 : 1;
349
		const MSHORT nFollow = IsFollow() ? 0 : 1;
350
		xub_StrLen nFullLen;
350
351
		// In Numerierungen kennen wir keine Platzhalter, sondern
351
		xub_StrLen nFullLen = rInf.ScanPortionEnd( rInf.GetIdx(),
352
		// nur "normale" Zeichen.
352
                rInf.GetIdx() + nOldFullLen, IsFollow() ) - rInf.GetIdx();
353
		if( InNumberGrp() )
353
        if( nFullLen && CH_BREAK == aExpand.GetChar( nFullLen - 1 ) )
354
			nFullLen = nOldFullLen;
354
            --nFullLen;
355
		else
355
356
		{
356
        if ( STRING_LEN != rInf.GetUnderScorePos() &&
357
			nFullLen = rInf.ScanPortionEnd( rInf.GetIdx(),
357
             rInf.GetUnderScorePos() > rInf.GetIdx() )
358
					rInf.GetIdx() + nOldFullLen, IsFollow() ) - rInf.GetIdx();
358
            rInf.SetUnderScorePos( rInf.GetIdx() );
359
			if( nFullLen && CH_BREAK == aExpand.GetChar( nFullLen - 1 ) )
359
360
				--nFullLen;
361
362
            if ( STRING_LEN != rInf.GetUnderScorePos() &&
363
                 rInf.GetUnderScorePos() > rInf.GetIdx() )
364
                rInf.SetUnderScorePos( rInf.GetIdx() );
365
		}
366
		BYTE nScriptChg = ScriptChange( rInf, nFullLen );
360
		BYTE nScriptChg = ScriptChange( rInf, nFullLen );
367
		rInf.SetLen( nFullLen );
361
		rInf.SetLen( nFullLen );
368
		if( pFnt )
362
		if( pFnt )

Return to issue 3232