#i112601# paint the correct page background

This commit is contained in:
Christian Lippka 2010-06-29 17:52:44 +02:00
parent bed0ccb3f6
commit 54c602060a
2 changed files with 12 additions and 1 deletions

10
sd/source/ui/func/fupage.cxx Normal file → Executable file
View file

@ -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 ) )
{

3
sd/source/ui/inc/fupage.hxx Normal file → Executable file
View file

@ -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;