[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - sw/inc sw/source

[Ashod Nakashian]

 sw/inc/viewopt.hxx                  |    3 +++
 sw/source/core/layout/hffrm.cxx     |    6 ++++--
 sw/source/uibase/config/viewopt.cxx |    4 ++++
 3 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit cdebfc0f5a230668d9630492118c06ceda339543
Author: Ashod Nakashian <ashodnakashian at yahoo.com>
Date:   Mon Jul 13 23:32:28 2015 -0400

    tdf#39080 Added HideWhitespaceMode ViewOption flag
    
    Change-Id: I94ac57881dc3a3628413b9198ea750fdc282accb
    Reviewed-on: https://gerrit.libreoffice.org/17278
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 3e3c5369e87066a4bfdead5fc9dbfe128f84df52)

diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index dee2189..87558cc 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -150,6 +150,7 @@ protected:
     bool            mbBrowseMode : 1;
     bool            mbBookView : 1;      // View mode for page preview.
     bool            mbViewLayoutBookMode : 1; // Book view mode for edit view.
+    bool            mbHideWhitespaceMode : 1; // Hide header, footer, and pagebreak.
     bool        bShowPlaceHolderFields : 1; // Only used in printing!
     mutable bool    bIdle;
 
@@ -393,6 +394,8 @@ public:
     void   SetViewLayoutBookMode( bool bNew ) { mbViewLayoutBookMode = bNew; }
     sal_uInt16 GetViewLayoutColumns() const { return mnViewLayoutColumns; }
     void   SetViewLayoutColumns( sal_uInt16 nNew ) { mnViewLayoutColumns = nNew; }
+    bool   IsHideWhitespaceMode() const { return mbHideWhitespaceMode; }
+    void   SetHideWhitespaceMode( bool bMode ) { mbHideWhitespaceMode = bMode; }
 
 #ifdef DBG_UTIL
     // Correspond to statements in ui/config/cfgvw.src.
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index 03f6ed4..a5789fe 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 77c716a..3670bdd 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;