summaryrefslogtreecommitdiff
path: root/sw/source/uibase/shells/basesh.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/shells/basesh.cxx')
-rw-r--r--sw/source/uibase/shells/basesh.cxx38
1 files changed, 19 insertions, 19 deletions
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 );
}
generated by cgit (git 2.34.1) at 2024-06-30 09:28:56 +0000