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

[Caolán McNamara]

 sw/source/core/layout/paintfrm.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f834632d11bfa55654b40f9cf6fc146ee2cd70e4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 27 12:28:11 2016 +0100

    Resolves: tdf#63662 'Manual Column Break' always visible...
    
    even when non-printing chars is off.
    
    I think this began as an intermediate step for both page and
    column breaks to the header/footer overlay we now have for
    page breaks. Leaving this just for column breaks. It may
    have been set to always on with page-breaks in mind.
    
    Change-Id: I1617683e2bb8c1f9229e9c2313e7817e184fa5ea
    (cherry picked from commit 9e63e60d6f00ee690fafb9f21f2cafb08a6ad92e)
    Reviewed-on: https://gerrit.libreoffice.org/27579
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index ff9dc02..4d6c784 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3821,7 +3821,8 @@ void SwColumnFrame::PaintBreak( ) const
                 //    * Non-printing characters are shown, as this is more consistent
                 //      with other formatting marks
                 if ( !gProp.pSGlobalShell->IsShowHeaderFooterSeparator( Header ) &&
-                     !gProp.pSGlobalShell->IsShowHeaderFooterSeparator( Footer ) )
+                     !gProp.pSGlobalShell->IsShowHeaderFooterSeparator( Footer ) &&
+                      gProp.pSGlobalShell->GetViewOptions()->IsLineBreak() )
                 {
                     SwRect aRect( pCnt->Prt() );
                     aRect.Pos() += pCnt->Frame().Pos();