Make SfxItemSet ranges correct by construction

This is a follow-up to 45a7f5b62d0b1b21763c1c94255ef2309ea4280b "Keep WID ranges
sorted, and join adjacent ones".  While SfxItemSet::MergeRange relies on the
m_pWhichRanges being sorted (and, under DBG_UTIL, asserts if they are not), the
various SfxItemSet constructors curiously only check (via assert or DBG_ASSERT)
that each individual range has an upper bound not smaller than its lower bound.
Arguably, all SfxItemSet instances should fulfill the stronger guarantees
required and checked by MergeRange.

And in many cases the ranges are statically known, so that the checking can
happen at compile time.  Therefore, replace the two SfxItemSet ctors taking
explicit ranges with two other ctors that actually do proper checking.  The
(templated) overload taking an svl::Items struct should be used in all cases
where the range values are statically known at compile time, while the overload
taking a std::initializer_list<Pair> is for the remaining cases (that can only
do runtime checking via assert).  Most of those latter cases are simple cases
with a single range covering a single item, but a few are more complex.

(At least some of the uses of the existing SfxItemSet overload taking a

const sal_uInt16* pWhichPairTable

can probably also be strengthened, but that is left for another day.)

This commit is the first in a series of two.  Apart from the manual changes to
compilerplugins/clang/store/sfxitemsetrewrite.cxx, include/svl/itemset.hxx, and
svl/source/items/itemset.cxx, it only consists of automatic rewriting of the
relevant SfxItemSet ctor calls (plus a few required manual fixes, see next).
But it does not yet check that the individual ranges are properly sorted (see
the TODO in svl::detail::validGap).  That check will be enabled, and the ensuing
manual fixes will be made in a follow-up commit, to reduce the likelyhood of
accidents.

There were three cases of necessary manual intervention:

* sw/source/core/unocore/unostyle.cxx uses eAtr of enum type RES_FRMATR in
braced-init-list syntax now, so needs explicit narrowing conversion to
sal_uInt16.

* In sw/source/uibase/uiview/formatclipboard.cxx, the trailiing comma in the
definition of macro FORMAT_PAINTBRUSH_FRAME_IDS needed to be removed manually.

* In svx/source/svdraw/svdoashp.cxx, svx/source/svdraw/svdotext.cxx,
sw/source/uibase/app/docstyle.cxx, sw/source/uibase/shells/frmsh.cxx,
sw/source/uibase/shells/grfsh.cxx, and sw/source/uibase/shells/textsh1.cxx,
some comments had to be put back (see "TODO: the replaced range can contain
relevant comments" in compilerplugins/clang/store/sfxitemsetrewrite.cxx).

A few uses of the variadic form erroneously used nullptr instead of 0 for
termination.  But this should have been harmless even if promoted std::nullptr_t
is larger than promoted sal_uInt16, assuming that the part of the nullptr value
that was interpreted as sal_uInt16/promoted int was all-zero bits.  Similarly,
some uses made the harmless error of using 0L instead of 0.

Change-Id: I2afea97282803cb311b9321a99bb627520ef5e35
Reviewed-on: https://gerrit.libreoffice.org/38861
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

16 files changed, 127 insertions, 153 deletions

diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 69fc95b59cae..1428a8c772dc 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -479,7 +479,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
                 FieldUnit eMetric = ::GetDfltMetric(dynamic_cast<SwWebView*>( pView) !=  nullptr );
                 SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, eMetric));
                 */
-                SfxItemSet aDlgAttr(GetPool(), EE_ITEMS_START, EE_ITEMS_END);
+                SfxItemSet aDlgAttr(GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{});
 
                 // util::Language does not exist in the EditEngine! Therefore not included in the set.
 
@@ -525,12 +525,11 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
                 SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, eMetric));
                 */
                 SfxItemSet aDlgAttr(GetPool(),
-                                    EE_ITEMS_START, EE_ITEMS_END,
+                                    svl::Items<EE_ITEMS_START, EE_ITEMS_END,
                                     SID_ATTR_PARA_HYPHENZONE, SID_ATTR_PARA_HYPHENZONE,
                                     SID_ATTR_PARA_SPLIT, SID_ATTR_PARA_SPLIT,
                                     SID_ATTR_PARA_WIDOWS, SID_ATTR_PARA_WIDOWS,
-                                    SID_ATTR_PARA_ORPHANS, SID_ATTR_PARA_ORPHANS,
-                                    0);
+                                    SID_ATTR_PARA_ORPHANS, SID_ATTR_PARA_ORPHANS>{});
 
                 aDlgAttr.Put(aEditAttr);
 
@@ -576,9 +575,8 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
                     bLeftToRight = !bLeftToRight;
             }
             SfxItemSet aAttr( *aNewAttr.GetPool(),
-                        EE_PARA_JUST, EE_PARA_JUST,
-                        EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR,
-                        0 );
+                        svl::Items<EE_PARA_JUST, EE_PARA_JUST,
+                        EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR>{} );
 
             SvxAdjust nAdjust = SvxAdjust::Left;
             if( SfxItemState::SET == aEditAttr.GetItemState(EE_PARA_JUST, true, &pPoolItem ) )
@@ -1793,10 +1791,9 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
 
         SfxItemSet aOldSet( pOLV->GetAttribs() );
         SfxItemSet aFontSet( *aOldSet.GetPool(),
-                            EE_CHAR_FONTINFO, EE_CHAR_FONTINFO,
+                            svl::Items<EE_CHAR_FONTINFO, EE_CHAR_FONTINFO,
                             EE_CHAR_FONTINFO_CJK, EE_CHAR_FONTINFO_CJK,
-                            EE_CHAR_FONTINFO_CTL, EE_CHAR_FONTINFO_CTL,
-                            0 );
+                            EE_CHAR_FONTINFO_CTL, EE_CHAR_FONTINFO_CTL>{} );
         aFontSet.Set( aOldSet );
 
         // Insert string
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 465048dc32c9..9c43baea5d24 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -172,7 +172,7 @@ static void lcl_UpdateIMapDlg( SwWrtShell& rSh )
     std::unique_ptr<TargetList> pList(new TargetList);
     rSh.GetView().GetViewFrame()->GetFrame().GetTargetList(*pList);
 
-    SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
+    SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL>{} );
     rSh.GetFlyFrameAttr( aSet );
     const SwFormatURL &rURL = static_cast<const SwFormatURL&>(aSet.Get( RES_URL ));
     SvxIMapDlgChildWindow::UpdateIMapDlg(
@@ -985,7 +985,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             if ( rSh.IsFrameSelected() &&
                  pDlg->GetEditingObject() == rSh.GetIMapInventor() )
             {
-                    SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
+                    SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL>{} );
                     rSh.GetFlyFrameAttr( aSet );
                     SwFormatURL aURL( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) );
                     aURL.SetMap( &pDlg->GetImageMap() );
@@ -1020,7 +1020,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                 if (pDlg && pDlg->GetEditingObject() == rSh.GetIMapInventor())
                 {
                     rSh.StartAction();
-                    SfxItemSet aSet( rSh.GetAttrPool(), RES_SURROUND, RES_SURROUND);
+                    SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_SURROUND, RES_SURROUND>{});
                     rSh.GetFlyFrameAttr( aSet );
                     SwFormatSurround aSur( static_cast<const SwFormatSurround&>(aSet.Get( RES_SURROUND )) );
                     if ( !aSur.IsContour() )
