diff options
| author | Justin Luth <justin_luth@sil.org> | 2018-06-30 12:25:31 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-11 10:15:29 +0200 |
| commit | 33aa5fb4281ed91a0d1a2a83e759ac4e6157646b (patch) | |
| tree | 0d0834b06a28274505cdaaebdb22560a2bc9a9bc /sw | |
| parent | bd6270de826496b65d529297b2cec96120d975cf (diff) | |
tdf#86371 sw export: SvxInterLineSpaceRule::Off == single spacing
This affects doc/docx/rtf exporting.
Ultimately, this was due to the way the UI works. When you
select Single, it just turns spacing off, but doesn't reset
the proportional value. If instead of choosing single, you
change the proportional percent to 100, then you wouldn't
see this problem. I can see why this could be useful in the
UI (allowing them to remember the previous proportional
value) although it doesn't use it right now...
Because it is all based on sw internals, it would be
very difficult to create a unit test - not worth the effort.
Change-Id: Id17a42878f73266e19219bcd88e2decdaf3b72f2
Reviewed-on: https://gerrit.libreoffice.org/56749
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 59fe3d7d231e4acb0635ac899a0ab2dee6c59289)
Reviewed-on: https://gerrit.libreoffice.org/57080
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index b57dcf28d06f..b222af685980 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -4676,9 +4676,9 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing ) } else // Proportional { - nSpace = static_cast<short>( ( 240L * rSpacing.GetPropLineSpace() ) / 100L ); + if ( rSpacing.GetInterLineSpaceRule() != SvxInterLineSpaceRule::Off ) + nSpace = static_cast<short>( ( 240L * rSpacing.GetPropLineSpace() ) / 100L ); nMulti = 1; - break; } } break; |