summaryrefslogtreecommitdiff
path: root/sw/source/uibase/shells
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/shells
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/shells')
-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
15 files changed, 93 insertions, 93 deletions
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();