Kaydet (Commit) c550c3eb authored tarafından Katarina Behrens's avatar Katarina Behrens

tdf#89466: Handle no background and bitmap case also in sidebar

Change-Id: I9e36a7963cb3065b81c1ba25f983d722d5f30ed8
Reviewed-on: https://gerrit.libreoffice.org/24802Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst a3615d55
......@@ -2644,7 +2644,7 @@ interface DrawView
]
SID_ATTR_PAGE_FILLSTYLE
[
ExecMethod = FuTemporary;
ExecMethod = SetPageProperties;
StateMethod = GetPageProperties;
]
SID_DISPLAY_MASTER_BACKGROUND
......
......@@ -550,6 +550,12 @@ IMPL_LINK_NOARG_TYPED(SlideBackground, FillStyleModifyHdl, ListBox&, void)
switch (eXFS)
{
case drawing::FillStyle_NONE:
{
GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_FILLSTYLE, SfxCallMode::RECORD, { &aXFillStyleItem });
}
break;
case drawing::FillStyle_SOLID:
{
XFillColorItem aItem( OUString(), mpColorItem->GetColorValue() );
......@@ -571,6 +577,13 @@ IMPL_LINK_NOARG_TYPED(SlideBackground, FillStyleModifyHdl, ListBox&, void)
}
break;
case drawing::FillStyle_BITMAP:
{
XFillBitmapItem aItem( mpBitmapItem->GetName(), mpBitmapItem->GetGraphicObject() );
GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_BITMAP, SfxCallMode::RECORD, { &aItem });
}
break;
default:
break;
}
......
......@@ -1716,6 +1716,16 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq)
switch (nSlotId)
{
case(SID_ATTR_PAGE_FILLSTYLE):
{
XFillStyleItem aFSItem( static_cast<const XFillStyleItem&>(pArgs->Get( XATTR_FILLSTYLE )) );
drawing::FillStyle eXFS = aFSItem.GetValue();
if ( eXFS == drawing::FillStyle_NONE )
rPageProperties.PutItem( XFillStyleItem( eXFS ) );
}
break;
case(SID_ATTR_PAGE_COLOR):
{
XFillColorItem aColorItem( static_cast<const XFillColorItem&>(pArgs->Get( XATTR_FILLCOLOR )) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment