diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-05-04 11:07:16 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-05-06 15:14:28 +0000 |
| commit | 82573976439dea2db42b350356fa4747f38f7f24 (patch) | |
| tree | 8d15ec0d3dc8dee6ef21f5e095fdbf4b1b9efd42 | |
| parent | bb0ef99fb9dce30e99a7e9f7fa295a634d07b423 (diff) | |
tdf#89466: Don't reset page background on size/orientation change
Change-Id: I5fbf44235784f285d42d2e83466d2f0d70fd0f5d
Reviewed-on: https://gerrit.libreoffice.org/24659
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
| -rw-r--r-- | sd/source/ui/func/fupage.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 09788815a578..b33783f9e736 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -129,10 +129,13 @@ void FuPage::DoExecute( SfxRequest& ) { mpDrawViewShell = dynamic_cast<DrawViewShell*>(mpViewShell); DBG_ASSERT( mpDrawViewShell, "sd::FuPage::FuPage(), called without a current DrawViewShell!" ); + if( mpDrawViewShell ) { mbMasterPage = mpDrawViewShell->GetEditMode() == EM_MASTERPAGE; - mbDisplayBackgroundTabPage = (mpDrawViewShell->GetPageKind() == PK_STANDARD); + // we don't really want to format page background with SID_ATTR_PAGE[_SIZE] slots + mbDisplayBackgroundTabPage = ( mpDrawViewShell->GetPageKind() == PK_STANDARD) && + ( nSlotId != SID_ATTR_PAGE_SIZE) && ( nSlotId != SID_ATTR_PAGE ); mpPage = mpDrawViewShell->getCurrentPage(); } |