summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2021-07-19 11:04:45 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2021-07-19 16:33:01 +0200
commitb1668edf7fa3ad8c32bcc4d73821770f2df011ca (patch)
treecb93a00ca59f770e616668af15fdc6a50e1627a1 /sw/source/uibase
parent5b3c530016927d3e91e3124e124f7b428ab285ac (diff)
Move svl::Items to include/svl/whichranges.hxx, and unify its usage
... in WhichRangesContainer and SfxItemSet ctors. Now it's not needed to explicitly use 'value' in WhichRangesContainer's ctor, or create an instance for use in SfxItemSet ctor (svl::Items is already defined as a template value of corresponding type). Instead of WhichRangesContainer Foo(svl::Items<1, 2>::value); SfxItemSet Bar(rItemPool, svl::Items<1, 2>{}); now use: WhichRangesContainer Foo(svl::Items<1, 2>); SfxItemSet Bar(rItemPool, svl::Items<1, 2>); Change-Id: I4681d952b6442732025e5a26768098878907a238 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119157 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/app/appenv.cxx4
-rw-r--r--sw/source/uibase/app/applab.cxx6
-rw-r--r--sw/source/uibase/app/appopt.cxx2
-rw-r--r--sw/source/uibase/app/docsh2.cxx2
-rw-r--r--sw/source/uibase/app/docshini.cxx4
-rw-r--r--sw/source/uibase/app/docstyle.cxx2
-rw-r--r--sw/source/uibase/dialog/regionsw.cxx4
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx20
-rw-r--r--sw/source/uibase/docvw/PageBreakWin.cxx2
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx2
-rw-r--r--sw/source/uibase/docvw/UnfloatTableButton.cxx2
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx4
-rw-r--r--sw/source/uibase/fldui/fldmgr.cxx2
-rw-r--r--sw/source/uibase/frmdlg/colex.cxx6
-rw-r--r--sw/source/uibase/frmdlg/frmmgr.cxx4
-rw-r--r--sw/source/uibase/inc/tabsh.hxx1
-rw-r--r--sw/source/uibase/lingu/hhcwrp.cxx4
-rw-r--r--sw/source/uibase/lingu/olmenu.cxx2
-rw-r--r--sw/source/uibase/misc/glshell.cxx2
-rw-r--r--sw/source/uibase/ribbar/concustomshape.cxx2
-rw-r--r--sw/source/uibase/ribbar/conrect.cxx2
-rw-r--r--sw/source/uibase/ribbar/drawbase.cxx2
-rw-r--r--sw/source/uibase/ribbar/inputwin.cxx2
-rw-r--r--sw/source/uibase/shells/annotsh.cxx8
-rw-r--r--sw/source/uibase/shells/basesh.cxx38
-rw-r--r--sw/source/uibase/shells/drawsh.cxx2
-rw-r--r--sw/source/uibase/shells/drwbassh.cxx4
-rw-r--r--sw/source/uibase/shells/drwtxtex.cxx8
-rw-r--r--sw/source/uibase/shells/drwtxtsh.cxx2
-rw-r--r--sw/source/uibase/shells/frmsh.cxx20
-rw-r--r--sw/source/uibase/shells/grfsh.cxx22
-rw-r--r--sw/source/uibase/shells/tabsh.cxx26
-rw-r--r--sw/source/uibase/shells/textfld.cxx2
-rw-r--r--sw/source/uibase/shells/textidx.cxx2
-rw-r--r--sw/source/uibase/shells/textsh.cxx8
-rw-r--r--sw/source/uibase/shells/textsh1.cxx26
-rw-r--r--sw/source/uibase/shells/txtattr.cxx16
-rw-r--r--sw/source/uibase/shells/txtnum.cxx2
-rw-r--r--sw/source/uibase/uiview/formatclipboard.cxx8
-rw-r--r--sw/source/uibase/uiview/pview.cxx4
-rw-r--r--sw/source/uibase/uiview/view0.cxx2
-rw-r--r--sw/source/uibase/uiview/view2.cxx4
-rw-r--r--sw/source/uibase/uiview/viewdraw.cxx4
-rw-r--r--sw/source/uibase/uiview/viewprt.cxx2
-rw-r--r--sw/source/uibase/uiview/viewsrch.cxx4
-rw-r--r--sw/source/uibase/uiview/viewtab.cxx42
-rw-r--r--sw/source/uibase/uno/SwXDocumentSettings.cxx2
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx6
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx2
-rw-r--r--sw/source/uibase/utlui/numfmtlb.cxx2
-rw-r--r--sw/source/uibase/utlui/uitool.cxx8
-rw-r--r--sw/source/uibase/wrtsh/delete.cxx4
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx8
53 files changed, 186 insertions, 185 deletions
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index 5e295b22a46a..dd2fbb02d5ea 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -167,7 +167,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
// Check if there's already an envelope.
bool bEnvChange = false;
- SfxItemSet aSet(GetPool(), svl::Items<FN_ENVELOP, FN_ENVELOP>{});
+ SfxItemSet aSet(GetPool(), svl::Items<FN_ENVELOP, FN_ENVELOP>);
aSet.Put(aEnvCfg.GetItem());
SfxPrinter* pTempPrinter = pSh->getIDocumentDeviceAccess().getPrinter( true );
@@ -282,7 +282,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
{
pSh->SplitNode();
pSh->Right( CRSR_SKIP_CHARS, false, 1, false );
- SfxItemSet aBreakSet( pSh->GetAttrPool(), svl::Items<RES_PAGEDESC, RES_PAGEDESC>{} );
+ SfxItemSet aBreakSet( pSh->GetAttrPool(), svl::Items<RES_PAGEDESC, RES_PAGEDESC> );
aBreakSet.Put( SwFormatPageDesc( pFollow ) );
pSh->SetTableAttr( aBreakSet );
}
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index 8c6a450737de..b2422fdd7bf4 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -69,7 +69,7 @@ static const SwFrameFormat *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem&
sal_uInt16 nCol, sal_uInt16 nRow )
{
SfxItemSet aSet(
- rSh.GetAttrPool(), svl::Items<RES_VERT_ORIENT, RES_ANCHOR>{});
+ rSh.GetAttrPool(), svl::Items<RES_VERT_ORIENT, RES_ANCHOR>);
sal_uInt16 nPhyPageNum, nVirtPageNum;
rSh.GetPageNum( nPhyPageNum, nVirtPageNum );
@@ -105,7 +105,7 @@ static const SwFrameFormat *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem&
sal_uInt16 nCol, sal_uInt16 nRow, bool bLast )
{
SfxItemSet aSet(
- rSh.GetAttrPool(), svl::Items<RES_VERT_ORIENT, RES_ANCHOR>{});
+ rSh.GetAttrPool(), svl::Items<RES_VERT_ORIENT, RES_ANCHOR>);
sal_uInt16 nPhyPageNum, nVirtPageNum;
rSh.GetPageNum( nPhyPageNum, nVirtPageNum );
@@ -148,7 +148,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
SwLabCfgItem aLabCfg(bLabel);
// Move up Dialog
- SfxItemSet aSet( GetPool(), svl::Items<FN_LABEL, FN_LABEL>{} );
+ SfxItemSet aSet( GetPool(), svl::Items<FN_LABEL, FN_LABEL> );
aSet.Put( aLabCfg.GetItem() );
SwAbstractDialogFactory* pDialogFactory = SwAbstractDialogFactory::Create();
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index ff3c5eb6da80..63b1df87431f 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -104,7 +104,7 @@ std::unique_ptr<SfxItemSet> SwModule::CreateItemSet( sal_uInt16 nId )
FN_PARAM_PRINTER, FN_PARAM_STDFONTS,
FN_PARAM_WRTSHELL, FN_PARAM_WRTSHELL,
FN_PARAM_SHADOWCURSOR, FN_PARAM_SHADOWCURSOR,
- FN_PARAM_CRSR_IN_PROTECTED, FN_PARAM_CRSR_IN_PROTECTED>{});
+ FN_PARAM_CRSR_IN_PROTECTED, FN_PARAM_CRSR_IN_PROTECTED>);
pRet->Put( SwDocDisplayItem( aViewOpt ) );
pRet->Put( SwElemItem( aViewOpt ) );
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 4fa73d0349d7..52fe3223a9b7 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -417,7 +417,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
pAFlags->pSmartTagMgr = &SwSmartTagMgr::Get();
- SfxItemSet aSet( pApp->GetPool(), svl::Items<SID_AUTO_CORRECT_DLG, SID_AUTO_CORRECT_DLG, SID_OPEN_SMARTTAGOPTIONS, SID_OPEN_SMARTTAGOPTIONS>{} );
+ SfxItemSet aSet( pApp->GetPool(), svl::Items<SID_AUTO_CORRECT_DLG, SID_AUTO_CORRECT_DLG, SID_OPEN_SMARTTAGOPTIONS, SID_OPEN_SMARTTAGOPTIONS> );
aSet.Put( aSwOptions );
const SfxPoolItem* pOpenSmartTagOptionsItem = nullptr;
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 85039593eb4a..5869749a04b5 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -626,7 +626,7 @@ void SwDocShell::SubInitNew()
RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_LANGUAGE,
RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_LANGUAGE,
RES_PARATR_ADJUST, RES_PARATR_ADJUST
- >::value);
+ >);
static const WhichRangesContainer nRange2(svl::Items<
RES_CHRATR_COLOR, RES_CHRATR_COLOR,
RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE,
@@ -634,7 +634,7 @@ void SwDocShell::SubInitNew()
RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_LANGUAGE,
RES_PARATR_ADJUST, RES_PARATR_ADJUST,
RES_PARATR_TABSTOP, RES_PARATR_HYPHENZONE
- >::value);
+ >);
SfxItemSet aDfltSet( m_xDoc->GetAttrPool(), bWeb ? nRange1 : nRange2 );
//! get lingu options without loading lingu DLL
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 9d441beedae7..58c5d311357b 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -444,7 +444,7 @@ SwDocStyleSheet::SwDocStyleSheet( SwDoc& rDocument,
SID_ATTR_AUTO_STYLE_UPDATE, SID_ATTR_AUTO_STYLE_UPDATE,
FN_PARAM_FTN_INFO, FN_PARAM_FTN_INFO,
FN_KEEP_ASPECT_RATIO, FN_KEEP_ASPECT_RATIO,
- FN_COND_COLL, FN_COND_COLL>{}),
+ FN_COND_COLL, FN_COND_COLL>),
m_bPhysical(false)
{
nHelpId = UCHAR_MAX;
diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx
index e53df293fda3..1fcc03bf6eb1 100644
--- a/sw/source/uibase/dialog/regionsw.cxx
+++ b/sw/source/uibase/dialog/regionsw.cxx
@@ -47,7 +47,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
RES_COL, RES_COL,
RES_FTN_AT_TXTEND, RES_FRAMEDIR,
XATTR_FILL_FIRST, XATTR_FILL_LAST,
- SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE>{});
+ SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE>);
if (!pSet || pSet->Count()==0)
{
@@ -161,7 +161,7 @@ void SwWrtShell::StartInsertRegionDialog(const SwSectionData& rSectionData)
RES_BACKGROUND, RES_BACKGROUND,
RES_COL, RES_COL,
XATTR_FILL_FIRST, XATTR_FILL_LAST,
- SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE>{});
+ SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE>);
SwRect aRect;
CalcBoundRect(aRect, RndStdIds::FLY_AS_CHAR);
tools::Long nWidth = aRect.Width();
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index f4f56326faf6..c36b6d87837b 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -539,7 +539,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
}
if( m_pWrtShell->IsFrameSelected() )
{
- SfxItemSet aSet( m_pWrtShell->GetAttrPool(), svl::Items<RES_URL, RES_URL>{} );
+ SfxItemSet aSet( m_pWrtShell->GetAttrPool(), svl::Items<RES_URL, RES_URL> );
m_pWrtShell->GetFlyFrameAttr( aSet );
const SwFormatURL& rURL = aSet.Get( RES_URL );
if( rURL.GetMap() )
@@ -1167,7 +1167,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
if( m_pWrtShell->IsFrameSelected() )
{
- SfxItemSet aSet( m_pWrtShell->GetAttrPool(), svl::Items<RES_URL, RES_URL>{} );
+ SfxItemSet aSet( m_pWrtShell->GetAttrPool(), svl::Items<RES_URL, RES_URL> );
m_pWrtShell->GetFlyFrameAttr( aSet );
const SwFormatURL& rURL = aSet.Get( RES_URL );
if( rURL.GetMap() )
@@ -2500,7 +2500,7 @@ bool SwTransferable::PasteTargetURL( TransferableDataHelper& rData,
if( bRet )
{
- SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL>{} );
+ SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL> );
rSh.GetFlyFrameAttr( aSet );
SwFormatURL aURL( aSet.Get( RES_URL ) );
@@ -2918,7 +2918,7 @@ bool SwTransferable::PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
{
if( rSh.IsFrameSelected() )
{
- SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL>{} );
+ SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL> );
rSh.GetFlyFrameAttr( aSet );
SwFormatURL aURL( aSet.Get( RES_URL ) );
aURL.SetURL( aBkmk.GetURL(), false );
@@ -2974,7 +2974,7 @@ bool SwTransferable::PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
aMap.Read( *pStream, IMapFormat::Detect ) == IMAP_ERR_OK &&
aMap.GetIMapObjectCount() )
{
- SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL>{} );
+ SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL> );
rSh.GetFlyFrameAttr( aSet );
SwFormatURL aURL( aSet.Get( RES_URL ) );
aURL.SetMap( &aMap );
@@ -2993,7 +2993,7 @@ bool SwTransferable::PasteImageMap( TransferableDataHelper& rData,
bool bRet = false;
if( rData.HasFormat( SotClipboardFormatId::SVIM ))
{
- SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL>{} );
+ SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL> );
rSh.GetFlyFrameAttr( aSet );
SwFormatURL aURL( aSet.Get( RES_URL ) );
const ImageMap* pOld = aURL.GetMap();
@@ -3034,7 +3034,7 @@ bool SwTransferable::PasteAsHyperlink( TransferableDataHelper& rData,
case OBJCNT_GRF:
case OBJCNT_OLE:
{
- SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL>{} );
+ SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL> );
rSh.GetFlyFrameAttr( aSet );
SwFormatURL aURL2( aSet.Get( RES_URL ) );
aURL2.SetURL( sFile, false );
@@ -3132,7 +3132,7 @@ bool SwTransferable::PasteFileName( TransferableDataHelper& rData,
case OBJCNT_GRF:
case OBJCNT_OLE:
{
- SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL>{} );
+ SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL> );
rSh.GetFlyFrameAttr( aSet );
SwFormatURL aURL2( aSet.Get( RES_URL ) );
aURL2.SetURL( sFile, false );
@@ -3650,7 +3650,7 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
if( !m_pWrtShell->IsFrameSelected() )
return;
- SfxItemSet aSet( m_pWrtShell->GetAttrPool(), svl::Items<RES_URL, RES_URL>{} );
+ SfxItemSet aSet( m_pWrtShell->GetAttrPool(), svl::Items<RES_URL, RES_URL> );
m_pWrtShell->GetFlyFrameAttr( aSet );
const SwFormatURL& rURL = aSet.Get( RES_URL );
if( rURL.GetMap() )
@@ -3870,7 +3870,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
// not yet consider Draw objects
if( SelectionType::Graphic & nSelection )
{
- SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL>{} );
+ SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL> );
rSh.GetFlyFrameAttr( aSet );
SwFormatURL aURL( aSet.Get( RES_URL ) );
aURL.SetURL( aTmp.GetURL(), false );
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index 6223d56057ae..ec44797fbfd2 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -320,7 +320,7 @@ void SwPageBreakWin::execute(std::string_view rIdent)
SfxItemSet aSet(
GetEditWin()->GetView().GetWrtShell().GetAttrPool(),
- svl::Items<RES_PAGEDESC, RES_BREAK>{});
+ svl::Items<RES_PAGEDESC, RES_BREAK>);
aSet.Put( SwFormatPageDesc( nullptr ) );
// This break could be from the current paragraph, if it has a PageBefore break.
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index d8b79c6e9d7e..fe85da695657 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -1671,7 +1671,7 @@ void SwPostItMgr::ExecuteFormatAllDialog(SwView& rView)
OutlinerView* pOLV = pWin->GetOutlinerView();
SfxItemSet aEditAttr(pOLV->GetAttribs());
SfxItemPool* pPool(SwAnnotationShell::GetAnnotationPool(rView));
- SfxItemSet aDlgAttr(*pPool, svl::Items<XATTR_FILLSTYLE, XATTR_FILLCOLOR, EE_ITEMS_START, EE_ITEMS_END>{});
+ SfxItemSet aDlgAttr(*pPool, svl::Items<XATTR_FILLSTYLE, XATTR_FILLCOLOR, EE_ITEMS_START, EE_ITEMS_END>);
aDlgAttr.Put(aEditAttr);
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwCharDlg(rView.GetFrameWeld(), rView, aDlgAttr, SwCharDlgMode::Ann));
diff --git a/sw/source/uibase/docvw/UnfloatTableButton.cxx b/sw/source/uibase/docvw/UnfloatTableButton.cxx
index 803c851a5dbb..e3169581c944 100644
--- a/sw/source/uibase/docvw/UnfloatTableButton.cxx
+++ b/sw/source/uibase/docvw/UnfloatTableButton.cxx
@@ -157,7 +157,7 @@ void UnfloatTableButton::MouseButtonDown(const MouseEvent& /*rMEvt*/)
{
// First set the existing page desc for the table node
SfxItemSet aSet(GetEditWin()->GetView().GetWrtShell().GetAttrPool(),
- svl::Items<RES_PAGEDESC, RES_PAGEDESC>{});
+ svl::Items<RES_PAGEDESC, RES_PAGEDESC>);
aSet.Put(SwFormatPageDesc(pPageDesc));
SwPaM aPaMTable(*pTableNode);
rDoc.getIDocumentContentOperations().InsertItemSet(
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 38413cd33d12..37c07a7290b1 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -1034,7 +1034,7 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, bool bWeb )
RES_PROTECT, RES_PROTECT,
RES_VERT_ORIENT, RES_ANCHOR,
RES_COL, RES_COL,
- RES_FOLLOW_TEXT_FLOW, RES_FOLLOW_TEXT_FLOW>{});
+ RES_FOLLOW_TEXT_FLOW, RES_FOLLOW_TEXT_FLOW>);
rSh.GetFlyFrameAttr( aSet );
RndStdIds eAnchorId = aSet.Get(RES_ANCHOR).GetAnchorId();
Size aSnap;
@@ -2236,7 +2236,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
eKeyState = SwKeyState::GoIntoFly;
else
{
- SfxItemSet aSet(rSh.GetAttrPool(), svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{});
+ SfxItemSet aSet(rSh.GetAttrPool(), svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>);
rSh.GetCurAttr(aSet);
if(SfxItemState::SET == aSet.GetItemState(RES_TXTATR_INETFMT, false))
{
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index df3bcf4a6ba3..5279ee15b144 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -1413,7 +1413,7 @@ bool SwFieldMgr::InsertField(
}
SfxItemSet aBoxSet( pCurShell->GetAttrPool(),
- svl::Items<RES_BOXATR_FORMULA, RES_BOXATR_FORMULA>{} );
+ svl::Items<RES_BOXATR_FORMULA, RES_BOXATR_FORMULA> );
OUString sFormula(comphelper::string::stripStart(rData.m_sPar2, ' '));
if ( sFormula.startsWith("=") )
diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx
index 7fee7182ebb1..9ecfb798b484 100644
--- a/sw/source/uibase/frmdlg/colex.cxx
+++ b/sw/source/uibase/frmdlg/colex.cxx
@@ -121,7 +121,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
{
// create FillAttributes from SvxBrushItem //SetHdColor(rItem.GetColor());
const SvxBrushItem& rItem = rHeaderSet.Get(RES_BACKGROUND);
- SfxItemSet aTempSet(*rHeaderSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
+ SfxItemSet aTempSet(*rHeaderSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>);
setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet);
setHeaderFillAttributes(
@@ -159,7 +159,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
{
// create FillAttributes from SvxBrushItem //SetFtColor(rItem.GetColor());
const SvxBrushItem& rItem = rFooterSet.Get(RES_BACKGROUND);
- SfxItemSet aTempSet(*rFooterSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
+ SfxItemSet aTempSet(*rFooterSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>);
setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet);
setFooterFillAttributes(
@@ -175,7 +175,7 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
{
// create FillAttributes from SvxBrushItem
const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(*pItem);
- SfxItemSet aTempSet(*rSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
+ SfxItemSet aTempSet(*rSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>);
setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet);
setPageFillAttributes(
diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx
index 35afdc5d0336..3bddeb20fca8 100644
--- a/sw/source/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/uibase/frmdlg/frmmgr.cxx
@@ -59,7 +59,7 @@ const WhichRangesContainer aFrameMgrRange(svl::Items<
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
FN_SET_FRM_NAME, FN_SET_FRM_NAME
- >::value);
+ >);
// determine frame attributes via Shell
SwFlyFrameAttrMgr::SwFlyFrameAttrMgr( bool bNew, SwWrtShell* pSh, Frmmgr_Type nType, const SvGlobalName* pName ) :
@@ -169,7 +169,7 @@ void SwFlyFrameAttrMgr::UpdateFlyFrame()
const SfxPoolItem *pGItem, *pItem;
if( SfxItemState::SET == m_aSet.GetItemState( RES_ANCHOR, false, &pItem ))
{
- SfxItemSet aGetSet( *m_aSet.GetPool(), svl::Items<RES_ANCHOR, RES_ANCHOR>{} );
+ SfxItemSet aGetSet( *m_aSet.GetPool(), svl::Items<RES_ANCHOR, RES_ANCHOR> );
if( m_pOwnSh->GetFlyFrameAttr( aGetSet ) && 1 == aGetSet.Count() &&
SfxItemState::SET == aGetSet.GetItemState( RES_ANCHOR, false, &pGItem )
&& static_cast<const SwFormatAnchor*>(pGItem)->GetAnchorId() ==
diff --git a/sw/source/uibase/inc/tabsh.hxx b/sw/source/uibase/inc/tabsh.hxx
index 691486745cd5..6816376c1055 100644
--- a/sw/source/uibase/inc/tabsh.hxx
+++ b/sw/source/uibase/inc/tabsh.hxx
@@ -24,6 +24,7 @@
class SfxItemSet;
class SwWrtShell;
+struct WhichRangesContainer;
SW_DLLPUBLIC void ItemSetToTableParam( const SfxItemSet& rSet, SwWrtShell &rSh );
diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx
index b5672a5aa211..03b36d197b65 100644
--- a/sw/source/uibase/lingu/hhcwrp.cxx
+++ b/sw/source/uibase/lingu/hhcwrp.cxx
@@ -317,7 +317,7 @@ void SwHHCWrapper::ChangeText_impl( const OUString &rNewText, bool bKeepAttribut
// get item set with all relevant attributes
static const WhichRangesContainer aRanges(svl::Items<
RES_CHRATR_BEGIN, RES_FRMATR_END
- >::value);
+ >);
SfxItemSet aItemSet( m_rWrtShell.GetAttrPool(), aRanges );
// get all attributes spanning the whole selection in order to
// restore those for the new text
@@ -469,7 +469,7 @@ void SwHHCWrapper::ReplaceUnit(
SfxItemSet aSet( m_rWrtShell.GetAttrPool(), svl::Items<
RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_FONT,
- RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_LANGUAGE>{} );
+ RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_LANGUAGE> );
if (pNewUnitLanguage)
{
aSet.Put( SvxLanguageItem( *pNewUnitLanguage, RES_CHRATR_CJK_LANGUAGE ) );
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 8fbe2d07043b..1ddeda1b7fb2 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -641,7 +641,7 @@ void SwSpellPopup::checkRedline()
FN_REDLINE_PREV_CHANGE
};
SwDoc *pDoc = m_pSh->GetDoc();
- SfxItemSet aSet(pDoc->GetAttrPool(), svl::Items<FN_REDLINE_ACCEPT_DIRECT, FN_REDLINE_PREV_CHANGE>{});
+ SfxItemSet aSet(pDoc->GetAttrPool(), svl::Items<FN_REDLINE_ACCEPT_DIRECT, FN_REDLINE_PREV_CHANGE>);
for (sal_uInt16 nWhich : pRedlineIds)
{
aSet.Put(SfxVoidItem(nWhich));
diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx
index 4f1596f99f3d..a0202a513cfc 100644
--- a/sw/source/uibase/misc/glshell.cxx
+++ b/sw/source/uibase/misc/glshell.cxx
@@ -242,7 +242,7 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const OUString& rGroup, const OUString
svl::Items<
SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
- FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER>{});
+ FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER>);
VclPtr<SfxPrinter> pPrinter = VclPtr<SfxPrinter>::Create( std::move(pSet) );
// and append it to the document.
diff --git a/sw/source/uibase/ribbar/concustomshape.cxx b/sw/source/uibase/ribbar/concustomshape.cxx
index 97914c8003b5..c89e8e96eaf1 100644
--- a/sw/source/uibase/ribbar/concustomshape.cxx
+++ b/sw/source/uibase/ribbar/concustomshape.cxx
@@ -134,7 +134,7 @@ void ConstCustomShape::SetAttributes( SdrObject* pObj )
SDRATTR_GRAF_FIRST,
SDRATTR_CUSTOMSHAPE_LAST,
// Range from SdrTextObj:
- EE_ITEMS_START, EE_ITEMS_END>{});
+ EE_ITEMS_START, EE_ITEMS_END>);
aDest.Set( rSource );
pObj->SetMergedItemSet( aDest );
Degree100 nAngle = pSourceObj->GetRotateAngle();
diff --git a/sw/source/uibase/ribbar/conrect.cxx b/sw/source/uibase/ribbar/conrect.cxx
index 3484c4a557c7..6797849bec5d 100644
--- a/sw/source/uibase/ribbar/conrect.cxx
+++ b/sw/source/uibase/ribbar/conrect.cxx
@@ -94,7 +94,7 @@ bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
{
// Set the attributes needed for scrolling
SfxItemSet aItemSet( pSdrView->GetModel()->GetItemPool(),
- svl::Items<SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST>{});
+ svl::Items<SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST>);
aItemSet.Put( makeSdrTextAutoGrowWidthItem( false ) );
aItemSet.Put( makeSdrTextAutoGrowHeightItem( false ) );
diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx
index e7c176e72bc7..b1ee706dfa5d 100644
--- a/sw/source/uibase/ribbar/drawbase.cxx
+++ b/sw/source/uibase/ribbar/drawbase.cxx
@@ -286,7 +286,7 @@ bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt)
bAutoCap = true;
if(m_pWin->GetFrameColCount() > 1)
{
- SfxItemSet aSet(m_pView->GetPool(),svl::Items<RES_COL,RES_COL>{});
+ SfxItemSet aSet(m_pView->GetPool(),svl::Items<RES_COL,RES_COL>);
SwFormatCol aCol(aSet.Get(RES_COL));
aCol.Init(m_pWin->GetFrameColCount(), aCol.GetGutterWidth(), aCol.GetWishWidth());
aSet.Put(aCol);
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index 1032f5e68072..372290e75c19 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -255,7 +255,7 @@ void SwInputWindow::ShowWin()
}
pWrtShell->DoUndo(false);
- SfxItemSet aSet( pWrtShell->GetAttrPool(), svl::Items<RES_BOXATR_FORMULA, RES_BOXATR_FORMULA>{} );
+ SfxItemSet aSet( pWrtShell->GetAttrPool(), svl::Items<RES_BOXATR_FORMULA, RES_BOXATR_FORMULA> );
if( pWrtShell->GetTableBoxFormulaAttrs( aSet ))
sEdit += aSet.Get( RES_BOXATR_FORMULA ).GetFormula();
}
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index d29ba3d24bb2..a34f9a86a5da 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -452,7 +452,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(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLCOLOR, EE_ITEMS_START, EE_ITEMS_END>{});
+ SfxItemSet aDlgAttr(GetPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLCOLOR, EE_ITEMS_START, EE_ITEMS_END>);
// util::Language does not exist in the EditEngine! Therefore not included in the set.
@@ -498,7 +498,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
GetPool(),
svl::Items<
EE_ITEMS_START, EE_ITEMS_END,
- SID_ATTR_PARA_HYPHENZONE, SID_ATTR_PARA_WIDOWS>{});
+ SID_ATTR_PARA_HYPHENZONE, SID_ATTR_PARA_WIDOWS>);
aDlgAttr.Put(aEditAttr);
@@ -544,7 +544,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
*aNewAttr.GetPool(),
svl::Items<
EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR,
- EE_PARA_JUST, EE_PARA_JUST>{});
+ EE_PARA_JUST, EE_PARA_JUST>);
SvxAdjust nAdjust = SvxAdjust::Left;
if( SfxItemState::SET == aEditAttr.GetItemState(EE_PARA_JUST, true, &pPoolItem ) )
@@ -1776,7 +1776,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq)
*aOldSet.GetPool(),
svl::Items<
EE_CHAR_FONTINFO, EE_CHAR_FONTINFO,
- EE_CHAR_FONTINFO_CJK, EE_CHAR_FONTINFO_CTL>{});
+ EE_CHAR_FONTINFO_CJK, 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 91c4a05758d4..c327ad40c941 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -162,7 +162,7 @@ static void lcl_UpdateIMapDlg( SwWrtShell& rSh )
TargetList aList;
SfxFrame::GetDefaultTargetList(aList);
- SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL>{} );
+ SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL> );
rSh.GetFlyFrameAttr( aSet );
const SwFormatURL &rURL = aSet.Get( RES_URL );
SvxIMapDlgChildWindow::UpdateIMapDlg(
@@ -1101,7 +1101,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
if ( rSh.IsFrameSelected() &&
pDlg->GetEditingObject() == rSh.GetIMapInventor() )
{
- SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL>{} );
+ SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL> );
rSh.GetFlyFrameAttr( aSet );
SwFormatURL aURL( aSet.Get( RES_URL ) );
aURL.SetMap( &pDlg->GetImageMap() );
@@ -1154,7 +1154,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
if (pDlg && pDlg->GetEditingObject() == rSh.GetIMapInventor())
{
rSh.StartAction();
- SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_SURROUND, RES_SURROUND>{});
+ SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_SURROUND, RES_SURROUND>);
rSh.GetFlyFrameAttr( aSet );
SwFormatSurround aSur( aSet.Get( RES_SURROUND ) );
if ( !aSur.IsContour() )
@@ -1216,7 +1216,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
sal_uInt16 nHtmlMode = ::GetHtmlMode(GetView().GetDocShell());
if( nHtmlMode )
{
- SfxItemSet aSet(GetPool(), svl::Items<RES_SURROUND, RES_HORI_ORIENT>{});
+ SfxItemSet aSet(GetPool(), svl::Items<RES_SURROUND, RES_HORI_ORIENT>);
rSh.GetFlyFrameAttr(aSet);
const SwFormatSurround& rSurround = aSet.Get(RES_SURROUND);
@@ -1464,7 +1464,7 @@ IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl, SwCursorShell&, void)
case FN_FRAME_WRAP_CONTOUR:
if( !bProtect )
{
- SfxItemSet aSet(GetPool(), svl::Items<RES_SURROUND, RES_SURROUND>{});
+ SfxItemSet aSet(GetPool(), svl::Items<RES_SURROUND, RES_SURROUND>);
rSh.GetFlyFrameAttr(aSet);
const SwFormatSurround& rWrap = aSet.Get(RES_SURROUND);
bSetState = true;
@@ -1572,7 +1572,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
case RES_SHADOW:
{
SfxItemSet aSet( rSh.GetAttrPool(),
- svl::Items<RES_SHADOW, RES_SHADOW>{} );
+ svl::Items<RES_SHADOW, RES_SHADOW> );
// Table cell(s) selected?
if ( rSh.IsTableMode() )
@@ -1754,7 +1754,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
if( !bParentCntProt && (bObj || rSh.IsFrameSelected()))
{
- SfxItemSet aSet(GetPool(), svl::Items<RES_ANCHOR, RES_ANCHOR>{});
+ SfxItemSet aSet(GetPool(), svl::Items<RES_ANCHOR, RES_ANCHOR>);
if(bObj)
rSh.GetObjAttr(aSet);
else
@@ -1805,7 +1805,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
if( !bParentCntProt && (bObj || rSh.IsFrameSelected()))
{
- SfxItemSet aSet(GetPool(), svl::Items<RES_OPAQUE, RES_ANCHOR>{});
+ SfxItemSet aSet(GetPool(), svl::Items<RES_OPAQUE, RES_ANCHOR>);
RndStdIds nAnchorType;
if(bObj)
{
@@ -1981,7 +1981,7 @@ void SwBaseShell::SetWrapMode( sal_uInt16 nSlot )
if( !bObj && !rSh.IsFrameSelected())
return;
- SfxItemSet aSet(GetPool(), svl::Items<RES_OPAQUE, RES_SURROUND>{});
+ SfxItemSet aSet(GetPool(), svl::Items<RES_OPAQUE, RES_SURROUND>);
if(bObj)
rSh.GetObjAttr(aSet);
else
@@ -2141,7 +2141,7 @@ void SwBaseShell::ExecTextCtrl( SfxRequest& rReq )
SvtScriptType nScripts = SvtScriptType::LATIN | SvtScriptType::ASIAN | SvtScriptType::COMPLEX;
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>{});
+ RES_CHRATR_CTL_FONTSIZE, RES_CHRATR_CTL_FONTSIZE>);
switch( nSlot )
{
@@ -2185,7 +2185,7 @@ void SwBaseShell::ExecTextCtrl( SfxRequest& rReq )
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>{});
+ RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_LANGUAGE>);
rSh.GetCurAttr( aLangSet );
sal_Int32 nWesternSize =
@@ -2277,7 +2277,7 @@ void SwBaseShell::GetTextFontCtrlState( SfxItemSet& rSet )
if( !pFntCoreSet )
{
pFntCoreSet.emplace( *rSet.GetPool(),
- svl::Items<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
@@ -2353,7 +2353,7 @@ void SwBaseShell::GetBckColState(SfxItemSet &rSet)
else
{
// Adapt to new DrawingLayer FillStyle; use a parent which has XFILL_NONE set
- SfxItemSet aCoreSet(GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
+ SfxItemSet aCoreSet(GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>);
aCoreSet.SetParent(&GetView().GetDocShell()->GetDoc()->GetDfltFrameFormat()->GetAttrSet());
@@ -2417,7 +2417,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
else
{
// Adapt to new DrawingLayer FillStyle; use a parent which has XFILL_NONE set
- SfxItemSet aCoreSet(GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
+ SfxItemSet aCoreSet(GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>);
aCoreSet.SetParent(&GetView().GetDocShell()->GetDoc()->GetDfltFrameFormat()->GetAttrSet());
@@ -2505,7 +2505,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
else
{
// Adapt to new DrawingLayer FillStyle; use a parent which has XFILL_NONE set
- SfxItemSet aCoreSet(GetPool(), svl::Items<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);
@@ -2552,7 +2552,7 @@ void SwBaseShell::GetBorderState(SfxItemSet &rSet)
{
SfxItemSet aCoreSet( GetPool(),
svl::Items<RES_BOX, RES_BOX,
- SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{} );
+ SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER> );
SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
aCoreSet.Put( aBoxInfo );
rSh.GetTabBorders( aCoreSet );
@@ -2636,7 +2636,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
{
SfxItemSet aSet( rSh.GetAttrPool(),
svl::Items<RES_BOX , RES_SHADOW,
- SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{} );
+ SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER> );
ScopedVclPtr<SfxAbstractDialog> pDlg;
// Table cell(s) selected?
if ( rSh.IsTableMode() )
@@ -2692,7 +2692,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
{
SfxItemSet aSet( rSh.GetAttrPool(),
svl::Items<RES_BACKGROUND, RES_BACKGROUND,
- XATTR_FILL_FIRST, XATTR_FILL_LAST>{} );
+ XATTR_FILL_FIRST, XATTR_FILL_LAST> );
ScopedVclPtr<SfxAbstractDialog> pDlg;
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -3062,7 +3062,7 @@ void SwBaseShell::ExecuteGallery(SfxRequest &rReq)
rSh.SetBoxBackground( aBrush );
else if ( nPos == nFramePos || nPos == nGraphicPos || nPos == nOlePos )
{
- SfxItemSet aCoreSet(GetPool(), svl::Items<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 80b8c1eee379..89d8658597dc 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -152,7 +152,7 @@ void SwDrawShell::InsertPictureFromFile(SdrObject& rObject)
{
pSdrView->AddUndo(std::make_unique<SdrUndoAttrObj>(rObject));
- SfxItemSet aSet(pSdrView->GetModel()->GetItemPool(), svl::Items<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 8ccf0d10af2e..6d8ba4159d37 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -124,7 +124,7 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq)
RES_ANCHOR, RES_ANCHOR,
RES_WRAP_INFLUENCE_ON_OBJPOS, RES_WRAP_INFLUENCE_ON_OBJPOS,
SID_HTML_MODE, SID_HTML_MODE,
- FN_DRAW_WRAP_DLG, FN_DRAW_WRAP_DLG>{});
+ FN_DRAW_WRAP_DLG, FN_DRAW_WRAP_DLG>);
aSet.Put(SfxBoolItem(SID_HTML_MODE,
0 != ::GetHtmlMode(pSh->GetView().GetDocShell())));
@@ -258,7 +258,7 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq)
SfxItemState::SET != pOutSet->GetItemState(
SID_ATTR_TRANSFORM_POS_Y, false );
- SfxItemSet aFrameAttrSet(GetPool(), svl::Items<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 770b46d7e7ba..c5437c3d4475 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -366,7 +366,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(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLCOLOR, EE_ITEMS_START, EE_ITEMS_END>{});
+ SfxItemSet aDlgAttr(GetPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLCOLOR, EE_ITEMS_START, EE_ITEMS_END>);
// util::Language does not exists in the EditEngine! That is why not in set.
@@ -435,7 +435,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
GetPool(),
svl::Items<
EE_ITEMS_START, EE_ITEMS_END,
- SID_ATTR_PARA_HYPHENZONE, SID_ATTR_PARA_WIDOWS>{});
+ SID_ATTR_PARA_HYPHENZONE, SID_ATTR_PARA_WIDOWS>);
aDlgAttr.Put(aEditAttr);
@@ -557,7 +557,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
SfxItemSet aAttr( *aNewAttr.GetPool(),
svl::Items<SDRATTR_TEXTDIRECTION,
- SDRATTR_TEXTDIRECTION>{} );
+ SDRATTR_TEXTDIRECTION> );
aAttr.Put( SvxWritingModeItem(
nSlot == SID_TEXTDIRECTION_LEFT_TO_RIGHT ?
@@ -590,7 +590,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
*aNewAttr.GetPool(),
svl::Items<
EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR,
- EE_PARA_JUST, EE_PARA_JUST>{});
+ EE_PARA_JUST, EE_PARA_JUST>);
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 d8f5fa419999..d7cdea7018d7 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -739,7 +739,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq)
*aOldSet.GetPool(),
svl::Items<
EE_CHAR_FONTINFO, EE_CHAR_FONTINFO,
- EE_CHAR_FONTINFO_CJK, EE_CHAR_FONTINFO_CTL>{});
+ EE_CHAR_FONTINFO_CJK, 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 6e990cd632b6..beafae953597 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -180,7 +180,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(),svl::Items<RES_COL,RES_COL>{});
+ SfxItemSet aSet(GetPool(),svl::Items<RES_COL,RES_COL>);
rSh.GetFlyFrameAttr( aSet );
SwFormatCol aCol(aSet.Get(RES_COL));
// GutterWidth will not always passed, hence get firstly
@@ -215,7 +215,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
const OUString& rURL = rHLinkItem.GetURL();
const OUString& rTarget = rHLinkItem.GetTargetFrame();
- SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL>{} );
+ SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_URL, RES_URL> );
rSh.GetFlyFrameAttr( aSet );
SwFormatURL aURL( aSet.Get( RES_URL ) );
@@ -393,7 +393,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
if (pArgs && (pArgs->HasItem(SID_ATTR_TRANSFORM_ANGLE) || pArgs->HasItem(SID_ATTR_TRANSFORM_DELTA_ANGLE)))
{
- SfxItemSet aSet(rSh.GetAttrPool(), svl::Items<RES_GRFATR_ROTATION, RES_GRFATR_ROTATION>{} );
+ SfxItemSet aSet(rSh.GetAttrPool(), svl::Items<RES_GRFATR_ROTATION, RES_GRFATR_ROTATION> );
rSh.GetCurAttr(aSet);
const SwRotationGrf& rRotation = aSet.Get(RES_GRFATR_ROTATION);
const Degree10 nOldRot(rRotation.GetValue());
@@ -465,7 +465,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME,
FN_UNO_DESCRIPTION, FN_UNO_DESCRIPTION,
FN_OLE_IS_MATH, FN_MATH_BASELINE_ALIGNMENT,
- FN_PARAM_CHAIN_PREVIOUS, FN_PARAM_CHAIN_NEXT>{});
+ FN_PARAM_CHAIN_PREVIOUS, FN_PARAM_CHAIN_NEXT>);
// create needed items for XPropertyList entries from the DrawModel so that
// the Area TabPage can access them
@@ -566,7 +566,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
GetPool(),
svl::Items<
RES_FRM_SIZE, RES_FRM_SIZE,
- RES_SURROUND, RES_ANCHOR>{});
+ RES_SURROUND, RES_ANCHOR>);
aShellSet.Put(*pOutSet);
aMgr.SetAttrSet(aShellSet);
if(SfxItemState::SET == pOutSet->GetItemState(FN_SET_FRM_NAME, false, &pItem))
@@ -658,7 +658,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
SwFormatHoriOrient aHori(aMgr.GetHoriOrient());
bool bMirror = !aHori.IsPosToggle();
aHori.SetPosToggle(bMirror);
- SfxItemSet aSet(GetPool(), svl::Items<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;
@@ -742,7 +742,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
rSh.GetAttrPool(),
svl::Items<
RES_LR_SPACE, RES_UL_SPACE,
- RES_PRINT, RES_HORI_ORIENT>{});
+ RES_PRINT, RES_HORI_ORIENT>);
rSh.GetFlyFrameAttr( aSet );
bool bProtect = rSh.IsSelObjProtected(FlyProtectFlags::Pos) != FlyProtectFlags::NONE;
@@ -920,7 +920,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
SvxHyperlinkItem aHLinkItem;
const SfxPoolItem* pItem;
- SfxItemSet aURLSet(GetPool(), svl::Items<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))
@@ -1094,7 +1094,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest const & rReq)
const SvxBoxItem* pPoolBoxItem = ::GetDfltAttr(RES_BOX);
const SfxItemSet *pArgs = rReq.GetArgs();
- SfxItemSet aFrameSet(rSh.GetAttrPool(), svl::Items<RES_BOX, RES_BOX>{});
+ SfxItemSet aFrameSet(rSh.GetAttrPool(), svl::Items<RES_BOX, RES_BOX>);
rSh.GetFlyFrameAttr( aFrameSet );
const SvxBoxItem& rBoxItem = aFrameSet.Get(RES_BOX);
@@ -1289,7 +1289,7 @@ void SwFrameShell::GetLineStyleState(SfxItemSet &rSet)
{
if (rSh.IsFrameSelected())
{
- SfxItemSet aFrameSet( rSh.GetAttrPool(), svl::Items<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 013e54887119..0bb9632f237d 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -191,7 +191,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
convertTwipToMm100(rSh.GetAnyCurRect(CurRectType::FlyEmbedded).Width()),
convertTwipToMm100(rSh.GetAnyCurRect(CurRectType::FlyEmbedded).Height()));
- SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_GRFATR_MIRRORGRF, RES_GRFATR_CROPGRF>{} );
+ SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_GRFATR_MIRRORGRF, RES_GRFATR_CROPGRF> );
rSh.GetCurAttr( aSet );
SwMirrorGrf aMirror( aSet.Get(RES_GRFATR_MIRRORGRF) );
SwCropGrf aCrop( aSet.Get(RES_GRFATR_CROPGRF) );
@@ -283,7 +283,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
FN_PARAM_GRF_DIALOG, FN_PARAM_GRF_DIALOG,
FN_SET_FRM_NAME, FN_KEEP_ASPECT_RATIO,
FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME,
- FN_UNO_DESCRIPTION, FN_UNO_DESCRIPTION>{});
+ FN_UNO_DESCRIPTION, FN_UNO_DESCRIPTION>);
// create needed items for XPropertyList entries from the DrawModel so that
// the Area TabPage can access them
@@ -367,7 +367,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
// get Mirror and Crop
{
SfxItemSet aTmpSet( rSh.GetAttrPool(),
- svl::Items<RES_GRFATR_MIRRORGRF, RES_GRFATR_CROPGRF>{} );
+ svl::Items<RES_GRFATR_MIRRORGRF, RES_GRFATR_CROPGRF> );
rSh.GetCurAttr( aTmpSet );
aSet.Put( aTmpSet );
@@ -390,7 +390,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
{ // RotGrfFlyFrame: Add current RotationAngle value, convert from
// RES_GRFATR_ROTATION to SID_ATTR_TRANSFORM_ANGLE. Do not forget to
// convert from 10th degrees to 100th degrees
- SfxItemSet aTmpSet( rSh.GetAttrPool(), svl::Items<RES_GRFATR_ROTATION, RES_GRFATR_ROTATION>{} );
+ SfxItemSet aTmpSet( rSh.GetAttrPool(), svl::Items<RES_GRFATR_ROTATION, RES_GRFATR_ROTATION> );
rSh.GetCurAttr( aTmpSet );
const SwRotationGrf& rRotation = aTmpSet.Get(RES_GRFATR_ROTATION);
nCurrentRotation = rRotation.GetValue();
@@ -441,7 +441,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
GetPool(),
svl::Items<
RES_FRM_SIZE, RES_FRM_SIZE,
- RES_SURROUND, RES_ANCHOR>{});
+ RES_SURROUND, RES_ANCHOR>);
aShellSet.Put(*pSet);
aMgr.SetAttrSet(aShellSet);
}
@@ -519,7 +519,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
}
SfxItemSet aGrfSet( rSh.GetAttrPool(), svl::Items<RES_GRFATR_BEGIN,
- RES_GRFATR_END-1>{} );
+ RES_GRFATR_END-1> );
aGrfSet.Put( *pSet );
if( aGrfSet.Count() )
rSh.SetAttrSet( aGrfSet );
@@ -532,7 +532,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
case FN_GRAPHIC_MIRROR_ON_EVEN_PAGES:
{
- SfxItemSet aSet(rSh.GetAttrPool(), svl::Items<RES_GRFATR_MIRRORGRF, RES_GRFATR_MIRRORGRF>{});
+ SfxItemSet aSet(rSh.GetAttrPool(), svl::Items<RES_GRFATR_MIRRORGRF, RES_GRFATR_MIRRORGRF>);
rSh.GetCurAttr( aSet );
SwMirrorGrf aGrf(aSet.Get(RES_GRFATR_MIRRORGRF));
aGrf.SetGrfToggle(!aGrf.IsGrfToggle());
@@ -564,7 +564,7 @@ void SwGrfShell::ExecAttr( SfxRequest const &rReq )
GraphicType::GdiMetafile == nGrfType)
{
SfxItemSet aGrfSet( GetShell().GetAttrPool(), svl::Items<RES_GRFATR_BEGIN,
- RES_GRFATR_END -1>{} );
+ RES_GRFATR_END -1> );
const SfxItemSet *pArgs = rReq.GetArgs();
const SfxPoolItem* pItem;
sal_uInt16 nSlot = rReq.GetSlot();
@@ -933,7 +933,7 @@ void SwGrfShell::ExecuteRotation(SfxRequest const &rReq)
return;
SwWrtShell& rShell = GetShell();
- SfxItemSet aSet( rShell.GetAttrPool(), svl::Items<RES_GRFATR_ROTATION, RES_GRFATR_ROTATION>{} );
+ SfxItemSet aSet( rShell.GetAttrPool(), svl::Items<RES_GRFATR_ROTATION, RES_GRFATR_ROTATION> );
rShell.GetCurAttr( aSet );
const SwRotationGrf& rRotation = aSet.Get(RES_GRFATR_ROTATION);
SwFlyFrameAttrMgr aMgr(false, &rShell, rShell.IsFrameSelected() ? Frmmgr_Type::NONE : Frmmgr_Type::GRF, nullptr);
@@ -978,7 +978,7 @@ void SwGrfShell::GetAttrStateForRotation(SfxItemSet &rSet)
case SID_ROTATE_GRAPHIC_RESET:
{
// RotGrfFlyFrame: disable when already no rotation
- SfxItemSet aSet( rShell.GetAttrPool(), svl::Items<RES_GRFATR_ROTATION, RES_GRFATR_ROTATION>{} );
+ SfxItemSet aSet( rShell.GetAttrPool(), svl::Items<RES_GRFATR_ROTATION, RES_GRFATR_ROTATION> );
rShell.GetCurAttr( aSet );
const SwRotationGrf& rRotation = aSet.Get(RES_GRFATR_ROTATION);
bDisable = (0_deg10 == rRotation.GetValue());
@@ -988,7 +988,7 @@ void SwGrfShell::GetAttrStateForRotation(SfxItemSet &rSet)
{
// RotGrfFlyFrame: get rotation value from RES_GRFATR_ROTATION and copy to rSet as
// SID_ATTR_TRANSFORM_ANGLE, convert from 10th degrees to 100th degrees
- SfxItemSet aSet( rShell.GetAttrPool(), svl::Items<RES_GRFATR_ROTATION, RES_GRFATR_ROTATION>{} );
+ SfxItemSet aSet( rShell.GetAttrPool(), svl::Items<RES_GRFATR_ROTATION, RES_GRFATR_ROTATION> );
rShell.GetCurAttr( aSet );
const SwRotationGrf& rRotation = aSet.Get(RES_GRFATR_ROTATION);
rSet.Put(SdrAngleItem(SID_ATTR_TRANSFORM_ANGLE, toDegree100(rRotation.GetValue())));
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index bb02cda4ccaa..9ea9d2de13c3 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -118,7 +118,7 @@ const WhichRangesContainer aUITableAttrRange(svl::Items<
FN_PARAM_TABLE_NAME, FN_PARAM_TABLE_NAME,
FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE,
FN_PARAM_TABLE_SPACE, FN_PARAM_TABLE_SPACE
->::value);
+>);
const WhichRangesContainer& SwuiGetUITableAttrRange()
{
@@ -352,7 +352,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
bool bTabCols = false;
SwTableRep* pRep = nullptr;
SwFrameFormat *pFormat = rSh.GetTableFormat();
- SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<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());
@@ -466,7 +466,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
std::shared_ptr<SvxBoxItem> aBox(std::make_shared<SvxBoxItem>(RES_BOX));
SfxItemSet aCoreSet( GetPool(),
svl::Items<RES_BOX, RES_BOX,
- SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{});
+ SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>);
SvxBoxInfoItem aCoreInfo( SID_ATTR_BORDER_INNER );
aCoreSet.Put(aCoreInfo);
rSh.GetTabBorders( aCoreSet );
@@ -660,11 +660,11 @@ void SwTableShell::Execute(SfxRequest &rReq)
GetPool(),
svl::Items<
SID_ATTR_NUMBERFORMAT_VALUE,
- SID_ATTR_NUMBERFORMAT_INFO>{});
+ SID_ATTR_NUMBERFORMAT_INFO>);
SfxItemSet aBoxSet( *aCoreSet.GetPool(),
svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_FORMAT,
- RES_BOXATR_VALUE, RES_BOXATR_VALUE>{} );
+ RES_BOXATR_VALUE, RES_BOXATR_VALUE> );
rSh.GetTableBoxFormulaAttrs( aBoxSet );
SfxItemState eState = aBoxSet.GetItemState(RES_BOXATR_FORMAT);
@@ -703,7 +703,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
SID_ATTR_NUMBERFORMAT_VALUE, false, &pNumberFormatValueItem ))
{
SfxItemSet aBoxFormatSet( *aCoreSet.GetPool(),
- svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_FORMAT>{} );
+ svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_FORMAT> );
aBoxFormatSet.Put( SwTableBoxNumFormat(
static_cast<const SfxUInt32Item*>(pNumberFormatValueItem)->GetValue() ));
rSh.SetTableBoxFormulaAttrs( aBoxFormatSet );
@@ -935,7 +935,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
{
const SvxBoxInfoItem& aBoxInfo(aCoreSet.Get(SID_ATTR_BORDER_INNER));
SfxItemSet aSet( GetPool(), svl::Items<SID_ATTR_BORDER_INNER,
- SID_ATTR_BORDER_INNER>{});
+ SID_ATTR_BORDER_INNER>);
aSet.Put( aBoxInfo );
ItemSetToTableParam( aSet, rSh );
rSh.EndUndo( nUndoId );
@@ -1183,7 +1183,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
if(pItem)
{
SfxItemSet aSet( GetPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE,
- RES_HORI_ORIENT, RES_HORI_ORIENT>{} );
+ RES_HORI_ORIENT, RES_HORI_ORIENT> );
SvxLRSpaceItem aLRSpace( *static_cast<const SvxLRSpaceItem*>(pItem) );
aLRSpace.SetWhich( RES_LR_SPACE );
aSet.Put( aLRSpace );
@@ -1214,7 +1214,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
if ( pItem )
{
SwFormatLayoutSplit aSplit( static_cast<const SvxFormatSplitItem*>(pItem)->GetValue());
- SfxItemSet aSet(GetPool(), svl::Items<RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT>{} );
+ SfxItemSet aSet(GetPool(), svl::Items<RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT> );
aSet.Put(aSplit);
rSh.SetTableAttr(aSet);
}
@@ -1225,7 +1225,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
{
SvxFormatKeepItem aKeep( *static_cast<const SvxFormatKeepItem*>(pItem) );
aKeep.SetWhich( RES_KEEP );
- SfxItemSet aSet(GetPool(), svl::Items<RES_KEEP, RES_KEEP>{} );
+ SfxItemSet aSet(GetPool(), svl::Items<RES_KEEP, RES_KEEP> );
aSet.Put(aKeep);
rSh.SetTableAttr(aSet);
}
@@ -1496,7 +1496,7 @@ void SwTableShell::GetFrameBorderState(SfxItemSet &rSet)
{
SfxItemSet aCoreSet( GetPool(),
svl::Items<RES_BOX, RES_BOX,
- SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{} );
+ SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER> );
SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
aCoreSet.Put( aBoxInfo );
GetShell().GetTabBorders( aCoreSet );
@@ -1536,7 +1536,7 @@ void SwTableShell::GetLineStyleState(SfxItemSet &rSet)
{
SfxItemSet aCoreSet( GetPool(),
svl::Items<RES_BOX, RES_BOX,
- SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{});
+ SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>);
SvxBoxInfoItem aCoreInfo( SID_ATTR_BORDER_INNER );
aCoreSet.Put(aCoreInfo);
GetShell().GetTabBorders( aCoreSet );
@@ -1609,7 +1609,7 @@ void SwTableShell::ExecNumberFormat(SfxRequest const & rReq)
if( NUMBERFORMAT_ENTRY_NOT_FOUND != nNumberFormat )
{
- SfxItemSet aBoxSet( GetPool(), svl::Items<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 905471f4e869..3c7fe4317632 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -985,7 +985,7 @@ void SwTextShell::InsertHyperlink(const SvxHyperlinkItem& rHlnkItem)
return;
rSh.StartAction();
- SfxItemSet aSet(GetPool(), svl::Items<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 fc82635ecc6b..a9eb7921e66c 100644
--- a/sw/source/uibase/shells/textidx.cxx
+++ b/sw/source/uibase/shells/textidx.cxx
@@ -101,7 +101,7 @@ void SwTextShell::ExecIdx(SfxRequest const &rReq)
RES_COL, RES_COL,
XATTR_FILL_FIRST, XATTR_FILL_LAST,
SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE,
- FN_PARAM_TOX_TYPE, FN_PARAM_TOX_TYPE>{});
+ 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 12f6f8d9bdad..0f19e33153d9 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -634,7 +634,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet )
case SID_HYPERLINK_GETLINK:
{
- SfxItemSet aSet(GetPool(), svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{});
+ SfxItemSet aSet(GetPool(), svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>);
rSh.GetCurAttr( aSet );
SvxHyperlinkItem aHLinkItem;
@@ -845,7 +845,7 @@ SfxItemSet SwTextShell::CreateInsertFrameItemSet(SwFlyFrameAttrMgr& rMgr)
SID_COLOR_TABLE, SID_PATTERN_LIST,
SID_HTML_MODE, SID_HTML_MODE,
FN_GET_PRINT_AREA, FN_GET_PRINT_AREA,
- FN_SET_FRM_NAME, FN_SET_FRM_NAME>{});
+ FN_SET_FRM_NAME, FN_SET_FRM_NAME>);
aSet.Put(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(GetView().GetDocShell())));
// For the Area tab page.
@@ -895,7 +895,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
SwWrtShell &rSh = GetShell();
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>{} );
+ RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT> );
rSh.GetCurAttr( aSet );
SvtScriptType nScript = rSh.GetScriptType();
@@ -987,7 +987,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq )
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>{} );
+ 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 b5d2f4e01c7c..ed5bc5a1b91e 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -125,7 +125,7 @@ static void sw_CharDialog(SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
SID_HTML_MODE, SID_HTML_MODE,
SID_ATTR_CHAR_WIDTH_FIT_TO_LINE, SID_ATTR_CHAR_WIDTH_FIT_TO_LINE,
- FN_PARAM_SELECTION, FN_PARAM_SELECTION>{});
+ FN_PARAM_SELECTION, FN_PARAM_SELECTION>);
rWrtSh.GetCurAttr(*pCoreSet);
bool bSel = rWrtSh.HasSelection();
@@ -447,7 +447,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
SfxItemSet aCoreSet( 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>{} );
+ RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_LANGUAGE> );
sal_Int32 nPos = 0;
bool bForSelection = true;
@@ -549,7 +549,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
if ( bFont )
{
rWrtSh.Left( CRSR_SKIP_CHARS, true, 1, false );
- SfxItemSet aSet( rWrtSh.GetAttrPool(), svl::Items<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);
@@ -853,7 +853,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
{
if( rWrtSh.IsCursorInTable() )
{
- SfxItemSet aSet( rWrtSh.GetAttrPool(), svl::Items<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();
@@ -993,7 +993,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
SID_ATTR_PARA_PAGENUM, SID_ATTR_PARA_PAGENUM,
FN_PARAM_1, FN_PARAM_1,
FN_NUMBER_NEWSTART, FN_NUMBER_NEWSTART_AT,
- FN_DROP_TEXT, FN_DROP_CHAR_STYLE_NAME>{});
+ FN_DROP_TEXT, FN_DROP_CHAR_STYLE_NAME>);
// get also the list level indent values merged as LR-SPACE item, if needed.
rWrtSh.GetPaMAttr( pPaM, aCoreSet, true );
@@ -1110,7 +1110,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
if (pTempGradItem && pTempGradItem->GetName().isEmpty())
{
// MigrateItemSet guarantees unique gradient names
- SfxItemSet aMigrateSet(rWrtSh.GetView().GetPool(), svl::Items<XATTR_FILLGRADIENT, XATTR_FILLGRADIENT>{});
+ SfxItemSet aMigrateSet(rWrtSh.GetView().GetPool(), svl::Items<XATTR_FILLGRADIENT, XATTR_FILLGRADIENT>);
aMigrateSet.Put(XFillGradientItem("gradient", pTempGradItem->GetGradientValue()));
SdrModel::MigrateItemSet(&aMigrateSet, pSet, pDrawModel);
}
@@ -1118,7 +1118,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
const XFillHatchItem* pTempHatchItem = pSet->GetItem<XFillHatchItem>(XATTR_FILLHATCH);
if (pTempHatchItem && pTempHatchItem->GetName().isEmpty())
{
- SfxItemSet aMigrateSet(rWrtSh.GetView().GetPool(), svl::Items<XATTR_FILLHATCH, XATTR_FILLHATCH>{});
+ SfxItemSet aMigrateSet(rWrtSh.GetView().GetPool(), svl::Items<XATTR_FILLHATCH, XATTR_FILLHATCH>);
aMigrateSet.Put(XFillHatchItem("hatch", pTempHatchItem->GetHatchValue()));
SdrModel::MigrateItemSet(&aMigrateSet, pSet, pDrawModel);
}
@@ -1261,7 +1261,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
if (nSlot != SID_ATTR_CHAR_COLOR_EXT)
{
SfxItemSet aCoreSet( rWrtSh.GetView().GetPool(), svl::Items<
- RES_CHRATR_BACKGROUND, RES_CHRATR_BACKGROUND>{} );
+ RES_CHRATR_BACKGROUND, RES_CHRATR_BACKGROUND> );
rWrtSh.GetCurAttr( aCoreSet );
@@ -1356,7 +1356,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
{
SfxItemSet aSet(GetPool(),
svl::Items<RES_TXTATR_INETFMT,
- RES_TXTATR_INETFMT>{});
+ RES_TXTATR_INETFMT>);
rWrtSh.GetCurAttr(aSet);
if(SfxItemState::SET <= aSet.GetItemState( RES_TXTATR_INETFMT ))
{
@@ -1962,7 +1962,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
{
SfxItemSet aSet(GetPool(),
svl::Items<RES_TXTATR_INETFMT,
- RES_TXTATR_INETFMT>{});
+ RES_TXTATR_INETFMT>);
rSh.GetCurAttr(aSet);
if(SfxItemState::SET > aSet.GetItemState( RES_TXTATR_INETFMT ) || rSh.HasReadonlySel())
{
@@ -1974,7 +1974,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
{
SfxItemSet aSet(GetPool(),
svl::Items<RES_TXTATR_INETFMT,
- RES_TXTATR_INETFMT>{});
+ RES_TXTATR_INETFMT>);
rSh.GetCurAttr(aSet);
// If a hyperlink is selected, either alone or along with other text...
@@ -2017,7 +2017,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
{
SfxItemSet aSet(GetPool(),
svl::Items<RES_TXTATR_INETFMT,
- RES_TXTATR_INETFMT>{});
+ RES_TXTATR_INETFMT>);
rSh.GetCurAttr(aSet);
bool bAuthorityFieldURL = false;
@@ -2164,7 +2164,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
bool bDisable = false;
// First get the state from the form shell
- SfxItemSet aSet(GetShell().GetAttrPool(), svl::Items<SID_FM_CTL_PROPERTIES, SID_FM_CTL_PROPERTIES>{});
+ SfxItemSet aSet(GetShell().GetAttrPool(), svl::Items<SID_FM_CTL_PROPERTIES, SID_FM_CTL_PROPERTIES>);
aSet.Put(SfxBoolItem( SID_FM_CTL_PROPERTIES, true ));
GetShell().GetView().GetFormShell()->GetState( aSet );
diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx
index 7c34d31f9b3a..a4f24c0708f7 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -72,7 +72,7 @@ void SwTextShell::ExecCharAttr(SfxRequest &rReq)
Get( nWhich )).GetValue() ? STATE_ON : STATE_OFF;
}
- SfxItemSet aSet( GetPool(), svl::Items<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 );
@@ -321,7 +321,7 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq)
// Get both attributes immediately isn't more expensive!!
SfxItemSet aSet( GetPool(),
svl::Items<RES_PARATR_LINESPACING, RES_PARATR_ADJUST,
- RES_FRAMEDIR, RES_FRAMEDIR>{} );
+ RES_FRAMEDIR, RES_FRAMEDIR> );
sal_uInt16 nSlot = rReq.GetSlot();
switch (nSlot)
@@ -382,7 +382,7 @@ SET_LINESPACE:
case SID_ATTR_PARA_RIGHT_TO_LEFT :
{
SfxItemSet aAdjustSet( GetPool(),
- svl::Items<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);
@@ -467,7 +467,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
if( pItem )
{
OUString sCharStyleName = static_cast<const SfxStringItem*>(pItem)->GetValue();
- SfxItemSet aSet(GetPool(), svl::Items<RES_PARATR_DROP, RES_PARATR_DROP>{});
+ SfxItemSet aSet(GetPool(), svl::Items<RES_PARATR_DROP, RES_PARATR_DROP>);
rSh.GetCurAttr(aSet);
SwFormatDrop aDropItem(aSet.Get(RES_PARATR_DROP));
SwCharFormat* pFormat = nullptr;
@@ -488,7 +488,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
else
{
SfxItemSet aSet(GetPool(), svl::Items<RES_PARATR_DROP, RES_PARATR_DROP,
- HINT_END, HINT_END>{});
+ HINT_END, HINT_END>);
rSh.GetCurAttr(aSet);
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
ScopedVclPtr<SfxAbstractDialog> pDlg(pFact->CreateSwDropCapsDialog(GetView().GetFrameWeld(), aSet));
@@ -522,7 +522,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq)
{
SfxItemSet aCoreSet( GetPool(),
svl::Items<RES_PAGEDESC, RES_PAGEDESC,
- SID_ATTR_PARA_MODEL, SID_ATTR_PARA_MODEL>{});
+ SID_ATTR_PARA_MODEL, SID_ATTR_PARA_MODEL>);
aCoreSet.Put(*pItem);
SfxToSwPageDescAttr( rSh, aCoreSet);
rSh.SetAttrSet(aCoreSet);
@@ -808,7 +808,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
{
SfxItemSet aTemp(GetPool(),
svl::Items<RES_PAGEDESC,RES_PAGEDESC,
- SID_ATTR_PARA_MODEL,SID_ATTR_PARA_MODEL>{});
+ SID_ATTR_PARA_MODEL,SID_ATTR_PARA_MODEL>);
aTemp.Put(aCoreSet);
::SwToSfxPageDescAttr(aTemp);
rSet.Put(aTemp.Get(SID_ATTR_PARA_MODEL));
@@ -817,7 +817,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet)
break;
case RES_TXTATR_INETFMT:
{
- SfxItemSet aSet(GetPool(), svl::Items<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 6f2885397325..8e1b1de09cc0 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -122,7 +122,7 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
{
SfxItemSet aSet( GetPool(),
svl::Items<SID_HTML_MODE, SID_HTML_MODE,
- SID_ATTR_NUMBERING_RULE, SID_PARAM_CUR_NUM_LEVEL>{} );
+ 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();
diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx
index f9eb7abf09e7..ad3066f63cf5 100644
--- a/sw/source/uibase/uiview/formatclipboard.cxx
+++ b/sw/source/uibase/uiview/formatclipboard.cxx
@@ -62,7 +62,7 @@ std::unique_ptr<SfxItemSet> lcl_CreateEmptyItemSet( SelectionType nSelectionType
// no RES_URL
RES_EDIT_IN_READONLY, RES_LAYOUT_SPLIT,
// no RES_CHAIN
- RES_TEXTGRID, RES_FRMATR_END - 1>{});
+ RES_TEXTGRID, RES_FRMATR_END - 1>);
}
else if( nSelectionType & SelectionType::DrawObject )
{
@@ -72,7 +72,7 @@ std::unique_ptr<SfxItemSet> lcl_CreateEmptyItemSet( SelectionType nSelectionType
{
if( bNoParagraphFormats )
pItemSet = std::make_unique<SfxItemSet>(rPool,
- svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>{});
+ svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>);
else
pItemSet = std::make_unique<SfxItemSet>(
rPool,
@@ -90,7 +90,7 @@ std::unique_ptr<SfxItemSet> lcl_CreateEmptyItemSet( SelectionType nSelectionType
// no RES_URL
RES_EDIT_IN_READONLY, RES_LAYOUT_SPLIT,
// no RES_CHAIN
- RES_TEXTGRID, RES_FRMATR_END - 1>{});
+ RES_TEXTGRID, RES_FRMATR_END - 1>);
}
return pItemSet;
}
@@ -391,7 +391,7 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE,
FN_TABLE_SET_VERT_ALIGN, FN_TABLE_SET_VERT_ALIGN,
FN_TABLE_BOX_TEXTORIENTATION, FN_TABLE_BOX_TEXTORIENTATION,
- FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE>{});
+ FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE>);
lcl_getTableAttributes( *m_pTableItemSet, rWrtShell );
}
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index a432a4de8948..95845f888435 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -725,7 +725,7 @@ void SwPagePreview::Execute( SfxRequest &rReq )
ScopedVclPtr<AbstractSvxZoomDialog> pDlg;
if(!pArgs)
{
- SfxItemSet aCoreSet(GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>{});
+ SfxItemSet aCoreSet(GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>);
const SwViewOption* pVOpt = GetViewShell()->GetViewOptions();
SvxZoomItem aZoom( pVOpt->GetZoomType(), pVOpt->GetZoom() );
aZoom.SetValueSet(
@@ -1032,7 +1032,7 @@ void SwPagePreview::GetState( SfxItemSet& rSet )
// has the same status like the normal printing
{
const SfxPoolItem* pItem;
- SfxItemSet aSet( *rSet.GetPool(), svl::Items<SID_PRINTDOC, SID_PRINTDOC>{} );
+ SfxItemSet aSet( *rSet.GetPool(), svl::Items<SID_PRINTDOC, SID_PRINTDOC> );
GetSlotState( SID_PRINTDOC, SfxViewShell::GetInterface(), &aSet );
if( SfxItemState::DISABLED == aSet.GetItemState( SID_PRINTDOC,
false, &pItem ))
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 82ee7b2b83cb..2cced1e2e008 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -683,7 +683,7 @@ void SwView::ExecFormatFootnote()
void SwView::ExecNumberingOutline(SfxItemPool & rPool)
{
- SfxItemSet aTmp(rPool, svl::Items<FN_PARAM_1, FN_PARAM_1>{});
+ SfxItemSet aTmp(rPool, svl::Items<FN_PARAM_1, FN_PARAM_1>);
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateOutlineTabDialog(GetFrameWeld(), &aTmp, GetWrtShell()));
pDlg->Execute();
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 461b9150e59b..a6953b7c1e59 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1726,7 +1726,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
if(!pNumRule->IsAutoRule())
{
SfxItemSet aSet(GetPool(),
- svl::Items<RES_PARATR_NUMRULE, RES_PARATR_NUMRULE>{});
+ svl::Items<RES_PARATR_NUMRULE, RES_PARATR_NUMRULE>);
rShell.GetCurAttr(aSet);
if(SfxItemState::DEFAULT <=
aSet.GetItemState(RES_PARATR_NUMRULE))
@@ -1861,7 +1861,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
else
{
const SwViewOption& rViewOptions = *rSh.GetViewOptions();
- SfxItemSet aCoreSet(m_pShell->GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM, SID_ATTR_VIEWLAYOUT, SID_ATTR_VIEWLAYOUT>{} );
+ SfxItemSet aCoreSet(m_pShell->GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM, SID_ATTR_VIEWLAYOUT, SID_ATTR_VIEWLAYOUT> );
SvxZoomItem aZoom( rViewOptions.GetZoomType(), rViewOptions.GetZoom() );
const bool bBrowseMode = rSh.GetViewOptions()->getBrowseMode();
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index 3ecfa562009c..ccc82d329024 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -736,7 +736,7 @@ bool SwView::IsDrawTextHyphenate()
bool bHyphenate = false;
SfxItemSet aNewAttr( pSdrView->GetModel()->GetItemPool(),
- svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE>{} );
+ svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE> );
pSdrView->GetAttributes( aNewAttr );
if( aNewAttr.GetItemState( EE_PARA_HYPHENATE ) >= SfxItemState::DEFAULT )
bHyphenate = aNewAttr.Get( EE_PARA_HYPHENATE ).GetValue();
@@ -749,7 +749,7 @@ void SwView::HyphenateDrawText()
SdrView *pSdrView = m_pWrtShell->GetDrawView();
bool bHyphenate = IsDrawTextHyphenate();
- SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE>{} );
+ SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE> );
aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, !bHyphenate ) );
pSdrView->SetAttributes( aSet );
GetViewFrame()->GetBindings().Invalidate(FN_HYPHENATE_OPT_DLG);
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index 42081968d13f..98ca19acd8b8 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -330,7 +330,7 @@ void SetAppPrintOptions( SwViewShell* pSh, bool bWeb )
SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
SID_HTML_MODE, SID_HTML_MODE,
- FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER>{});
+ FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER>);
if(bWeb)
aSet.Put(SfxUInt16Item(SID_HTML_MODE,
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index 451eee04eb4f..a2b97c548b0b 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -402,7 +402,7 @@ void SwView::ExecSearch(SfxRequest& rReq)
/*20 */ RES_PARATR_VERTALIGN, RES_PARATR_VERTALIGN,
/*22 */ RES_LR_SPACE, RES_UL_SPACE,
/*24 */ SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP
- >::value);
+ >);
SfxItemSet aSet(m_pWrtShell->GetAttrPool(), aNormalAttr);
@@ -743,7 +743,7 @@ sal_uLong SwView::FUNC_Search( const SwSearchOptions& rOptions )
RES_PARATR_BEGIN, RES_PARATR_END-1,
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP
- >::value);
+ >);
SfxItemSet aSrchSet( m_pWrtShell->GetAttrPool(), aSearchAttrRange);
if( s_xSearchList && s_xSearchList->Count() )
diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index 3a1bd7e2b1bd..f003d050d479 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -284,7 +284,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
SfxItemSet aSet( GetPool(), svl::Items<RES_FRM_SIZE, RES_FRM_SIZE,
RES_VERT_ORIENT, RES_HORI_ORIENT,
- RES_COL, RES_COL>{} );
+ RES_COL, RES_COL> );
if(bVerticalFrame)
{
@@ -375,7 +375,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
SvxLRSpaceItem aLRTmp = pSectFormat->GetLRSpace();
aLRTmp.SetLeft(aLRTmp.GetLeft() + nLeftDiff);
aLRTmp.SetRight(aLRTmp.GetRight() + nRightDiff);
- SfxItemSet aSet(rSh.GetAttrPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE, RES_COL, RES_COL>{});
+ SfxItemSet aSet(rSh.GetAttrPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE, RES_COL, RES_COL>);
aSet.Put(aLRTmp);
//change the first/last column
if(bSect)
@@ -432,7 +432,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
const tools::Long nHeight = nPageHeight - (aLongULSpace.GetUpper() + aLongULSpace.GetLower());
SfxItemSet aSet( GetPool(), svl::Items<RES_FRM_SIZE, RES_FRM_SIZE,
- RES_VERT_ORIENT, RES_HORI_ORIENT>{} );
+ RES_VERT_ORIENT, RES_HORI_ORIENT> );
//which of the orientation attributes is to be put depends on the frame's environment
bool bRTL;
bool bVertL2R;
@@ -488,7 +488,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
SvxLRSpaceItem aLR = pSectFormat->GetLRSpace();
aLR.SetLeft(aLR.GetLeft() + nLeftDiff);
aLR.SetRight(aLR.GetRight() + nRightDiff);
- SfxItemSet aSet(rSh.GetAttrPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE, RES_COL, RES_COL>{});
+ SfxItemSet aSet(rSh.GetAttrPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE, RES_COL, RES_COL>);
aSet.Put(aLR);
//change the first/last column
if(bSect)
@@ -628,7 +628,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
const SvxTabStopItem& rDefTabs = rSh.GetDefault(RES_PARATR_TABSTOP);
// Default tab at pos 0
- SfxItemSet aSet( GetPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE>{} );
+ SfxItemSet aSet( GetPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE> );
rSh.GetCurAttr( aSet );
const SvxLRSpaceItem& rLR = aSet.Get(RES_LR_SPACE);
@@ -644,7 +644,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
SwTextFormatColl* pColl = rSh.GetCurTextFormatColl();
if( pColl && pColl->IsAutoUpdateFormat() )
{
- SfxItemSet aTmp(GetPool(), svl::Items<RES_PARATR_TABSTOP, RES_PARATR_TABSTOP>{});
+ SfxItemSet aTmp(GetPool(), svl::Items<RES_PARATR_TABSTOP, RES_PARATR_TABSTOP>);
aTmp.Put(aTabStops);
rSh.AutoUpdatePara( pColl, aTmp );
}
@@ -664,7 +664,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
- SfxItemSet aItemSet(GetPool(), svl::Items<RES_PARATR_TABSTOP, RES_PARATR_TABSTOP>{});
+ SfxItemSet aItemSet(GetPool(), svl::Items<RES_PARATR_TABSTOP, RES_PARATR_TABSTOP>);
rSh.GetCurAttr(aItemSet);
SvxTabStopItem aTabStopItem(aItemSet.Get(RES_PARATR_TABSTOP));
lcl_EraseDefTabs(aTabStopItem);
@@ -706,7 +706,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
const SfxPoolItem *fLineIndent, *pLeftIndent, *pRightIndent;
if (pReqArgs)
{
- SfxItemSet aLRSpaceSet( GetPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE>{} );
+ SfxItemSet aLRSpaceSet( GetPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE> );
rSh.GetCurAttr( aLRSpaceSet );
SvxLRSpaceItem aParaMargin( aLRSpaceSet.Get( RES_LR_SPACE ) );
@@ -731,7 +731,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
}
case SID_HANGING_INDENT:
{
- SfxItemSet aLRSpaceSet( GetPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE>{} );
+ SfxItemSet aLRSpaceSet( GetPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE> );
rSh.GetCurAttr( aLRSpaceSet );
SvxLRSpaceItem aParaMargin( aLRSpaceSet.Get( RES_LR_SPACE ) );
@@ -761,7 +761,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
{
// --> #i42922# Mouse move of numbering label
// has to consider the left indent of the paragraph
- SfxItemSet aSet( GetPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE>{} );
+ SfxItemSet aSet( GetPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE> );
rSh.GetCurAttr( aSet );
const SvxLRSpaceItem& rLR = aSet.Get(RES_LR_SPACE);
@@ -774,7 +774,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
}
else if( pColl && pColl->IsAutoUpdateFormat() )
{
- SfxItemSet aSet(GetPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE>{});
+ SfxItemSet aSet(GetPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE>);
aSet.Put(aParaMargin);
rSh.AutoUpdatePara( pColl, aSet);
}
@@ -783,7 +783,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
if ( aParaMargin.GetTextFirstLineOffset() < 0 )
{
- SfxItemSet aSet( GetPool(), svl::Items<RES_PARATR_TABSTOP, RES_PARATR_TABSTOP>{} );
+ SfxItemSet aSet( GetPool(), svl::Items<RES_PARATR_TABSTOP, RES_PARATR_TABSTOP> );
rSh.GetCurAttr( aSet );
const SvxTabStopItem& rTabStops = aSet.Get(RES_PARATR_TABSTOP);
@@ -810,7 +810,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
if( pColl && pColl->IsAutoUpdateFormat())
{
- SfxItemSet aSetTmp(GetPool(), svl::Items<RES_PARATR_TABSTOP, RES_PARATR_TABSTOP>{});
+ SfxItemSet aSetTmp(GetPool(), svl::Items<RES_PARATR_TABSTOP, RES_PARATR_TABSTOP>);
aSetTmp.Put(*aTabStops);
rSh.AutoUpdatePara( pColl, aSetTmp );
}
@@ -833,7 +833,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
SwTextFormatColl* pColl = rSh.GetCurTextFormatColl();
if( pColl && pColl->IsAutoUpdateFormat() )
{
- SfxItemSet aSet(GetPool(), svl::Items<RES_UL_SPACE, RES_UL_SPACE>{});
+ SfxItemSet aSet(GetPool(), svl::Items<RES_UL_SPACE, RES_UL_SPACE>);
aSet.Put(aParaMargin);
rSh.AutoUpdatePara( pColl, aSet);
}
@@ -844,7 +844,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
case SID_PARASPACE_INCREASE:
case SID_PARASPACE_DECREASE:
{
- SfxItemSet aULSpaceSet( GetPool(), svl::Items<RES_UL_SPACE, RES_UL_SPACE>{} );
+ SfxItemSet aULSpaceSet( GetPool(), svl::Items<RES_UL_SPACE, RES_UL_SPACE> );
rSh.GetCurAttr( aULSpaceSet );
SvxULSpaceItem aULSpace( aULSpaceSet.Get( RES_UL_SPACE ) );
sal_uInt16 nUpper = aULSpace.GetUpper();
@@ -966,7 +966,7 @@ void SwView::ExecTabWin( SfxRequest const & rReq )
if ( bFrameSelection || nFrameType & FrameTypeFlags::FLY_ANY || bSect)
{
SwSectionFormat *pSectFormat = nullptr;
- SfxItemSet aSet( GetPool(), svl::Items<RES_COL, RES_COL>{} );
+ SfxItemSet aSet( GetPool(), svl::Items<RES_COL, RES_COL> );
if(bSect)
{
SwSection *pSect = rSh.GetAnySection();
@@ -1384,7 +1384,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
SwapPageMargin( rDesc, aPageLRSpace );
SfxItemSet aCoreSet( GetPool(), svl::Items<RES_PARATR_TABSTOP, RES_PARATR_TABSTOP,
- RES_LR_SPACE, RES_UL_SPACE>{} );
+ RES_LR_SPACE, RES_UL_SPACE> );
// get also the list level indent values merged as LR-SPACE item, if needed.
rSh.GetCurAttr( aCoreSet, true );
const SelectionType nSelType = rSh.GetSelectionType();
@@ -1718,7 +1718,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
aDistLR.SetRight(rBox.GetDistance(SvxBoxItemLine::RIGHT));
//add the paragraph border distance
- SfxItemSet aCoreSet1( GetPool(), svl::Items<RES_BOX, RES_BOX>{} );
+ SfxItemSet aCoreSet1( GetPool(), svl::Items<RES_BOX, RES_BOX> );
rSh.GetCurAttr( aCoreSet1 );
const SvxBoxItem& rParaBox = aCoreSet1.Get(RES_BOX);
aDistLR.SetLeft(aDistLR.GetLeft() + rParaBox.GetDistance(SvxBoxItemLine::LEFT));
@@ -1734,7 +1734,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
{
SfxItemSet aCoreSet2( GetPool(),
svl::Items<RES_BOX, RES_BOX,
- SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{} );
+ SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER> );
SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
aBoxInfo.SetTable(false);
aBoxInfo.SetDist(true);
@@ -1745,7 +1745,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
aDistLR.SetRight(rBox.GetDistance(SvxBoxItemLine::RIGHT));
//add the border distance of the paragraph
- SfxItemSet aCoreSet1( GetPool(), svl::Items<RES_BOX, RES_BOX>{} );
+ SfxItemSet aCoreSet1( GetPool(), svl::Items<RES_BOX, RES_BOX> );
rSh.GetCurAttr( aCoreSet1 );
const SvxBoxItem& rParaBox = aCoreSet1.Get(RES_BOX);
aDistLR.SetLeft(aDistLR.GetLeft() + rParaBox.GetDistance(SvxBoxItemLine::LEFT));
@@ -1785,7 +1785,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
}
//add the border distance of the paragraph
- SfxItemSet aCoreSetTmp( GetPool(), svl::Items<RES_BOX, RES_BOX>{} );
+ SfxItemSet aCoreSetTmp( GetPool(), svl::Items<RES_BOX, RES_BOX> );
rSh.GetCurAttr( aCoreSetTmp );
const SvxBoxItem& rParaBox = aCoreSetTmp.Get(RES_BOX);
aDistLR.SetLeft(aDistLR.GetLeft() + rParaBox.GetDistance(SvxBoxItemLine::LEFT));
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index 98e71d8e09a8..8e5be528f6fa 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -455,7 +455,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
SID_HTML_MODE, SID_HTML_MODE,
- FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER>{} );
+ FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER> );
VclPtr<SfxPrinter> pPrinter = SfxPrinter::Create ( aStream, std::move(pItemSet) );
assert (! pPrinter->isDisposed() );
// set printer only once; in _postSetValues
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index c8c11e93da39..f264c158df04 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -738,11 +738,11 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
SfxItemSet aSearch(m_pDocShell->GetDoc()->GetAttrPool(),
svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_PARATR_BEGIN, RES_PARATR_END-1,
- RES_FRMATR_BEGIN, RES_FRMATR_END-1>{});
+ RES_FRMATR_BEGIN, RES_FRMATR_END-1>);
SfxItemSet aReplace(m_pDocShell->GetDoc()->GetAttrPool(),
svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_PARATR_BEGIN, RES_PARATR_END-1,
- RES_FRMATR_BEGIN, RES_FRMATR_END-1>{});
+ RES_FRMATR_BEGIN, RES_FRMATR_END-1>);
pSearch->FillSearchItemSet(aSearch);
pSearch->FillReplaceItemSet(aReplace);
bool bCancel;
@@ -870,7 +870,7 @@ SwUnoCursor* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
RES_TXTATR_INETFMT, RES_TXTATR_CHARFMT,
RES_PARATR_BEGIN, RES_PARATR_END - 1,
- RES_FRMATR_BEGIN, RES_FRMATR_END - 1>{});
+ RES_FRMATR_BEGIN, RES_FRMATR_END - 1>);
pSearch->FillSearchItemSet(aSearch);
bool bCancel;
nResult = static_cast<sal_Int32>(pUnoCursor->FindAttrs(aSearch, !pSearch->m_bStyles,
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 59d193807d04..516e0789fe4a 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -662,7 +662,7 @@ void SwGlobalTree::ExecuteContextMenuAction(std::string_view rSelectedPopupEntry
RES_BACKGROUND, RES_BACKGROUND,
RES_COL, RES_COL,
SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE,
- FN_PARAM_TOX_TYPE, FN_PARAM_TOX_TYPE>{});
+ FN_PARAM_TOX_TYPE, FN_PARAM_TOX_TYPE>);
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
ScopedVclPtr<AbstractMultiTOXTabDialog> pDlg(pFact->CreateMultiTOXTabDialog(
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index 6e5caee15da3..6df9efe5a855 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -387,7 +387,7 @@ void SwNumFormatBase::CallSelectHdl()
SID_ATTR_NUMBERFORMAT_NOLANGUAGE,
SID_ATTR_NUMBERFORMAT_NOLANGUAGE,
SID_ATTR_NUMBERFORMAT_ADD_AUTO,
- SID_ATTR_NUMBERFORMAT_ADD_AUTO>{});
+ SID_ATTR_NUMBERFORMAT_ADD_AUTO>);
double fValue = SwNumFormatBase::GetDefValue(nCurrFormatType);
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index 82d00c830f8d..6447862a44f0 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -201,7 +201,7 @@ void ApplyCharBackground(const Color& rBackgroundColor, SwWrtShell& rShell)
rShell.StartUndo(SwUndoId::INSATTR);
SfxItemSet aCoreSet(rShell.GetView().GetPool(), svl::Items<
- RES_CHRATR_GRABBAG, RES_CHRATR_GRABBAG>{});
+ RES_CHRATR_GRABBAG, RES_CHRATR_GRABBAG>);
rShell.GetCurAttr(aCoreSet);
@@ -524,7 +524,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
SID_ATTR_BORDER_INNER,SID_ATTR_BORDER_INNER, // [10023
SID_ATTR_PAGE_SIZE,SID_ATTR_PAGE_SIZE, // [10051
SID_ATTR_PAGE_ON,SID_ATTR_PAGE_SHARED, // [10060
- SID_ATTR_PAGE_SHARED_FIRST,SID_ATTR_PAGE_SHARED_FIRST>{});
+ SID_ATTR_PAGE_SHARED_FIRST,SID_ATTR_PAGE_SHARED_FIRST>);
// set correct parent to get the XFILL_NONE FillStyle as needed
aHeaderSet.SetParent(&rMaster.GetDoc()->GetDfltFrameFormat()->GetAttrSet());
@@ -574,7 +574,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
SID_ATTR_BORDER_INNER,SID_ATTR_BORDER_INNER, // [10023
SID_ATTR_PAGE_SIZE,SID_ATTR_PAGE_SIZE, // [10051
SID_ATTR_PAGE_ON,SID_ATTR_PAGE_SHARED, // [10060
- SID_ATTR_PAGE_SHARED_FIRST,SID_ATTR_PAGE_SHARED_FIRST>{});
+ SID_ATTR_PAGE_SHARED_FIRST,SID_ATTR_PAGE_SHARED_FIRST>);
// set correct parent to get the XFILL_NONE FillStyle as needed
aFooterSet.SetParent(&rMaster.GetDoc()->GetDfltFrameFormat()->GetAttrSet());
@@ -706,7 +706,7 @@ void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet )
}
else
{
- SfxItemSet aCoreSet(rShell.GetView().GetPool(), svl::Items<RES_PAGEDESC, RES_PAGEDESC>{} );
+ SfxItemSet aCoreSet(rShell.GetView().GetPool(), svl::Items<RES_PAGEDESC, RES_PAGEDESC> );
rShell.GetCurAttr( aCoreSet );
if(SfxItemState::SET == aCoreSet.GetItemState( RES_PAGEDESC, true, &pItem ) )
{
diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx
index 104d3c0456be..1b35fbb52c1b 100644
--- a/sw/source/uibase/wrtsh/delete.cxx
+++ b/sw/source/uibase/wrtsh/delete.cxx
@@ -63,7 +63,7 @@ bool SwWrtShell::TryRemoveIndent()
{
bool bResult = false;
- SfxItemSet aAttrSet(GetAttrPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE>{});
+ SfxItemSet aAttrSet(GetAttrPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE>);
GetCurAttr(aAttrSet);
SvxLRSpaceItem aItem = aAttrSet.Get(RES_LR_SPACE);
@@ -440,7 +440,7 @@ bool SwWrtShell::DelRight()
if ( IsRedlineOn() && (eAnchorId != RndStdIds::FLY_AS_CHAR &&
eAnchorId != RndStdIds::FLY_AT_CHAR) )
{
- SfxItemSet aSet(GetAttrPool(), svl::Items<RES_ANCHOR, RES_ANCHOR>{});
+ SfxItemSet aSet(GetAttrPool(), svl::Items<RES_ANCHOR, RES_ANCHOR>);
GetFlyFrameAttr(aSet);
SwFormatAnchor aAnch(RndStdIds::FLY_AT_CHAR);
aSet.Put(aAnch);
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 3be1be85b1f3..41f71cd26462 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -219,10 +219,10 @@ void SwWrtShell::Insert( const OUString &rStr )
bCallIns = m_bIns /*|| bHasSel*/;
bool bDeleted = false;
- typedef svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_RSID - 1,
+ const auto CharItems = svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_RSID - 1,
RES_CHRATR_RSID + 1, RES_CHRATR_END - 1,
- RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT> CharItems;
- SfxItemSet aCharAttrSet(GetAttrPool(), CharItems{});
+ RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT>;
+ SfxItemSet aCharAttrSet(GetAttrPool(), CharItems);
if( bHasSel || ( !m_bIns && SelectHiddenRange() ) )
{
@@ -1626,7 +1626,7 @@ void SwWrtShell::AutoUpdatePara(SwTextFormatColl* pColl, const SfxItemSet& rStyl
SID_ATTR_TABSTOP_DEFAULTS,SID_ATTR_TABSTOP_OFFSET,
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP,
- SID_ATTR_PARA_PAGENUM, SID_ATTR_PARA_PAGENUM>{});
+ SID_ATTR_PARA_PAGENUM, SID_ATTR_PARA_PAGENUM>);
GetPaMAttr( pCursor, aCoreSet );
bool bReset = false;
SfxItemIter aParaIter( aCoreSet );