diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-27 12:28:11 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-28 14:29:47 +0000 |
| commit | f834632d11bfa55654b40f9cf6fc146ee2cd70e4 (patch) | |
| tree | 611f90a23a9d0d3bd62e54782619a303148a698c /sw | |
| parent | 220c8e27b6d7d24e9dd9f07492da2ccd809e7f0e (diff) | |
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@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index ff9dc0229d6a..4d6c784808e9 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(); |