diff options
Diffstat (limited to 'sd/source/ui/func/fupage.cxx')
| -rw-r--r-- | sd/source/ui/func/fupage.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 076c63f95e67..366e99b691ff 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -200,15 +200,15 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& if (!mpDrawViewShell) return nullptr; - SfxItemSet aNewAttr(mpDoc->GetPool(), svl::Items< - XATTR_FILL_FIRST, XATTR_FILL_LAST, - EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR, - SID_ATTR_BORDER_OUTER, SID_ATTR_BORDER_OUTER, - SID_ATTR_BORDER_SHADOW, SID_ATTR_BORDER_SHADOW, - SID_ATTR_PAGE, SID_ATTR_PAGE_SHARED, - SID_ATTR_CHAR_GRABBAG, SID_ATTR_CHAR_GRABBAG, - SID_ATTR_PAGE_COLOR, SID_ATTR_PAGE_FILLSTYLE - >); + SfxItemSetFixed< + XATTR_FILL_FIRST, XATTR_FILL_LAST, + EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR, + SID_ATTR_BORDER_OUTER, SID_ATTR_BORDER_OUTER, + SID_ATTR_BORDER_SHADOW, SID_ATTR_BORDER_SHADOW, + SID_ATTR_PAGE, SID_ATTR_PAGE_SHARED, + SID_ATTR_CHAR_GRABBAG, SID_ATTR_CHAR_GRABBAG, + SID_ATTR_PAGE_COLOR, SID_ATTR_PAGE_FILLSTYLE + > aNewAttr(mpDoc->GetPool()); // Keep it sorted aNewAttr.MergeRange(mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE), mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE)); @@ -335,7 +335,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& pTempSet->Put( XFillStyleItem( drawing::FillStyle_BITMAP ) ); // MigrateItemSet makes sure the XFillBitmapItem will have a unique name - SfxItemSet aMigrateSet( mpDoc->GetPool(), svl::Items<XATTR_FILLBITMAP, XATTR_FILLBITMAP> ); + SfxItemSetFixed<XATTR_FILLBITMAP, XATTR_FILLBITMAP> aMigrateSet( mpDoc->GetPool() ); aMigrateSet.Put(XFillBitmapItem("background", aGraphic)); SdrModel::MigrateItemSet( &aMigrateSet, &*pTempSet, mpDoc ); @@ -396,7 +396,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& if (pTempGradItem && pTempGradItem->GetName().isEmpty()) { // MigrateItemSet guarantees unique gradient names - SfxItemSet aMigrateSet( mpDoc->GetPool(), svl::Items<XATTR_FILLGRADIENT, XATTR_FILLGRADIENT> ); + SfxItemSetFixed<XATTR_FILLGRADIENT, XATTR_FILLGRADIENT> aMigrateSet( mpDoc->GetPool() ); aMigrateSet.Put( XFillGradientItem("gradient", pTempGradItem->GetGradientValue()) ); SdrModel::MigrateItemSet( &aMigrateSet, &*pTempSet, mpDoc); } @@ -405,7 +405,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& if (pTempHatchItem && pTempHatchItem->GetName().isEmpty()) { // MigrateItemSet guarantees unique hatch names - SfxItemSet aMigrateSet( mpDoc->GetPool(), svl::Items<XATTR_FILLHATCH, XATTR_FILLHATCH> ); + SfxItemSetFixed<XATTR_FILLHATCH, XATTR_FILLHATCH> aMigrateSet( mpDoc->GetPool() ); aMigrateSet.Put( XFillHatchItem("hatch", pTempHatchItem->GetHatchValue()) ); SdrModel::MigrateItemSet( &aMigrateSet, &*pTempSet, mpDoc); } |