@@ -1082,7 +1082,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             sal_uInt16 nHtmlMode = ::GetHtmlMode(GetView().GetDocShell());
             if( nHtmlMode )
             {
-                SfxItemSet aSet(GetPool(), RES_SURROUND, RES_HORI_ORIENT);
+                SfxItemSet aSet(GetPool(), svl::Items<RES_SURROUND, RES_HORI_ORIENT>{});
                 rSh.GetFlyFrameAttr(aSet);
 
                 const SwFormatSurround& rSurround = static_cast<const SwFormatSurround&>(aSet.Get(RES_SURROUND));
@@ -1328,7 +1328,7 @@ IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl, SwCursorShell&, void)
             case FN_FRAME_WRAP_CONTOUR:
                 if( !bProtect )
                 {
-                    SfxItemSet aSet(GetPool(), RES_SURROUND, RES_SURROUND);
+                    SfxItemSet aSet(GetPool(), svl::Items<RES_SURROUND, RES_SURROUND>{});
                     rSh.GetFlyFrameAttr(aSet);
                     const SwFormatSurround& rWrap = static_cast<const SwFormatSurround&>(aSet.Get(RES_SURROUND));
                     bSetState = true;
@@ -1432,7 +1432,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
             case RES_SHADOW:
             {
                 SfxItemSet   aSet( rSh.GetAttrPool(),
-                                    RES_SHADOW, RES_SHADOW );
+                                    svl::Items<RES_SHADOW, RES_SHADOW>{} );
 
                 // Table cell(s) selected?
                 if ( rSh.IsTableMode() )
@@ -1614,7 +1614,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
 
                 if( !bParentCntProt && (bObj || rSh.IsFrameSelected()))
                 {
-                    SfxItemSet aSet(GetPool(), RES_ANCHOR, RES_ANCHOR);
+                    SfxItemSet aSet(GetPool(), svl::Items<RES_ANCHOR, RES_ANCHOR>{});
                     if(bObj)
                         rSh.GetObjAttr(aSet);
                     else
@@ -1656,7 +1656,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
 
                 if( !bParentCntProt && (bObj || rSh.IsFrameSelected()))
                 {
-                    SfxItemSet aSet(GetPool(), RES_OPAQUE, RES_ANCHOR);
+                    SfxItemSet aSet(GetPool(), svl::Items<RES_OPAQUE, RES_ANCHOR>{});
                     RndStdIds nAnchorType;
                     if(bObj)
                     {
@@ -1830,7 +1830,7 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot )
     bool bObj = 0 != rSh.IsObjSelected();
     if( bObj || rSh.IsFrameSelected())
     {
-        SfxItemSet aSet(GetPool(), RES_OPAQUE, RES_SURROUND);
+        SfxItemSet aSet(GetPool(), svl::Items<RES_OPAQUE, RES_SURROUND>{});
         if(bObj)
             rSh.GetObjAttr(aSet);
         else
@@ -1967,10 +1967,9 @@ void SwBaseShell::ExecTextCtrl( SfxRequest& rReq )
         SfxItemPool& rPool = rSh.GetAttrPool();
         sal_uInt16 nWhich = rPool.GetWhich( nSlot );
         SvtScriptType nScripts = SvtScriptType::LATIN | SvtScriptType::ASIAN | SvtScriptType::COMPLEX;
-        SfxItemSet aHeightSet( GetPool(),  RES_CHRATR_FONTSIZE, RES_CHRATR_FONTSIZE,
+        SfxItemSet aHeightSet( GetPool(),  svl::Items<RES_CHRATR_FONTSIZE, RES_CHRATR_FONTSIZE,
                                             RES_CHRATR_CJK_FONTSIZE, RES_CHRATR_CJK_FONTSIZE,
-                                            RES_CHRATR_CTL_FONTSIZE, RES_CHRATR_CTL_FONTSIZE,
-                                        0L);
+                                            RES_CHRATR_CTL_FONTSIZE, RES_CHRATR_CTL_FONTSIZE>{});
 
         switch( nSlot )
         {
@@ -2012,10 +2011,9 @@ void SwBaseShell::ExecTextCtrl( SfxRequest& rReq )
                     sal_uInt32 nHeight = static_cast< const SvxFontHeightItem& >(pArgs->Get( nWhich )).GetHeight();
                     SwStdFontConfig* pStdFont = SW_MOD()->GetStdFontConfig();
 
-                    SfxItemSet aLangSet( GetPool(), RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE,
+                    SfxItemSet aLangSet( GetPool(), svl::Items<RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE,
                                                     RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_LANGUAGE,
-                                                    RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_LANGUAGE,
-                                                    0L);
+                                                    RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_LANGUAGE>{});
                     rSh.GetCurAttr( aLangSet );
 
                     sal_Int32 nWesternSize =
@@ -2107,7 +2105,7 @@ void SwBaseShell::GetTextFontCtrlState( SfxItemSet& rSet )
                 if( !pFntCoreSet )
                 {
                     pFntCoreSet.reset(new SfxItemSet( *rSet.GetPool(),
-                                    RES_CHRATR_BEGIN, RES_CHRATR_END-1 ));
+                                    svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END-1>{} ));
                     rSh.GetCurAttr( *pFntCoreSet );
                     nScriptType = rSh.GetScriptType();
                     // #i42732# input language should be preferred over
@@ -2184,7 +2182,7 @@ void SwBaseShell::GetBckColState(SfxItemSet &rSet)
     else
     {
         // Adapt to new DrawingLayer FillStyle; use a parent which has XFILL_NONE set
-        SfxItemSet aCoreSet(GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
+        SfxItemSet aCoreSet(GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
 
         aCoreSet.SetParent(&GetView().GetDocShell()->GetDoc()->GetDfltFrameFormat()->GetAttrSet());
 
@@ -2244,7 +2242,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
     else
     {
         // Adapt to new DrawingLayer FillStyle; use a parent which has XFILL_NONE set
-        SfxItemSet aCoreSet(GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
+        SfxItemSet aCoreSet(GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
 
         aCoreSet.SetParent(&GetView().GetDocShell()->GetDoc()->GetDfltFrameFormat()->GetAttrSet());
 
@@ -2303,7 +2301,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
     else
     {
         // Adapt to new DrawingLayer FillStyle; use a parent which has XFILL_NONE set
-        SfxItemSet aCoreSet(GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST);
+        SfxItemSet aCoreSet(GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
 
         aCoreSet.SetParent(&GetView().GetDocShell()->GetDoc()->GetDfltFrameFormat()->GetAttrSet());
         setSvxBrushItemAsFillAttributesToTargetSet(aBrushItem, aCoreSet);
@@ -2349,8 +2347,8 @@ void SwBaseShell::GetBorderState(SfxItemSet &rSet)
     if ( bTableMode )
     {
         SfxItemSet aCoreSet( GetPool(),
-                             RES_BOX, RES_BOX,
-                             SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, 0 );
+                             svl::Items<RES_BOX, RES_BOX,
+                             SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{} );
         SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
         aCoreSet.Put( aBoxInfo );
         rSh.GetTabBorders( aCoreSet );
@@ -2427,9 +2425,8 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
         case FN_FORMAT_BORDER_DLG:
         {
             SfxItemSet   aSet( rSh.GetAttrPool(),
-                               RES_BOX              , RES_SHADOW,
-                               SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
-                               0 );
+                               svl::Items<RES_BOX              , RES_SHADOW,
+                               SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{} );
             ScopedVclPtr<SfxAbstractDialog> pDlg;
             // Table cell(s) selected?
             if ( rSh.IsTableMode() )
@@ -2493,7 +2490,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
         case FN_FORMAT_BACKGROUND_DLG:
         {
             SfxItemSet aSet( rSh.GetAttrPool(),
-                             RES_BACKGROUND, RES_BACKGROUND );
+                             svl::Items<RES_BACKGROUND, RES_BACKGROUND>{} );
 
             ScopedVclPtr<SfxAbstractDialog> pDlg;
             SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -2824,7 +2821,7 @@ void SwBaseShell::ExecuteGallery(SfxRequest &rReq)
                 rSh.SetBoxBackground( aBrush );
             else if ( nPos == nFramePos || nPos == nGraphicPos || nPos == nOlePos )
             {
-                SfxItemSet aCoreSet(GetPool(), RES_BACKGROUND, RES_BACKGROUND);
+                SfxItemSet aCoreSet(GetPool(), svl::Items<RES_BACKGROUND, RES_BACKGROUND>{});
                 aCoreSet.Put( aBrush );
                 rSh.SetFlyFrameAttr( aCoreSet );
             }
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index b1b97df5368c..350181edf917 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -167,7 +167,7 @@ void SwDrawShell::InsertPictureFromFile(SdrObject& rObject)
                 {
                     pSdrView->AddUndo(new SdrUndoAttrObj(rObject));
 
-                    SfxItemSet aSet(pSdrView->GetModel()->GetItemPool(), XATTR_FILLSTYLE, XATTR_FILLBITMAP);
+                    SfxItemSet aSet(pSdrView->GetModel()->GetItemPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLBITMAP>{});
 
                     aSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP));
                     aSet.Put(XFillBitmapItem(OUString(), aGraphic));
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index ec081a2919d1..e13780543c0a 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -124,12 +124,11 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
                     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
                     if( rMarkList.GetMark(0) != nullptr )
                     {
-                        SfxItemSet aSet(GetPool(),  RES_SURROUND, RES_SURROUND,
+                        SfxItemSet aSet(GetPool(),  svl::Items<RES_SURROUND, RES_SURROUND,
                                                     RES_ANCHOR, RES_ANCHOR,
                                                     RES_LR_SPACE, RES_UL_SPACE,
                                                     SID_HTML_MODE, SID_HTML_MODE,
-                                                    FN_DRAW_WRAP_DLG, FN_DRAW_WRAP_DLG,
-                                                    0);
+                                                    FN_DRAW_WRAP_DLG, FN_DRAW_WRAP_DLG>{});
 
                         aSet.Put(SfxBoolItem(SID_HTML_MODE,
                             0 != ::GetHtmlMode(pSh->GetView().GetDocShell())));
@@ -260,7 +259,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
                                 SfxItemState::SET != pOutSet->GetItemState(
                                     SID_ATTR_TRANSFORM_POS_Y, false );
 
-                            SfxItemSet aFrameAttrSet(GetPool(), RES_FRMATR_BEGIN, RES_FRMATR_END - 1);
+                            SfxItemSet aFrameAttrSet(GetPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1>{});
 
                             bool bSingleSelection = rMarkList.GetMarkCount() == 1;
 
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index b875b49d721f..01ca59adb602 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -350,7 +350,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
                 SwView* pView = &GetView();
                 FieldUnit eMetric = ::GetDfltMetric(dynamic_cast<SwWebView*>( pView) !=  nullptr );
                 SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) );
-                SfxItemSet aDlgAttr(GetPool(), EE_ITEMS_START, EE_ITEMS_END);
+                SfxItemSet aDlgAttr(GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{});
 
                 // util::Language does not exists in the EditEngine! That is why not in set.
 
@@ -419,12 +419,11 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
                 FieldUnit eMetric = ::GetDfltMetric(dynamic_cast<SwWebView*>( pView) !=  nullptr );
                 SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)) );
                 SfxItemSet aDlgAttr(GetPool(),
-                                    EE_ITEMS_START, EE_ITEMS_END,
+                                    svl::Items<EE_ITEMS_START, EE_ITEMS_END,
                                     SID_ATTR_PARA_HYPHENZONE, SID_ATTR_PARA_HYPHENZONE,
                                     SID_ATTR_PARA_SPLIT, SID_ATTR_PARA_SPLIT,
                                     SID_ATTR_PARA_WIDOWS, SID_ATTR_PARA_WIDOWS,
-                                    SID_ATTR_PARA_ORPHANS, SID_ATTR_PARA_ORPHANS,
-                                    0);
+                                    SID_ATTR_PARA_ORPHANS, SID_ATTR_PARA_ORPHANS>{});
 
                 aDlgAttr.Put(aEditAttr);
 
@@ -507,8 +506,8 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
                 pSdrView->SdrEndTextEdit(true);
 
                 SfxItemSet aAttr( *aNewAttr.GetPool(),
-                            SDRATTR_TEXTDIRECTION,
-                            SDRATTR_TEXTDIRECTION );
+                            svl::Items<SDRATTR_TEXTDIRECTION,
+                            SDRATTR_TEXTDIRECTION>{} );
 
                 aAttr.Put( SvxWritingModeItem(
                     nSlot == SID_TEXTDIRECTION_LEFT_TO_RIGHT ?
@@ -538,9 +537,8 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
                     bLeftToRight = !bLeftToRight;
             }
             SfxItemSet aAttr( *aNewAttr.GetPool(),
-                        EE_PARA_JUST, EE_PARA_JUST,
-                        EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR,
-                        0 );
+                        svl::Items<EE_PARA_JUST, EE_PARA_JUST,
+                        EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR>{} );
 
             SvxAdjust nAdjust = SvxAdjust::Left;
             if( SfxItemState::SET == aEditAttr.GetItemState(EE_PARA_JUST, true, &pPoolItem ) )
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index f920fa1a21ad..e3777c565222 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -766,10 +766,9 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
 
         SfxItemSet aOldSet( pOLV->GetAttribs() );
         SfxItemSet aFontSet( *aOldSet.GetPool(),
-                            EE_CHAR_FONTINFO, EE_CHAR_FONTINFO,
+                            svl::Items<EE_CHAR_FONTINFO, EE_CHAR_FONTINFO,
                             EE_CHAR_FONTINFO_CJK, EE_CHAR_FONTINFO_CJK,
-                            EE_CHAR_FONTINFO_CTL, EE_CHAR_FONTINFO_CTL,
-                            0 );
+                            EE_CHAR_FONTINFO_CTL, EE_CHAR_FONTINFO_CTL>{} );
         aFontSet.Set( aOldSet );
 
         // Insert string
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 9a75265c5065..9ebe7f9810c5 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -166,7 +166,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                 if(pArgs->GetItemState(SID_ATTR_COLUMNS, false, &pItem) == SfxItemState::SET)
                     nCols = static_cast<const SfxUInt16Item *>(pItem)->GetValue();
 
-                SfxItemSet aSet(GetPool(),RES_COL,RES_COL);
+                SfxItemSet aSet(GetPool(),svl::Items<RES_COL,RES_COL>{});
                 rSh.GetFlyFrameAttr( aSet );
                 SwFormatCol aCol(static_cast<const SwFormatCol&>(aSet.Get(RES_COL)));
                 // GutterWidth will not always passed, hence get firstly
@@ -201,7 +201,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                 const OUString& rURL = rHLinkItem.GetURL();
                 const OUString& rTarget = rHLinkItem.GetTargetFrame();
 
-                SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
+                SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL>{} );
                 rSh.GetFlyFrameAttr( aSet );
                 SwFormatURL aURL( static_cast<const SwFormatURL&>(aSet.Get( RES_URL )) );
 
@@ -388,7 +388,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
             else
             {
                 SfxItemSet aSet(GetPool(),  // sorted by indices
-                    RES_FRMATR_BEGIN,       RES_FRMATR_END-1,                       // [82
+                    svl::Items<RES_FRMATR_BEGIN,       RES_FRMATR_END-1,                       // [82
 
                     // FillAttribute support
                     XATTR_FILL_FIRST,       XATTR_FILL_LAST,                        // [1014
@@ -412,8 +412,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                     FN_SET_FRM_ALT_NAME,    FN_SET_FRM_ALT_NAME,                    // [21318
                     FN_UNO_DESCRIPTION,     FN_UNO_DESCRIPTION,                     // [21320
                     FN_OLE_IS_MATH,         FN_MATH_BASELINE_ALIGNMENT,             // [22314
-                    FN_PARAM_CHAIN_PREVIOUS, FN_PARAM_CHAIN_NEXT,                   // [22420
-                    0);
+                    FN_PARAM_CHAIN_PREVIOUS, FN_PARAM_CHAIN_NEXT>{});               // [22420
 
                 // create needed items for XPropertyList entries from the DrawModel so that
                 // the Area TabPage can access them
@@ -512,11 +511,10 @@ void SwFrameShell::Execute(SfxRequest &rReq)
                             // Anything which is not supported by the format must be set hard.
                             if(SfxItemState::SET == pOutSet->GetItemState(FN_SET_FRM_NAME, false, &pItem))
                                 rSh.SetFlyName(static_cast<const SfxStringItem*>(pItem)->GetValue());
-                            SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE,   RES_FRM_SIZE,
+                            SfxItemSet aShellSet(GetPool(), svl::Items<RES_FRM_SIZE,   RES_FRM_SIZE,
                                                             RES_SURROUND,   RES_SURROUND,
                                                             RES_ANCHOR,     RES_ANCHOR,
-                                                            RES_VERT_ORIENT,RES_HORI_ORIENT,
-                                                            0);
+                                                            RES_VERT_ORIENT,RES_HORI_ORIENT>{});
                             aShellSet.Put(*pOutSet);
                             aMgr.SetAttrSet(aShellSet);
                             if(SfxItemState::SET == pOutSet->GetItemState(FN_SET_FRM_NAME, false, &pItem))
@@ -608,7 +606,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
             SwFormatHoriOrient aHori(aMgr.GetHoriOrient());
             bool bMirror = !aHori.IsPosToggle();
             aHori.SetPosToggle(bMirror);
-            SfxItemSet aSet(GetPool(), RES_HORI_ORIENT, RES_HORI_ORIENT);
+            SfxItemSet aSet(GetPool(), svl::Items<RES_HORI_ORIENT, RES_HORI_ORIENT>{});
             aSet.Put(aHori);
             aMgr.SetAttrSet(aSet);
             bCopyToFormat = true;
@@ -693,11 +691,10 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
     if (rSh.IsFrameSelected())
     {
         SfxItemSet aSet( rSh.GetAttrPool(),
-                            RES_LR_SPACE, RES_UL_SPACE,
+                            svl::Items<RES_LR_SPACE, RES_UL_SPACE,
                             RES_PROTECT, RES_HORI_ORIENT,
                             RES_OPAQUE, RES_OPAQUE,
-                            RES_PRINT, RES_OPAQUE,
-                            0 );
+                            RES_PRINT, RES_OPAQUE>{} );
         rSh.GetFlyFrameAttr( aSet );
 
         bool bProtect = rSh.IsSelObjProtected(FlyProtectFlags::Pos) != FlyProtectFlags::NONE;
@@ -837,7 +834,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
                     SvxHyperlinkItem aHLinkItem;
                     const SfxPoolItem* pItem;
 
-                    SfxItemSet aURLSet(GetPool(), RES_URL, RES_URL);
+                    SfxItemSet aURLSet(GetPool(), svl::Items<RES_URL, RES_URL>{});
                     rSh.GetFlyFrameAttr( aURLSet );
 
                     if(SfxItemState::SET == aURLSet.GetItemState(RES_URL, true, &pItem))
@@ -992,7 +989,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
     const SvxBoxItem* pPoolBoxItem = static_cast<const SvxBoxItem*>(::GetDfltAttr(RES_BOX));
 
     const SfxItemSet *pArgs = rReq.GetArgs();
-    SfxItemSet aFrameSet(rSh.GetAttrPool(), RES_BOX, RES_BOX);
+    SfxItemSet aFrameSet(rSh.GetAttrPool(), svl::Items<RES_BOX, RES_BOX>{});
 
     rSh.GetFlyFrameAttr( aFrameSet );
     const SvxBoxItem& rBoxItem = static_cast<const SvxBoxItem&>(aFrameSet.Get(RES_BOX));
@@ -1184,7 +1181,7 @@ void SwFrameShell::GetLineStyleState(SfxItemSet &rSet)
     {
         if (rSh.IsFrameSelected())
         {
-            SfxItemSet aFrameSet( rSh.GetAttrPool(), RES_BOX, RES_BOX );
+            SfxItemSet aFrameSet( rSh.GetAttrPool(), svl::Items<RES_BOX, RES_BOX>{} );
 
             rSh.GetFlyFrameAttr(aFrameSet);
 
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 2c8d69346959..8d228f5d17bc 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -151,7 +151,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
                     convertTwipToMm100(rSh.GetAnyCurRect(CurRectType::FlyEmbedded).Width()),
                     convertTwipToMm100(rSh.GetAnyCurRect(CurRectType::FlyEmbedded).Height()));
 
-                SfxItemSet aSet( rSh.GetAttrPool(), RES_GRFATR_MIRRORGRF, RES_GRFATR_CROPGRF );
+                SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_GRFATR_MIRRORGRF, RES_GRFATR_CROPGRF>{} );
                 rSh.GetCurAttr( aSet );
                 SwMirrorGrf aMirror( static_cast<const SwMirrorGrf&>( aSet.Get(RES_GRFATR_MIRRORGRF)) );
                 SwCropGrf aCrop( static_cast<const SwCropGrf&>( aSet.Get(RES_GRFATR_CROPGRF)) );
@@ -220,7 +220,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
 
             SfxItemSet aSet(GetPool(), // sorted by indices
 
-                RES_FRMATR_BEGIN,RES_FRMATR_END - 1,                            // [   82
+                svl::Items<RES_FRMATR_BEGIN,RES_FRMATR_END - 1,                            // [   82
                 RES_GRFATR_MIRRORGRF,RES_GRFATR_CROPGRF,                        // [  123
 
                 // FillAttribute support
@@ -244,8 +244,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
                 FN_SET_FRM_NAME,FN_KEEP_ASPECT_RATIO,                           // [21306
                 FN_SET_FRM_ALT_NAME,FN_SET_FRM_ALT_NAME,                        // [21318
                 SID_REFERER,            SID_REFERER,
-                FN_UNO_DESCRIPTION, FN_UNO_DESCRIPTION,                         // [21320
-                0);
+                FN_UNO_DESCRIPTION, FN_UNO_DESCRIPTION>{});                     // [21320
 
             // create needed items for XPropertyList entries from the DrawModel so that
             // the Area TabPage can access them
@@ -329,7 +328,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
             // get Mirror and Crop
             {
                 SfxItemSet aTmpSet( rSh.GetAttrPool(),
-                                RES_GRFATR_MIRRORGRF, RES_GRFATR_CROPGRF );
+                                svl::Items<RES_GRFATR_MIRRORGRF, RES_GRFATR_CROPGRF>{} );
 
                 rSh.GetCurAttr( aTmpSet );
                 aSet.Put( aTmpSet );
@@ -389,11 +388,10 @@ void SwGrfShell::Execute(SfxRequest &rReq)
                 if(pFormat && pFormat->IsAutoUpdateFormat())
                 {
                     pFormat->SetFormatAttr(*pSet);
-                    SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE,   RES_FRM_SIZE,
+                    SfxItemSet aShellSet(GetPool(), svl::Items<RES_FRM_SIZE,   RES_FRM_SIZE,
                                                     RES_SURROUND,   RES_SURROUND,
                                                     RES_ANCHOR,     RES_ANCHOR,
-                                                    RES_VERT_ORIENT,RES_HORI_ORIENT,
-                                                    0);
+                                                    RES_VERT_ORIENT,RES_HORI_ORIENT>{});
                     aShellSet.Put(*pSet);
                     aMgr.SetAttrSet(aShellSet);
                 }
