summaryrefslogtreecommitdiff
path: root/sw/source/core/view/viewsh.cxx
diff options
context:
space:
mode:
authorAshod Nakashian <ashodnakashian@yahoo.com>2015-08-30 22:52:03 -0400
committerCaolán McNamara <caolanm@redhat.com>2015-10-01 09:33:35 +0000
commit54a2c8c006e2f216e9d8c6b0ed625180c843c48b (patch)
treef418de3d5ec3dbb10435d8cb7e993ad7c5d232bf /sw/source/core/view/viewsh.cxx
parent55b2b9586662f3fe0f01633d41ddadefe08a84a1 (diff)
tdf#39080 Interactive hide-whitespace mode
Support for enabling and disabling hide-whitespace by clicking between page frames. Disabled header and footer decorators when hide-whitepsace is enabled, and page size is trimmed to the contents of each page. Experimental/suggestive mouse pointers added but only tested on Windows. Change-Id: Ia2faeeda9e3e783ffaf5340aa69303a4218892a7 Reviewed-on: https://gerrit.libreoffice.org/18156 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/core/view/viewsh.cxx')
-rw-r--r--sw/source/core/view/viewsh.cxx9
1 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 92dff8012e83..704e20d5d0fd 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1938,7 +1938,7 @@ sal_Int32 SwViewShell::GetBrowseWidth() const
void SwViewShell::InvalidateLayout( bool bSizeChanged )
{
if ( !bSizeChanged && !GetViewOptions()->getBrowseMode() &&
- !GetViewOptions()->IsHideWhitespaceMode() )
+ !GetViewOptions()->IsWhitespaceHidden() )
return;
SET_CURR_SHELL( this );
@@ -2123,7 +2123,7 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
pMyWin->SetMapMode( aMode );
// if not a reference device (printer) is used for formatting,
// but the screen, new formatting is needed for zoomfactor changes.
- if (mpOpt->getBrowseMode() || mpOpt->IsHideWhitespaceMode())
+ if (mpOpt->getBrowseMode() || mpOpt->IsWhitespaceHidden())
bReformat = true;
}
@@ -2137,10 +2137,7 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
bReformat = true;
bool bHideWhitespaceModeChanged = false;
- if (mpOpt->IsHideWhitespaceMode() != rOpt.IsHideWhitespaceMode() ||
- (rOpt.IsHideWhitespaceMode() &&
- (mpOpt->IsViewLayoutBookMode() != rOpt.IsViewLayoutBookMode() ||
- mpOpt->GetViewLayoutColumns() != rOpt.GetViewLayoutColumns())))
+ if (mpOpt->IsWhitespaceHidden() != rOpt.IsWhitespaceHidden())
{
// When whitespace is hidden, view change needs reformatting.
bHideWhitespaceModeChanged = true;