summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshod Nakashian <ashodnakashian@yahoo.com>2015-07-15 10:42:39 -0400
committerCaolán McNamara <caolanm@redhat.com>2015-08-17 12:36:44 +0000
commit17ac8354c97e107712d3ad59ab3140a8d0d3b78c (patch)
tree051e867a4293e45c3b894729d124746eec1bb8f6
parent1d1d5f9013399065e606d95f8bebaebe464c7e96 (diff)
tdf#39080 Hide vertical whitespace when HideWhitespace option is set.
Change-Id: I1d0a974a0b4b7053f59c23aa883bef61fd1df177 Reviewed-on: https://gerrit.libreoffice.org/17279 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/core/layout/paintfrm.cxx7
-rw-r--r--sw/source/core/layout/wsfrm.cxx7
2 files changed, 9 insertions, 5 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index dc5847df166a..06f74fa469ff 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 1548af234669..bc75b1bec98a 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 )