sw/source/filter/ww8/ww8atr.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 59fe3d7d231e4acb0635ac899a0ab2dee6c59289 Author: Justin Luth <[email protected]> Date: Sat Jun 30 12:25:31 2018 +0300 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 <[email protected]> Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 003afcb5cf1c..2a847e21c09e 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; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
