Skip to content

C
core
Kaydet (Commit) 5d301a50 authored tarafından Cédric Bosdonnat's avatar Cédric Bosdonnat
Dosyalara gözat
Seçenekler

sw-ww8-field-fix.diff: WW8 fields import fix 

i#61075, i#89667, i#111684
üst 575fc481
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
sw/source/filter/ww8/ww8par5.cxx
Dosyayı görüntüle @ 5d301a50
......@@ -985,9 +985,12 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
pStrm->Seek( nOldPos );
//#124725# field codes which contain '/' or '.' are not displayed in WinWord
if (!aStr.EqualsAscii(" ADDIN", 0, 6) &&
(aStr.Search('.') != STRING_NOTFOUND ||
aStr.Search('/') != STRING_NOTFOUND))
xub_StrLen nSpacePos = aStr.Search( ' ', 1 );
if ( STRING_NOTFOUND == nSpacePos )
nSpacePos = aStr.Len( );
xub_StrLen nSearchPos = STRING_NOTFOUND;
if ( ( ( nSearchPos = aStr.Search('.') ) != STRING_NOTFOUND && nSearchPos < nSpacePos ) ||
( ( nSearchPos = aStr.Search('/') ) != STRING_NOTFOUND && nSearchPos < nSpacePos ) )
return aF.nLen;
else
return aF.nLen - aF.nLRes - 1; // so viele ueberlesen, das Resultfeld
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment