diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-05-16 12:32:57 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-05-16 16:17:03 +0200 |
| commit | 8fb0dbd50c32a2ac2b60730daa362a65589e194f (patch) | |
| tree | 6640198f26f0e3f03b2ed9955ab5e652d1f9a598 /sw/source/core/text/portxt.cxx | |
| parent | daacd89b7513e533e1890526eabdf10c01576596 (diff) | |
sw layout, TabOverMargin: fix nbsp character going to a new line
This is similar to what was fixed in commit
9ecc9e39112fdd2b55004a0c43eb8c3ceee2e540 (Related: tdf#120287 sw layout,
TabOverMargin: fix too wide tab portion, 2018-10-05), but here the
problem was that we decided to start a new line when there was still
enough space in the compat option case.
Change-Id: I61900044a175cd14b3cdc5d36d2fa50d45c304e3
Reviewed-on: https://gerrit.libreoffice.org/72405
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw/source/core/text/portxt.cxx')
| -rw-r--r-- | sw/source/core/text/portxt.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index fdf8925fb31f..f9e364c3ea74 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -441,7 +441,8 @@ bool SwTextPortion::Format_( SwTextFormatInfo &rInf ) bool SwTextPortion::Format( SwTextFormatInfo &rInf ) { - if( rInf.X() > rInf.Width() || (!GetLen() && !InExpGrp()) ) + // GetLineWidth() takes care of DocumentSettingId::TAB_OVER_MARGIN. + if( rInf.GetLineWidth() < 0 || (!GetLen() && !InExpGrp()) ) { Height( 0 ); Width( 0 ); |