diff options
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/layout/hffrm.cxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/config/viewopt.cxx | 4 |
2 files changed, 8 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 diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx index 77c716af839d..3670bddebd33 100644 --- a/sw/source/uibase/config/viewopt.cxx +++ b/sw/source/uibase/config/viewopt.cxx @@ -82,6 +82,7 @@ bool SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const && mbFormView == rOpt.IsFormView() && mbBrowseMode == rOpt.getBrowseMode() && mbViewLayoutBookMode == rOpt.mbViewLayoutBookMode + && mbHideWhitespaceMode == rOpt.mbHideWhitespaceMode && bShowPlaceHolderFields == rOpt.bShowPlaceHolderFields && bIdle == rOpt.bIdle #ifdef DBG_UTIL @@ -165,6 +166,7 @@ SwViewOption::SwViewOption() : mbBrowseMode(false), mbBookView(false), mbViewLayoutBookMode(false), + mbHideWhitespaceMode(false), bShowPlaceHolderFields( true ), nZoom( 100 ), eZoom( SvxZoomType::PERCENT ), @@ -237,6 +239,7 @@ SwViewOption::SwViewOption(const SwViewOption& rVOpt) mbBookView = rVOpt.mbBookView; mbBrowseMode = rVOpt.mbBrowseMode; mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode; + mbHideWhitespaceMode = rVOpt.mbHideWhitespaceMode; bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields; bIdle = rVOpt.bIdle; @@ -277,6 +280,7 @@ SwViewOption& SwViewOption::operator=( const SwViewOption &rVOpt ) mbBookView = rVOpt.mbBookView; mbBrowseMode = rVOpt.mbBrowseMode; mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode; + mbHideWhitespaceMode = rVOpt.mbHideWhitespaceMode; bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields; bIdle = rVOpt.bIdle; |