diff options
| -rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 37229ccaae89..e746d6e88fee 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -1060,13 +1060,16 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes) pStrm->Seek( nOldPos ); // field codes which contain '/' or '.' are not displayed in WinWord + // skip if it is formula field or found space before. see #i119446, #i119585. + const xub_StrLen nDotPos = aStr.Search('.'); + const xub_StrLen nSlashPos = aStr.Search('/'); xub_StrLen nSpacePos = aStr.Search( ' ', 1 ); - if ( STRING_NOTFOUND == nSpacePos ) - nSpacePos = aStr.Len( ); - xub_StrLen nSearchPos = STRING_NOTFOUND; - if ( !( aStr.EqualsAscii( "=", 1, 1 ) ) && ( - ( ( nSearchPos = aStr.Search('.') ) != STRING_NOTFOUND && nSearchPos < nSpacePos ) || - ( ( nSearchPos = aStr.Search('/') ) != STRING_NOTFOUND && nSearchPos < nSpacePos ) ) ) + if ( nSpacePos == STRING_NOTFOUND ) + nSpacePos = aStr.Len(); + + if ( !( aStr.EqualsAscii( "=", 1, 1 ) ) && + ((( nDotPos != STRING_NOTFOUND ) && ( nDotPos < nSpacePos )) || + (( nSlashPos != STRING_NOTFOUND ) && ( nSlashPos < nSpacePos )))) return aF.nLen; else { |