@@ -461,8 +459,8 @@ void SwGrfShell::Execute(SfxRequest &rReq)
                                         FN_UNO_DESCRIPTION, true, &pItem ))
                     rSh.SetObjDescription( static_cast<const SfxStringItem*>(pItem)->GetValue() );
 
-                SfxItemSet aGrfSet( rSh.GetAttrPool(), RES_GRFATR_BEGIN,
-                                                       RES_GRFATR_END-1 );
+                SfxItemSet aGrfSet( rSh.GetAttrPool(), svl::Items<RES_GRFATR_BEGIN,
+                                                       RES_GRFATR_END-1>{} );
                 aGrfSet.Put( *pSet );
                 if( aGrfSet.Count() )
                     rSh.SetAttrSet( aGrfSet );
@@ -475,7 +473,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
 
         case FN_GRAPHIC_MIRROR_ON_EVEN_PAGES:
         {
-            SfxItemSet aSet(rSh.GetAttrPool(), RES_GRFATR_MIRRORGRF, RES_GRFATR_MIRRORGRF);
+            SfxItemSet aSet(rSh.GetAttrPool(), svl::Items<RES_GRFATR_MIRRORGRF, RES_GRFATR_MIRRORGRF>{});
             rSh.GetCurAttr( aSet );
             SwMirrorGrf aGrf(static_cast<const SwMirrorGrf &>(aSet.Get(RES_GRFATR_MIRRORGRF)));
             aGrf.SetGrfToggle(!aGrf.IsGrfToggle());
@@ -506,8 +504,8 @@ void SwGrfShell::ExecAttr( SfxRequest &rReq )
     if (GraphicType::Bitmap == nGrfType ||
         GraphicType::GdiMetafile == nGrfType)
     {
-        SfxItemSet aGrfSet( GetShell().GetAttrPool(), RES_GRFATR_BEGIN,
-                                                      RES_GRFATR_END -1 );
+        SfxItemSet aGrfSet( GetShell().GetAttrPool(), svl::Items<RES_GRFATR_BEGIN,
+                                                      RES_GRFATR_END -1>{} );
         const SfxItemSet *pArgs = rReq.GetArgs();
         const SfxPoolItem* pItem;
         sal_uInt16 nSlot = rReq.GetSlot();
@@ -878,7 +876,7 @@ void SwGrfShell::ExecuteRotation(SfxRequest &rReq)
     Size aSize(nRotatedWidth, nRotatedHeight);
     aManager.SetSize(aSize);
     aManager.UpdateFlyFrame();
-    SfxItemSet aSet( rShell.GetAttrPool(), RES_GRFATR_CROPGRF, RES_GRFATR_CROPGRF );
+    SfxItemSet aSet( rShell.GetAttrPool(), svl::Items<RES_GRFATR_CROPGRF, RES_GRFATR_CROPGRF>{} );
     rShell.GetCurAttr( aSet );
     SwCropGrf aCrop( static_cast<const SwCropGrf&>( aSet.Get(RES_GRFATR_CROPGRF) ) );
     tools::Rectangle aCropRectangle(aCrop.GetLeft(),  aCrop.GetTop(), aCrop.GetRight(), aCrop.GetBottom());
diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx
index 398105f7df71..547c6c389ea5 100644
--- a/sw/source/uibase/shells/langhelper.cxx
+++ b/sw/source/uibase/shells/langhelper.cxx
@@ -405,7 +405,7 @@ namespace SwLangHelper
     ///     RES_CHRATR_LANGUAGE, RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CTL_LANGUAGE,
     LanguageType GetLanguage( SwWrtShell &rSh, sal_uInt16 nLangWhichId )
     {
-        SfxItemSet aSet( rSh.GetAttrPool(), nLangWhichId, nLangWhichId );
+        SfxItemSet aSet( rSh.GetAttrPool(), {{nLangWhichId, nLangWhichId}} );
         rSh.GetCurAttr( aSet );
 
         return GetLanguage(aSet,nLangWhichId);
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index f049202a95d2..83fe0b2a458d 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -134,7 +134,7 @@ const sal_uInt16* SwuiGetUITableAttrRange()
 
 static void lcl_SetAttr( SwWrtShell &rSh, const SfxPoolItem &rItem )
 {
-    SfxItemSet aSet( rSh.GetView().GetPool(), rItem.Which(), rItem.Which(), 0);
+    SfxItemSet aSet( rSh.GetView().GetPool(), {{rItem.Which(), rItem.Which()}});
     aSet.Put( rItem );
     rSh.SetTableAttr( aSet );
 }
@@ -361,7 +361,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
     bool bTabCols = false;
     SwTableRep* pRep = nullptr;
     SwFrameFormat *pFormat = rSh.GetTableFormat();
-    SfxItemSet aSet( rSh.GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
+    SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} );
     if(SfxItemState::SET == rSet.GetItemState( FN_TABLE_REP, false, &pItem ))
     {
         pRep = static_cast<SwTableRep*>(static_cast<const SwPtrItem*>(pItem)->GetValue());
@@ -474,9 +474,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
             // Create items, because we have to rework anyway.
             SvxBoxItem     aBox( RES_BOX );
             SfxItemSet aCoreSet( GetPool(),
-                            RES_BOX, RES_BOX,
-                            SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
-                            0);
+                            svl::Items<RES_BOX, RES_BOX,
+                            SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{});
             SvxBoxInfoItem aCoreInfo( SID_ATTR_BORDER_INNER );
             aCoreSet.Put(aCoreInfo);
             rSh.GetTabBorders( aCoreSet );
@@ -641,14 +640,12 @@ void SwTableShell::Execute(SfxRequest &rReq)
                 SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)));
                 SvNumberFormatter* pFormatter = rSh.GetNumberFormatter();
                 SfxItemSet aCoreSet( GetPool(),
-                                 SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE,
-                                 SID_ATTR_NUMBERFORMAT_INFO, SID_ATTR_NUMBERFORMAT_INFO,
-                                 0 );
+                                 svl::Items<SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE,
+                                 SID_ATTR_NUMBERFORMAT_INFO, SID_ATTR_NUMBERFORMAT_INFO>{} );
 
                 SfxItemSet aBoxSet( *aCoreSet.GetPool(),
-                                    RES_BOXATR_FORMAT, RES_BOXATR_FORMAT,
-                                    RES_BOXATR_VALUE, RES_BOXATR_VALUE,
-                                    0 );
+                                    svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_FORMAT,
+                                    RES_BOXATR_VALUE, RES_BOXATR_VALUE>{} );
                 rSh.GetTableBoxFormulaAttrs( aBoxSet );
 
                 SfxItemState eState = aBoxSet.GetItemState(RES_BOXATR_FORMAT);
