summaryrefslogtreecommitdiff
path: root/sw/source/core/layout
diff options
context:
space:
mode:
authorAshod Nakashian <ashodnakashian@yahoo.com>2015-07-13 23:32:28 -0400
committerAndras Timar <andras.timar@collabora.com>2015-11-05 22:58:27 +0100
commitcdebfc0f5a230668d9630492118c06ceda339543 (patch)
treeaefcc7b13ca6947c0a9c3c8fad88c6cd3c8581ec /sw/source/core/layout
parent6064a8b601a4d3ee6e4bbe598d7ee50712d300e4 (diff)
tdf#39080 Added HideWhitespaceMode ViewOption flagcp-5.0-8
Change-Id: I94ac57881dc3a3628413b9198ea750fdc282accb Reviewed-on: https://gerrit.libreoffice.org/17278 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3e3c5369e87066a4bfdead5fc9dbfe128f84df52)
Diffstat (limited to 'sw/source/core/layout')
-rw-r--r--sw/source/core/layout/hffrm.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index 03f6ed44e91e..a5789fe0630a 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -679,7 +679,8 @@ void SwPageFrm::PrepareHeader()
const SwFormatHeader &rH = static_cast<SwFrameFormat*>(GetRegisteredIn())->GetHeader();
const SwViewShell *pSh = getRootFrm()->GetCurrShell();
- const bool bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode());
+ const bool bOn = !(pSh && (pSh->GetViewOptions()->getBrowseMode() ||
+ pSh->GetViewOptions()->IsHideWhitespaceMode()));
if ( bOn && rH.IsActive() )
{ //Implant header, but remove first, if already present
@@ -721,7 +722,8 @@ void SwPageFrm::PrepareFooter()
pLay = static_cast<SwLayoutFrm*>(pLay->GetNext());
const SwViewShell *pSh = getRootFrm()->GetCurrShell();
- const bool bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode());
+ const bool bOn = !(pSh && (pSh->GetViewOptions()->getBrowseMode() ||
+ pSh->GetViewOptions()->IsHideWhitespaceMode()));
if ( bOn && rF.IsActive() )
{ //Implant footer, but remove first, if already present