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

[Katarina Behrens]

 sd/source/ui/func/fupage.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 82573976439dea2db42b350356fa4747f38f7f24
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Wed May 4 11:07:16 2016 +0200

    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 at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 0978881..b33783f 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();
     }