diff options
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/stlsheet.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/func/fupage.cxx | 18 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unopback.cxx | 6 |
3 files changed, 15 insertions, 15 deletions
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index eb578bdc3d31..9bd424e12a1f 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -1024,7 +1024,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con throw IllegalArgumentException(); } - SfxItemSet aSet( GetPool()->GetPool(), {{pEntry->nWID, pEntry->nWID}}); + SfxItemSet aSet( GetPool()->GetPool(), pEntry->nWID, pEntry->nWID); aSet.Put( rStyleSet ); if( !aSet.Count() ) @@ -1130,7 +1130,7 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) } else { - SfxItemSet aSet( GetPool()->GetPool(), {{pEntry->nWID, pEntry->nWID}}); + SfxItemSet aSet( GetPool()->GetPool(), pEntry->nWID, pEntry->nWID); const SfxPoolItem* pItem; SfxItemSet& rStyleSet = GetItemSet(); @@ -1328,7 +1328,7 @@ Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) else { SfxItemPool& rMyPool = GetPool()->GetPool(); - SfxItemSet aSet( rMyPool, {{pEntry->nWID, pEntry->nWID}}); + SfxItemSet aSet( rMyPool, pEntry->nWID, pEntry->nWID); aSet.Put( rMyPool.GetDefaultItem( pEntry->nWID ) ); aRet = SvxItemPropertySet_getPropertyValue( pEntry, aSet ); } diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 982fab729734..b37ee29fb5ff 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(), { - { 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 }, - }); + 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 + >{}); // Keep it sorted aNewAttr.MergeRange(mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE), mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE)); diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 573e22411066..99d4042ad4a8 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -211,7 +211,7 @@ void SAL_CALL SdUnoPageBackground::setPropertyValue( const OUString& aPropertyNa } SfxItemPool& rPool = *mpSet->GetPool(); - SfxItemSet aSet( rPool, {{pEntry->nWID, pEntry->nWID}}); + SfxItemSet aSet( rPool, pEntry->nWID, pEntry->nWID); aSet.Put( *mpSet ); if( !aSet.Count() ) @@ -271,7 +271,7 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyValue( const OUString& Propert else { SfxItemPool& rPool = *mpSet->GetPool(); - SfxItemSet aSet( rPool, {{pEntry->nWID, pEntry->nWID}}); + SfxItemSet aSet( rPool, pEntry->nWID, pEntry->nWID); aSet.Put( *mpSet ); if( !aSet.Count() ) @@ -393,7 +393,7 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyDefault( const OUString& aProp else { SfxItemPool& rPool = *mpSet->GetPool(); - SfxItemSet aSet(rPool, { { pEntry->nWID, pEntry->nWID } }); + SfxItemSet aSet(rPool, pEntry->nWID, pEntry->nWID); aSet.Put(rPool.GetDefaultItem(pEntry->nWID)); aAny = SvxItemPropertySet_getPropertyValue(pEntry, aSet); |