[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source

[Justin Luth]

 sw/source/core/edit/autofmt.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 30d7ff170ee9609e5f80fd27f96aa7ea41ffa6c5
Author: Justin Luth <justin_luth at sil.org>
Date:   Fri Jan 13 20:58:02 2017 +0300

    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 at libreoffice.org>
    Reviewed-by: Justin Luth <justin_luth at 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 at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 816e081..abed2bc 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 );