diff options
Diffstat (limited to 'sw/source/filter/html/htmlatr.cxx')
| -rw-r--r-- | sw/source/filter/html/htmlatr.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 4c5f335597a0..0ea735ace5db 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -2225,8 +2225,10 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) rHTMLWrt.OutBookmarks(); // now it's a good opportunity again for an LF - if it is still allowed + // FIXME: for LOK case we set rHTMLWrt.m_nWishLineLen as -1, for now keep old flow + // when LOK side will be fixed - don't insert new line at the beginning if( rHTMLWrt.m_bLFPossible && - rHTMLWrt.GetLineLen() >= rHTMLWrt.m_nWishLineLen ) + rHTMLWrt.GetLineLen() >= (rHTMLWrt.m_nWishLineLen >= 0 ? rHTMLWrt.m_nWishLineLen : 70 ) ) { rHTMLWrt.OutNewLine(); } @@ -2463,8 +2465,9 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) nWordLen = nEnd; nWordLen -= nStrPos; - if( nLineLen >= rHTMLWrt.m_nWishLineLen || - (nLineLen+nWordLen) >= rHTMLWrt.m_nWishLineLen ) + if( rHTMLWrt.m_nWishLineLen >= 0 && + (nLineLen >= rHTMLWrt.m_nWishLineLen || + (nLineLen+nWordLen) >= rHTMLWrt.m_nWishLineLen ) ) { HTMLOutFuncs::FlushToAscii( rWrt.Strm(), aContext ); rHTMLWrt.OutNewLine(); |