diff options
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 7 | ||||
| -rw-r--r-- | sw/source/core/layout/wsfrm.cxx | 7 |
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 ) |