#i112601# paint the correct page background

2 files changed, 12 insertions, 1 deletions

diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 9fb0007cc72c..3dea67412fac 100644..100755
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -449,6 +449,16 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
 
             }
 
+            // if background filling is set to master pages then clear from page set
+            if( mbMasterPage || bSetToAllPages )
+            {
+                for( USHORT nWhich = XATTR_FILL_FIRST; nWhich <= XATTR_FILL_LAST; nWhich++ )
+                {
+                    pTempSet->ClearItem( nWhich );
+                }
+                pTempSet->Put(XFillStyleItem(XFILL_NONE));
+            }
+
             const SfxPoolItem *pItem;
             if( SFX_ITEM_SET == pTempSet->GetItemState( EE_PARA_WRITINGDIR, sal_False, &pItem ) )
             {
diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx
index 6752e0421806..a0cd7b4d2e0a 100644..100755
--- a/sd/source/ui/inc/fupage.hxx
+++ b/sd/source/ui/inc/fupage.hxx
@@ -50,7 +50,6 @@ class FuPage
     virtual void Deactivate();         // Function deaktivieren
 
     const SfxItemSet* ExecuteDialog( Window* pParent );
-    void ApplyItemSet( const SfxItemSet* pArgs );
 
 protected:
     virtual ~FuPage (void);
@@ -63,6 +62,8 @@ private:
         SdDrawDocument* pDoc,
         SfxRequest& rReq );
 
+    void ApplyItemSet( const SfxItemSet* pArgs );
+
     SfxRequest&                 mrReq;
     const SfxItemSet*           mpArgs;
     SdBackgroundObjUndoAction*  mpBackgroundObjUndoAction;