summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2017-01-13 20:58:02 +0300
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-01-17 08:34:25 +0000
commit30d7ff170ee9609e5f80fd27f96aa7ea41ffa6c5 (patch)
tree72af7e70f54c7fb0307b89feff4e7971f9716d8e
parent98fd1628178a9c6ac119a72c5f43257c129ba72b (diff)
tdf#105294 - only add spacing for the border being set
related to tdf#41542 which now allows the space-to-contents value even if the border is not visible. For years, LO has been resetting the spacing to zero when a line is disabled. Setting all border distances here was a mistake that was never caught before, and the documents created because of this oversight will likely cause some grief to bug 41542. Reviewed-on: https://gerrit.libreoffice.org/33055 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 9e7526044c8fa6b006b0cb791d15f2476c96ebf2) Reviewed-on: https://gerrit.libreoffice.org/33062 Conflicts: sw/source/core/edit/autofmt.cxx Change-Id: Id2708cf20600e29e97dc6c8d8b779894ad9c38d1 Reviewed-on: https://gerrit.libreoffice.org/33063 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--sw/source/core/edit/autofmt.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 816e08172d12..abed2bc462ca 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -584,7 +584,7 @@ bool SwAutoFormat::DoUnderline()
aSet.Put( SwParaConnectBorderItem( false ) );
SvxBoxItem aBox( RES_BOX );
aBox.SetLine( &aLine, SvxBoxItemLine::BOTTOM );
- aBox.SetDistance( 42 ); // ~0,75 mm
+ aBox.SetDistance(42, SvxBoxItemLine::BOTTOM ); // ~0,75 mm
aSet.Put(aBox);
m_pDoc->getIDocumentContentOperations().InsertItemSet( m_aDelPam, aSet );