@@ -695,7 +692,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
                         SID_ATTR_NUMBERFORMAT_VALUE, false, &pNumberFormatItem ))
                     {
                         SfxItemSet aBoxFormatSet( *aCoreSet.GetPool(),
-                                    RES_BOXATR_FORMAT, RES_BOXATR_FORMAT );
+                                    svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_FORMAT>{} );
                         aBoxFormatSet.Put( SwTableBoxNumFormat(
                                 static_cast<const SfxUInt32Item*>(pNumberFormatItem)->GetValue() ));
                         rSh.SetTableBoxFormulaAttrs( aBoxFormatSet );
@@ -923,8 +920,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
                 {
                     const SvxBoxInfoItem aBoxInfo(static_cast<const SvxBoxInfoItem&>(
                         aCoreSet.Get(SID_ATTR_BORDER_INNER)));
-                    SfxItemSet aSet( GetPool(), SID_ATTR_BORDER_INNER,
-                                                SID_ATTR_BORDER_INNER, 0);
+                    SfxItemSet aSet( GetPool(), svl::Items<SID_ATTR_BORDER_INNER,
+                                                SID_ATTR_BORDER_INNER>{});
                     aSet.Put( aBoxInfo );
                     ItemSetToTableParam( aSet, rSh );
                     rSh.EndUndo( nUndoId );
@@ -1139,8 +1136,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
         case SID_ATTR_LRSPACE:
             if(pItem)
             {
-                SfxItemSet aSet( GetPool(), RES_LR_SPACE, RES_LR_SPACE,
-                                            RES_HORI_ORIENT, RES_HORI_ORIENT, 0 );
+                SfxItemSet aSet( GetPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE,
+                                            RES_HORI_ORIENT, RES_HORI_ORIENT>{} );
                 SvxLRSpaceItem aLRSpace( *static_cast<const SvxLRSpaceItem*>(pItem) );
                 aLRSpace.SetWhich( RES_LR_SPACE );
                 aSet.Put( aLRSpace );
@@ -1174,7 +1171,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
             if ( pItem )
             {
                 SwFormatLayoutSplit aSplit( static_cast<const SvxFormatSplitItem*>(pItem)->GetValue());
-                SfxItemSet aSet(GetPool(),  RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT, 0 );
+                SfxItemSet aSet(GetPool(),  svl::Items<RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT>{} );
                 aSet.Put(aSplit);
                 rSh.SetTableAttr(aSet);
             }
@@ -1185,7 +1182,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
             {
                 SvxFormatKeepItem aKeep( *static_cast<const SvxFormatKeepItem*>(pItem) );
                 aKeep.SetWhich( RES_KEEP );
-                SfxItemSet aSet(GetPool(),  RES_KEEP, RES_KEEP, 0 );
+                SfxItemSet aSet(GetPool(),  svl::Items<RES_KEEP, RES_KEEP>{} );
                 aSet.Put(aKeep);
                 rSh.SetTableAttr(aSet);
             }
@@ -1409,8 +1406,8 @@ SwTableShell::SwTableShell(SwView &_rView) :
 void SwTableShell::GetFrameBorderState(SfxItemSet &rSet)
 {
     SfxItemSet aCoreSet( GetPool(),
-                         RES_BOX, RES_BOX,
-                         SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, 0 );
+                         svl::Items<RES_BOX, RES_BOX,
+                         SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{} );
     SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
     aCoreSet.Put( aBoxInfo );
     GetShell().GetTabBorders( aCoreSet );
@@ -1449,8 +1446,8 @@ void SwTableShell::ExecTableStyle(SfxRequest& rReq)
 void SwTableShell::GetLineStyleState(SfxItemSet &rSet)
 {
     SfxItemSet aCoreSet( GetPool(),
-                            RES_BOX, RES_BOX,
-                            SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, 0);
+                            svl::Items<RES_BOX, RES_BOX,
+                            SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{});
     SvxBoxInfoItem aCoreInfo( SID_ATTR_BORDER_INNER );
     aCoreSet.Put(aCoreInfo);
     GetShell().GetTabBorders( aCoreSet );
@@ -1522,7 +1519,7 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq)
 
     if( NUMBERFORMAT_ENTRY_NOT_FOUND != nNumberFormat )
     {
-        SfxItemSet aBoxSet( GetPool(), RES_BOXATR_FORMAT, RES_BOXATR_FORMAT );
+        SfxItemSet aBoxSet( GetPool(), svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_FORMAT>{} );
         aBoxSet.Put( SwTableBoxNumFormat( nNumberFormat ));
         rSh.SetTableBoxFormulaAttrs( aBoxSet );
     }
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 1fe73b0478ff..c8a963a0e7a9 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -903,7 +903,7 @@ void SwTextShell::InsertHyperlink(const SvxHyperlinkItem& rHlnkItem)
     if( rSh.GetSelectionType() & SelectionType::Text )
     {
         rSh.StartAction();
-        SfxItemSet aSet(GetPool(), RES_TXTATR_INETFMT, RES_TXTATR_INETFMT);
+        SfxItemSet aSet(GetPool(), svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{});
         rSh.GetCurAttr( aSet );
 
         const SfxPoolItem* pItem;
diff --git a/sw/source/uibase/shells/textidx.cxx b/sw/source/uibase/shells/textidx.cxx
index 259b381e7e14..3166b4a83b4a 100644
--- a/sw/source/uibase/shells/textidx.cxx
+++ b/sw/source/uibase/shells/textidx.cxx
@@ -106,13 +106,12 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
         case FN_INSERT_MULTI_TOX:
         {
             SfxItemSet aSet(GetPool(),
-                            RES_COL, RES_COL,
+                            svl::Items<RES_COL, RES_COL,
                             RES_BACKGROUND, RES_BACKGROUND,
                             RES_FRM_SIZE, RES_FRM_SIZE,
                             SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE,
                             RES_LR_SPACE, RES_LR_SPACE,
-                            FN_PARAM_TOX_TYPE, FN_PARAM_TOX_TYPE,
-                            0   );
+                            FN_PARAM_TOX_TYPE, FN_PARAM_TOX_TYPE>{}   );
             SwWrtShell& rSh = GetShell();
             SwRect aRect;
             rSh.CalcBoundRect(aRect, RndStdIds::FLY_AS_CHAR);
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index da3af66a4209..87bfca3b4d05 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -636,7 +636,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
 
             case SID_HYPERLINK_GETLINK:
                 {
-                    SfxItemSet aSet(GetPool(), RES_TXTATR_INETFMT, RES_TXTATR_INETFMT);
+                    SfxItemSet aSet(GetPool(), svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{});
                     rSh.GetCurAttr( aSet );
 
                     SvxHyperlinkItem aHLinkItem;
@@ -899,10 +899,9 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
     }
 
     SwWrtShell &rSh = GetShell();
-    SfxItemSet aSet( GetPool(), RES_CHRATR_FONT, RES_CHRATR_FONT,
+    SfxItemSet aSet( GetPool(), svl::Items<RES_CHRATR_FONT, RES_CHRATR_FONT,
                                 RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_FONT,
-                                RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT,
-                                0 );
+                                RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT>{} );
     rSh.GetCurAttr( aSet );
     SvtScriptType nScript = rSh.GetScriptType();
 
@@ -999,9 +998,9 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
             aNewFontItem.SetPitch(   aNewFont.GetPitch());
             aNewFontItem.SetCharSet( aNewFont.GetCharSet() );
 
-            SfxItemSet aRestoreSet( GetPool(), RES_CHRATR_FONT, RES_CHRATR_FONT,
+            SfxItemSet aRestoreSet( GetPool(), svl::Items<RES_CHRATR_FONT, RES_CHRATR_FONT,
                                                RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_FONT,
-                                               RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT, 0 );
+                                               RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT>{} );
 
             nScript = g_pBreakIt->GetAllScriptsOfText( aChars );
             if( SvtScriptType::LATIN & nScript )
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index c5f284426d15..0d2cc4239296 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -126,7 +126,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const
     FieldUnit eMetric = ::GetDfltMetric(dynamic_cast<SwWebView*>( &rWrtSh.GetView()) != nullptr );
     SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)));
     SfxItemSet aCoreSet( rWrtSh.GetView().GetPool(),
-                        RES_CHRATR_BEGIN,      RES_CHRATR_END-1,
+                        svl::Items<RES_CHRATR_BEGIN,      RES_CHRATR_END-1,
                         RES_TXTATR_INETFMT,    RES_TXTATR_INETFMT,
                         RES_BACKGROUND,        RES_BACKGROUND,
                         RES_BOX,               RES_BOX,
@@ -134,8 +134,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const
                         SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
                         FN_PARAM_SELECTION,    FN_PARAM_SELECTION,
                         SID_HTML_MODE,         SID_HTML_MODE,
-                        SID_ATTR_CHAR_WIDTH_FIT_TO_LINE,   SID_ATTR_CHAR_WIDTH_FIT_TO_LINE,
-                        0 );
+                        SID_ATTR_CHAR_WIDTH_FIT_TO_LINE,   SID_ATTR_CHAR_WIDTH_FIT_TO_LINE>{} );
     rWrtSh.GetCurAttr( aCoreSet );
     bool bSel = rWrtSh.HasSelection();
     bool bSelectionPut = false;
