summaryrefslogtreecommitdiff
path: root/sw/source/core/layout
diff options
context:
space:
mode:
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 e12df3e12c35..631a7072ac94 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -673,7 +673,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
@@ -715,7 +716,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