[Libreoffice-commits] core.git: sw/source

[Ashod Nakashian]

 sw/source/core/layout/paintfrm.cxx |    7 ++++---
 sw/source/core/layout/wsfrm.cxx    |    7 +++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 17ac8354c97e107712d3ad59ab3140a8d0d3b78c
Author: Ashod Nakashian <ashodnakashian at yahoo.com>
Date:   Wed Jul 15 10:42:39 2015 -0400

    tdf#39080 Hide vertical whitespace when HideWhitespace option is set.
    
    Change-Id: I1d0a974a0b4b7053f59c23aa883bef61fd1df177
    Reviewed-on: https://gerrit.libreoffice.org/17279
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index dc5847d..06f74fa 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -113,9 +113,10 @@ struct SwPaintProperties;
 
 //other subsidiary lines enabled?
 #define IS_SUBS (!gProp.pSGlobalShell->GetViewOptions()->IsPagePreview() && \
-        !gProp.pSGlobalShell->GetViewOptions()->IsReadonly() && \
-        !gProp.pSGlobalShell->GetViewOptions()->IsFormView() &&\
-         SwViewOption::IsDocBoundaries())
+                 !gProp.pSGlobalShell->GetViewOptions()->IsReadonly() && \
+                 !gProp.pSGlobalShell->GetViewOptions()->IsFormView() &&\
+                 !gProp.pSGlobalShell->GetViewOptions()->IsHideWhitespaceMode() &&\
+                 SwViewOption::IsDocBoundaries())
 //subsidiary lines for sections
 #define IS_SUBS_SECTION (!gProp.pSGlobalShell->GetViewOptions()->IsPagePreview() && \
                          !gProp.pSGlobalShell->GetViewOptions()->IsReadonly()&&\
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 1548af2..bc75b1b 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -2932,11 +2932,14 @@ void SwLayoutFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorder
     if ( mbValidPrtArea && mbValidSize )
         return;
 
+    SwViewShell *pSh = getRootFrm()->GetCurrShell();
+    const bool hideWhitespace = (pSh && pSh->GetViewOptions()->IsHideWhitespaceMode());
     const sal_uInt16 nLeft = (sal_uInt16)pAttrs->CalcLeft( this );
-    const sal_uInt16 nUpper = pAttrs->CalcTop();
+    const sal_uInt16 nUpper = hideWhitespace ? 0 : pAttrs->CalcTop();
 
     const sal_uInt16 nRight = (sal_uInt16)pAttrs->CalcRight( this );
-    const sal_uInt16 nLower = pAttrs->CalcBottom();
+    const sal_uInt16 nLower = hideWhitespace ? 0 : pAttrs->CalcBottom();
+
     bool bVert = IsVertical() && !IsPageFrm();
     SwRectFn fnRect = bVert ? ( IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori;
     if ( !mbValidPrtArea )