@@ -359,10 +358,9 @@ void SwTextShell::Execute(SfxRequest &rReq)
                     const OUString aStrResetLangs("RESET_LANGUAGES");
 
                     SfxItemSet aCoreSet( GetPool(),
-                            RES_CHRATR_LANGUAGE,        RES_CHRATR_LANGUAGE,
+                            svl::Items<RES_CHRATR_LANGUAGE,        RES_CHRATR_LANGUAGE,
                             RES_CHRATR_CJK_LANGUAGE,    RES_CHRATR_CJK_LANGUAGE,
-                            RES_CHRATR_CTL_LANGUAGE,    RES_CHRATR_CTL_LANGUAGE,
-                            0 );
+                            RES_CHRATR_CTL_LANGUAGE,    RES_CHRATR_CTL_LANGUAGE>{} );
 
                     sal_Int32 nPos = 0;
                     bool bForSelection = true;
@@ -464,7 +462,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             if ( bFont )
             {
                 rWrtSh.Left( CRSR_SKIP_CHARS, true, 1, false );
-                SfxItemSet aSet( rWrtSh.GetAttrPool(), RES_CHRATR_FONT, RES_CHRATR_FONT );
+                SfxItemSet aSet( rWrtSh.GetAttrPool(), svl::Items<RES_CHRATR_FONT, RES_CHRATR_FONT>{} );
                 rWrtSh.GetCurAttr( aSet );
                 rWrtSh.SetAttrSet( aSet, SetAttrMode::DONTEXPAND );
                 rWrtSh.ResetSelect(nullptr, false);
@@ -782,7 +780,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 {
                     if( rWrtSh.IsCursorInTable() )
                     {
-                        SfxItemSet aSet( rWrtSh.GetAttrPool(), RES_BOXATR_FORMULA, RES_BOXATR_FORMULA );
+                        SfxItemSet aSet( rWrtSh.GetAttrPool(), svl::Items<RES_BOXATR_FORMULA, RES_BOXATR_FORMULA>{} );
                         aSet.Put( SwTableBoxFormula( sFormula ));
                         rWrtSh.SetTableBoxFormulaAttrs( aSet );
                         rWrtSh.UpdateTable();
@@ -907,7 +905,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             SW_MOD()->PutItem(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, bApplyCharUnit));
 
             SfxItemSet aCoreSet( GetPool(), // sorted by indices, one group of three concatenated
-                            RES_PARATR_BEGIN,           RES_PARATR_END - 1,         // [60
+                            svl::Items<RES_PARATR_BEGIN,           RES_PARATR_END - 1,         // [60
                             RES_PARATR_LIST_BEGIN,      RES_PARATR_LIST_END - 1,    // [77
                             RES_FRMATR_BEGIN,           RES_FRMATR_END - 1,         // [82
 
@@ -929,8 +927,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                             SID_ATTR_PARA_PAGENUM,      SID_ATTR_PARA_PAGENUM,      // [10457
                             FN_PARAM_1,                 FN_PARAM_1,                 // [21160
                             FN_NUMBER_NEWSTART,         FN_NUMBER_NEWSTART_AT,      // [21738
-                            FN_DROP_TEXT,               FN_DROP_CHAR_STYLE_NAME,    // [22418
-                            0);
+                            FN_DROP_TEXT,               FN_DROP_CHAR_STYLE_NAME>{});// [22418
 
             // get also the list level indent values merged as LR-SPACE item, if needed.
             rWrtSh.GetPaMAttr( pPaM, aCoreSet, true );
@@ -1211,7 +1208,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                     rWrtSh.SetAttrItem( SvxBrushItem(RES_CHRATR_HIGHLIGHT) );
 
                     // Remove shading marker
-                    SfxItemSet aCoreSet( rWrtSh.GetView().GetPool(), RES_CHRATR_GRABBAG, RES_CHRATR_GRABBAG );
+                    SfxItemSet aCoreSet( rWrtSh.GetView().GetPool(), svl::Items<RES_CHRATR_GRABBAG, RES_CHRATR_GRABBAG>{} );
                     rWrtSh.GetCurAttr( aCoreSet );
 
                     const SfxPoolItem *pTmpItem;
@@ -1311,8 +1308,8 @@ void SwTextShell::Execute(SfxRequest &rReq)
     case FN_COPY_HYPERLINK_LOCATION:
     {
         SfxItemSet aSet(GetPool(),
-                        RES_TXTATR_INETFMT,
-                        RES_TXTATR_INETFMT);
+                        svl::Items<RES_TXTATR_INETFMT,
+                        RES_TXTATR_INETFMT>{});
         rWrtSh.GetCurAttr(aSet);
         if(SfxItemState::SET <= aSet.GetItemState( RES_TXTATR_INETFMT ))
         {
@@ -1666,8 +1663,8 @@ void SwTextShell::GetState( SfxItemSet &rSet )
             case FN_COPY_HYPERLINK_LOCATION:
                 {
                     SfxItemSet aSet(GetPool(),
-                        RES_TXTATR_INETFMT,
-                        RES_TXTATR_INETFMT);
+                        svl::Items<RES_TXTATR_INETFMT,
+                        RES_TXTATR_INETFMT>{});
                     rSh.GetCurAttr(aSet);
                     if(SfxItemState::SET > aSet.GetItemState( RES_TXTATR_INETFMT ) || rSh.HasReadonlySel())
                     {
@@ -1678,8 +1675,8 @@ void SwTextShell::GetState( SfxItemSet &rSet )
             case FN_REMOVE_HYPERLINK:
             {
                 SfxItemSet aSet(GetPool(),
-                                RES_TXTATR_INETFMT,
-                                RES_TXTATR_INETFMT);
+                                svl::Items<RES_TXTATR_INETFMT,
+                                RES_TXTATR_INETFMT>{});
                 rSh.GetCurAttr(aSet);
 
                 // If a hyperlink is selected, either alone or along with other text...
@@ -1721,8 +1718,8 @@ void SwTextShell::GetState( SfxItemSet &rSet )
             case  SID_OPEN_HYPERLINK:
             {
                 SfxItemSet aSet(GetPool(),
-                                RES_TXTATR_INETFMT,
-                                RES_TXTATR_INETFMT);
+                                svl::Items<RES_TXTATR_INETFMT,
+                                RES_TXTATR_INETFMT>{});
                 rSh.GetCurAttr(aSet);
                 if(SfxItemState::SET > aSet.GetItemState( RES_TXTATR_INETFMT, false ))
                     rSet.DisableItem(nWhich);
diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx
index a2313ff8bca3..647a733d93cd 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -78,7 +78,7 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
                                 Get( nWhich )).GetValue() ? STATE_ON : STATE_OFF;
     }
 
-    SfxItemSet aSet( GetPool(), RES_CHRATR_BEGIN, RES_CHRATR_END-1 );
+    SfxItemSet aSet( GetPool(), svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END-1>{} );
     if (STATE_TOGGLE == eState)
         rSh.GetCurAttr( aSet );
 
@@ -312,9 +312,8 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq)
 
     // Get both attributes immediately isn't more expensive!!
     SfxItemSet aSet( GetPool(),
-        RES_PARATR_LINESPACING, RES_PARATR_ADJUST,
-        RES_FRAMEDIR, RES_FRAMEDIR,
-        0 );
+        svl::Items<RES_PARATR_LINESPACING, RES_PARATR_ADJUST,
+        RES_FRAMEDIR, RES_FRAMEDIR>{} );
 
     sal_uInt16 nSlot = rReq.GetSlot();
     switch (nSlot)
@@ -375,7 +374,7 @@ SET_LINESPACE:
         case SID_ATTR_PARA_RIGHT_TO_LEFT :
         {
             SfxItemSet aAdjustSet( GetPool(),
-                    RES_PARATR_ADJUST, RES_PARATR_ADJUST );
+                    svl::Items<RES_PARATR_ADJUST, RES_PARATR_ADJUST>{} );
             GetShell().GetCurAttr(aAdjustSet);
             bool bChgAdjust = false;
             SfxItemState eAdjustState = aAdjustSet.GetItemState(RES_PARATR_ADJUST, false);
@@ -460,7 +459,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
             if( pItem )
             {
                 OUString sCharStyleName = static_cast<const SfxStringItem*>(pItem)->GetValue();
-                SfxItemSet aSet(GetPool(), RES_PARATR_DROP, RES_PARATR_DROP, 0L);
+                SfxItemSet aSet(GetPool(), svl::Items<RES_PARATR_DROP, RES_PARATR_DROP>{});
                 rSh.GetCurAttr(aSet);
                 SwFormatDrop aDropItem(static_cast<const SwFormatDrop&>(aSet.Get(RES_PARATR_DROP)));
                 SwCharFormat* pFormat = nullptr;
@@ -480,8 +479,8 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
             }
             else
             {
-                SfxItemSet aSet(GetPool(), RES_PARATR_DROP, RES_PARATR_DROP,
-                                           HINT_END, HINT_END, 0);
+                SfxItemSet aSet(GetPool(), svl::Items<RES_PARATR_DROP, RES_PARATR_DROP,
+                                           HINT_END, HINT_END>{});
                 rSh.GetCurAttr(aSet);
                 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
                 OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
@@ -518,8 +517,8 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
             if(pItem)
             {
                 SfxItemSet aCoreSet( GetPool(),
-                    RES_PAGEDESC,   RES_PAGEDESC,
-                    SID_ATTR_PARA_MODEL, SID_ATTR_PARA_MODEL, 0);
+                    svl::Items<RES_PAGEDESC,   RES_PAGEDESC,
+                    SID_ATTR_PARA_MODEL, SID_ATTR_PARA_MODEL>{});
                 aCoreSet.Put(*pItem);
                 SfxToSwPageDescAttr( rSh, aCoreSet);
                 rSh.SetAttrSet(aCoreSet);
@@ -787,9 +786,8 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
             case SID_ATTR_PARA_MODEL:
             {
                 SfxItemSet aTemp(GetPool(),
-                        RES_PAGEDESC,RES_PAGEDESC,
-                        SID_ATTR_PARA_MODEL,SID_ATTR_PARA_MODEL,
-                        0L);
+                        svl::Items<RES_PAGEDESC,RES_PAGEDESC,
+                        SID_ATTR_PARA_MODEL,SID_ATTR_PARA_MODEL>{});
                 aTemp.Put(aCoreSet);
                 ::SwToSfxPageDescAttr(aTemp);
                 rSet.Put(aTemp.Get(SID_ATTR_PARA_MODEL));
@@ -798,7 +796,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
             break;
             case RES_TXTATR_INETFMT:
             {
-                SfxItemSet aSet(GetPool(), RES_TXTATR_INETFMT, RES_TXTATR_INETFMT);
+                SfxItemSet aSet(GetPool(), svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{});
                 rSh.GetCurAttr(aSet);
                 const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT);
                 rSet.Put(rItem);
diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx
index 2e19f7816ac7..a435c410e7a4 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -112,9 +112,8 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
     case SID_OUTLINE_BULLET:
     {
         SfxItemSet aSet( GetPool(),
-                         SID_HTML_MODE, SID_HTML_MODE,
-                         SID_ATTR_NUMBERING_RULE, SID_PARAM_CUR_NUM_LEVEL,
-                         0 );
+                         svl::Items<SID_HTML_MODE, SID_HTML_MODE,
+                         SID_ATTR_NUMBERING_RULE, SID_PARAM_CUR_NUM_LEVEL>{} );
         SwDocShell* pDocSh = GetView().GetDocShell();
         const bool bHtml = dynamic_cast<SwWebDocShell*>( pDocSh  ) !=  nullptr;
         const SwNumRule* pNumRuleAtCurrentSelection = GetShell().GetNumRuleAtCurrentSelection();