diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-07-19 11:04:45 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-07-19 16:33:01 +0200 |
| commit | b1668edf7fa3ad8c32bcc4d73821770f2df011ca (patch) | |
| tree | cb93a00ca59f770e616668af15fdc6a50e1627a1 | |
| parent | 5b3c530016927d3e91e3124e124f7b428ab285ac (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>
330 files changed, 835 insertions, 837 deletions
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index 58c4097284e4..36d55debb818 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -63,7 +63,7 @@ SfxPrinter* DocShell::GetPrinter( bool bCreate ) { if ( !pPrinter && bCreate ) pPrinter.disposeAndReset(VclPtr<SfxPrinter>::Create(std::make_unique<SfxItemSet>( - GetPool(), svl::Items<SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN>{} + GetPool(), svl::Items<SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN> ))); return pPrinter.get(); diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx index 3ba1bf68163f..bba04b70ad2b 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx @@ -48,7 +48,7 @@ SfxItemSet NumberFormatDialog::CreateEmptyItemSetForNumberFormatDialog( SfxItemP SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, SID_ATTR_NUMBERFORMAT_ONE_AREA, SID_ATTR_NUMBERFORMAT_ONE_AREA, SID_ATTR_NUMBERFORMAT_NOLANGUAGE, SID_ATTR_NUMBERFORMAT_NOLANGUAGE, - SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE>{} ); + SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE> ); } } //namespace chart diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index 66769a1dee91..d72e6cb2dccf 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -259,7 +259,7 @@ SfxItemSet DrawViewWrapper::getPositionAndSizeItemSetFromMarkedObject() const SDRATTR_CORNER_RADIUS, SDRATTR_CORNER_RADIUS, SID_ATTR_TRANSFORM_POS_X, SID_ATTR_TRANSFORM_ANGLE, SID_ATTR_TRANSFORM_PROTECT_POS, SID_ATTR_TRANSFORM_AUTOHEIGHT, - SID_ATTR_METRIC, SID_ATTR_METRIC>{}); + SID_ATTR_METRIC, SID_ATTR_METRIC>); SfxItemSet aGeoSet( E3dView::GetGeoAttrFromMarked() ); aFullSet.Put( aGeoSet ); aFullSet.Put( SfxUInt16Item(SID_ATTR_METRIC,static_cast< sal_uInt16 >( ConfigurationAccess::getFieldUnit()))); diff --git a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx index 8d4094bae0a8..0792df7b624e 100644 --- a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx +++ b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx @@ -32,7 +32,7 @@ const WhichRangesContainer nTitleWhichPairs(svl::Items< SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx EE_ITEMS_START, EE_ITEMS_END, // Characters SID_CHAR_DLG_PREVIEW_STRING, SID_CHAR_DLG_PREVIEW_STRING // Characters ->::value); +>); const WhichRangesContainer nAxisWhichPairs(svl::Items< SCHATTR_TEXT_START, SCHATTR_TEXT_END, @@ -42,7 +42,7 @@ const WhichRangesContainer nAxisWhichPairs(svl::Items< SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE, // 10585 - 10585 svx/svxids.hrc SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, // 11432 svx/svxids.hrc SID_CHAR_DLG_PREVIEW_STRING, SID_CHAR_DLG_PREVIEW_STRING // Characters ->::value); +>); const WhichRangesContainer nAllAxisWhichPairs(svl::Items< SCHATTR_TEXT_START, SCHATTR_TEXT_END, @@ -50,11 +50,11 @@ const WhichRangesContainer nAllAxisWhichPairs(svl::Items< XATTR_LINE_FIRST, XATTR_LINE_LAST, EE_ITEMS_START, EE_ITEMS_END, // Characters SID_CHAR_DLG_PREVIEW_STRING, SID_CHAR_DLG_PREVIEW_STRING // Characters ->::value); +>); const WhichRangesContainer nGridWhichPairs(svl::Items< XATTR_LINE_FIRST, XATTR_LINE_LAST // 1000 - 1016 svx/xdef.hxx ->::value); +>); const WhichRangesContainer nLegendWhichPairs(svl::Items< SCHATTR_LEGEND_START, SCHATTR_LEGEND_END, // 3 - 3 sch/schattr.hxx @@ -63,7 +63,7 @@ const WhichRangesContainer nLegendWhichPairs(svl::Items< SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx EE_ITEMS_START, EE_ITEMS_END, // Characters SID_CHAR_DLG_PREVIEW_STRING, SID_CHAR_DLG_PREVIEW_STRING // Characters ->::value); +>); const WhichRangesContainer nDataLabelWhichPairs(svl::Items< SCHATTR_DATADESCR_START, SCHATTR_DATADESCR_END, @@ -71,7 +71,7 @@ const WhichRangesContainer nDataLabelWhichPairs(svl::Items< EE_PARA_WRITINGDIR,EE_PARA_WRITINGDIR, SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, /* 10585 - 10585 svx/svxids.hrc */ SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE /* 11432 svx/svxids.hrc */ ->::value); +>); const WhichRangesContainer nDataPointWhichPairs(svl::Items< SCHATTR_DATADESCR_START, SCHATTR_DATADESCR_END, /* 1 - 2 sch/schattr.hxx*/ @@ -87,7 +87,7 @@ const WhichRangesContainer nDataPointWhichPairs(svl::Items< SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, /* 10585 - 10585 svx/svxids.hrc */ SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, /* 11432 svx/svxids.hrc */ SID_CHAR_DLG_PREVIEW_STRING, SID_CHAR_DLG_PREVIEW_STRING ->::value); +>); const WhichRangesContainer nTextLabelWhichPairs(svl::Items< SCHATTR_DATADESCR_START, SCHATTR_DATADESCR_END, @@ -101,13 +101,13 @@ const WhichRangesContainer nTextLabelWhichPairs(svl::Items< SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, SID_CHAR_DLG_PREVIEW_STRING, SID_CHAR_DLG_PREVIEW_STRING ->::value); +>); const WhichRangesContainer nSeriesOptionsWhichPairs(svl::Items< SCHATTR_AXIS,SCHATTR_AXIS, /* 69 sch/schattr.hxx*/ SCHATTR_BAR_OVERLAP,SCHATTR_BAR_CONNECT, /* 98 - 100 (incl. SCHATTR_GAPWIDTH) */ SCHATTR_GROUP_BARS_PER_AXIS,SCHATTR_AXIS_FOR_ALL_SERIES ->::value); +>); // nDataPointWhichPairs + nSeriesOptionsWhichPairs const WhichRangesContainer nRowWhichPairs(svl::Items< @@ -127,39 +127,39 @@ const WhichRangesContainer nRowWhichPairs(svl::Items< SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, /* 10585 - 10585 svx/svxids.hrc */ SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, /* 11432 svx/svxids.hrc */ SID_CHAR_DLG_PREVIEW_STRING, SID_CHAR_DLG_PREVIEW_STRING ->::value); +>); const WhichRangesContainer nStatWhichPairs(svl::Items< SCHATTR_STAT_START, SCHATTR_STAT_END, // 45 - 52 sch/schattr.hxx SCHATTR_REGRESSION_START, SCHATTR_REGRESSION_END // 108 - 109 ->::value); +>); const WhichRangesContainer nErrorBarWhichPairs(svl::Items< SCHATTR_STAT_START, SCHATTR_STAT_END, // 45 - 52 sch/schattr.hxx XATTR_LINE_FIRST, XATTR_LINE_LAST // 1000 - 1016 svx/xdef.hxx ->::value); +>); // for CharacterProperties const WhichRangesContainer nCharacterPropertyWhichPairs(svl::Items< EE_ITEMS_START, EE_ITEMS_END, // Characters SID_CHAR_DLG_PREVIEW_STRING, SID_CHAR_DLG_PREVIEW_STRING // Characters ->::value); +>); const WhichRangesContainer nLinePropertyWhichPairs(svl::Items< XATTR_LINE_FIRST, XATTR_LINE_LAST // 1000 - 1016 svx/xdef.hxx ->::value); +>); const WhichRangesContainer nLineAndFillPropertyWhichPairs(svl::Items< XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1000 - 1016 svx/xdef.hxx SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST // 1067 - 1078 svx/svddef.hxx ->::value); +>); const WhichRangesContainer nRegressionCurveWhichPairs(svl::Items< SCHATTR_REGRESSION_START, SCHATTR_REGRESSION_END, // 108 - 109 XATTR_LINE_FIRST, XATTR_LINE_LAST // 1000 - 1016 svx/xdef.hxx ->::value); +>); const WhichRangesContainer nRegEquationWhichPairs(svl::Items< XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx @@ -168,6 +168,6 @@ const WhichRangesContainer nRegEquationWhichPairs(svl::Items< EE_ITEMS_START, EE_ITEMS_END, // Characters SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE, // 10585 - 10585 svx/svxids.hrc SID_CHAR_DLG_PREVIEW_STRING, SID_CHAR_DLG_PREVIEW_STRING // Characters ->::value); +>); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index f2011022595f..545f600f36a2 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -139,7 +139,7 @@ void DrawCommandDispatch::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/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 360c2513df18..f2ea87f399f7 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -537,7 +537,7 @@ void ShapeController::executeDispatch_ParagraphDialog() rPool, svl::Items< EE_ITEMS_START, EE_ITEMS_END, - SID_ATTR_PARA_PAGEBREAK, SID_ATTR_PARA_WIDOWS>{}); + SID_ATTR_PARA_PAGEBREAK, SID_ATTR_PARA_WIDOWS>); aNewAttr.Put( aAttr ); aNewAttr.Put( SvxHyphenZoneItem( false, SID_ATTR_PARA_HYPHENZONE ) ); aNewAttr.Put( SvxFormatBreakItem( SvxBreak::NONE, SID_ATTR_PARA_PAGEBREAK ) ); diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index b583fa03768e..22072108293c 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -456,7 +456,7 @@ IMPL_LINK_NOARG(SpellDialog, CheckGrammarHdl, weld::Toggleable&, void) void SpellDialog::StartSpellOptDlg_Impl() { - SfxItemSet aSet( SfxGetpApp()->GetPool(), svl::Items<SID_AUTOSPELL_CHECK,SID_AUTOSPELL_CHECK>{}); + SfxItemSet aSet( SfxGetpApp()->GetPool(), svl::Items<SID_AUTOSPELL_CHECK,SID_AUTOSPELL_CHECK>); SfxSingleTabDialogController aDlg(m_xDialog.get(), &aSet, "cui/ui/spelloptionsdialog.ui", "SpellOptionsDialog"); std::unique_ptr<SfxTabPage> xPage = SvxLinguTabPage::Create(aDlg.get_content_area(), &aDlg, &aSet); diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 91ec19f7725f..cb48f126278b 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -118,7 +118,7 @@ SvxHpLinkDlg::SvxHpLinkDlg(SfxBindings* pBindings, SfxChildWindow* pChild, weld: // create itemset for tabpages mpItemSet = std::make_unique<SfxItemSet>( SfxGetpApp()->GetPool(), svl::Items<SID_HYPERLINK_GETLINK, - SID_HYPERLINK_SETLINK>{} ); + SID_HYPERLINK_SETLINK> ); SvxHyperlinkItem aItem(SID_HYPERLINK_GETLINK); mpItemSet->Put(aItem); @@ -185,7 +185,7 @@ void SvxHpLinkDlg::Close() void SvxHpLinkDlg::Apply() { SfxItemSet aItemSet( SfxGetpApp()->GetPool(), svl::Items<SID_HYPERLINK_GETLINK, - SID_HYPERLINK_SETLINK>{} ); + SID_HYPERLINK_SETLINK> ); SvxHyperlinkTabPageBase* pCurrentPage = static_cast<SvxHyperlinkTabPageBase*>( GetTabPage( GetCurPageId() ) ); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 6d752f10bf82..5dbacdeebb31 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -343,7 +343,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, weld::Button&, voi // create empty itemset for macro-dlg SfxItemSet aItemSet( SfxGetpApp()->GetPool(), svl::Items<SID_ATTR_MACROITEM, - SID_ATTR_MACROITEM>{} ); + SID_ATTR_MACROITEM> ); aItemSet.Put ( aItem ); DisableClose( true ); diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 7e8541c5c615..6bd7766b04c2 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -118,7 +118,7 @@ void SvxPostItDialog::ShowLastAuthor(std::u16string_view rAuthor, std::u16string WhichRangesContainer SvxPostItDialog::GetRanges() { - return WhichRangesContainer(svl::Items<SID_ATTR_POSTIT_AUTHOR, SID_ATTR_POSTIT_TEXT>::value); + return WhichRangesContainer(svl::Items<SID_ATTR_POSTIT_AUTHOR, SID_ATTR_POSTIT_TEXT>); } void SvxPostItDialog::EnableTravel(bool bNext, bool bPrev) diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 5085a2dc4bce..943bf5c84023 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1396,7 +1396,7 @@ class SvxMacroAssignDialog : public VclAbstractDialog public: SvxMacroAssignDialog( weld::Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, const Reference< XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent ) - :m_aItems( SfxGetpApp()->GetPool(), svl::Items<SID_ATTR_MACROITEM, SID_ATTR_MACROITEM>{} ) + :m_aItems( SfxGetpApp()->GetPool(), svl::Items<SID_ATTR_MACROITEM, SID_ATTR_MACROITEM> ) { m_aItems.Put( SfxBoolItem( SID_ATTR_MACROITEM, _bUnoDialogMode ) ); m_xDialog.reset(new SvxMacroAssignDlg(_pParent, _rxDocumentFrame, m_aItems, _rxEvents, _nInitiallySelectedEvent)); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index e7bf078bcae4..4f8d97b01595 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1041,9 +1041,9 @@ std::unique_ptr<SfxItemSet> OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId SID_ATTR_METRIC, SID_ATTR_METRIC, SID_AUTOSPELL_CHECK, SID_AUTOSPELL_CHECK, SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER, - SID_ATTR_YEAR2000, SID_ATTR_YEAR2000>{} ); + SID_ATTR_YEAR2000, SID_ATTR_YEAR2000> ); - SfxItemSet aOptSet( SfxGetpApp()->GetPool(), svl::Items<SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER>{} ); + SfxItemSet aOptSet( SfxGetpApp()->GetPool(), svl::Items<SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER> ); SfxGetpApp()->GetOptions(aOptSet); pRet->Put(aOptSet); @@ -1082,7 +1082,7 @@ std::unique_ptr<SfxItemSet> OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId SID_SET_DOCUMENT_LANGUAGE, SID_SET_DOCUMENT_LANGUAGE, SID_ATTR_LANGUAGE, SID_ATTR_LANGUAGE, SID_AUTOSPELL_CHECK, SID_AUTOSPELL_CHECK, - SID_OPT_LOCALE_CHANGED, SID_OPT_LOCALE_CHANGED>{}); + SID_OPT_LOCALE_CHANGED, SID_OPT_LOCALE_CHANGED>); // for linguistic SfxHyphenRegionItem aHyphen( SID_ATTR_HYPHENREGION ); @@ -1146,7 +1146,7 @@ std::unique_ptr<SfxItemSet> OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId //SID_OPTIONS_START - ..END SID_SAVEREL_INET, SID_SAVEREL_FSYS, SID_INET_NOPROXY, SID_INET_FTP_PROXY_PORT, - SID_SECURE_URL, SID_SECURE_URL>{} ); + SID_SECURE_URL, SID_SECURE_URL> ); SfxGetpApp()->GetOptions(*pRet); break; case SID_FILTER_DLG: @@ -1156,13 +1156,13 @@ std::unique_ptr<SfxItemSet> OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId SID_ATTR_WARNALIENFORMAT, SID_ATTR_WARNALIENFORMAT, SID_ATTR_DOCINFO, SID_ATTR_AUTOSAVEMINUTE, SID_SAVEREL_INET, SID_SAVEREL_FSYS, - SID_ATTR_PRETTYPRINTING, SID_ATTR_PRETTYPRINTING>{} ); + SID_ATTR_PRETTYPRINTING, SID_ATTR_PRETTYPRINTING> ); SfxGetpApp()->GetOptions(*pRet); break; case SID_SB_STARBASEOPTIONS: pRet = std::make_unique<SfxItemSet>( SfxGetpApp()->GetPool(), - svl::Items<SID_SB_POOLING_ENABLED, SID_SB_DB_REGISTER>{} ); + svl::Items<SID_SB_POOLING_ENABLED, SID_SB_DB_REGISTER> ); ::offapp::ConnectionPoolConfig::GetOptions(*pRet); svx::DbRegisteredNamesConfig::GetOptions(*pRet); break; @@ -1170,7 +1170,7 @@ std::unique_ptr<SfxItemSet> OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId case SID_SCH_EDITOPTIONS: { SvxChartOptions aChartOpt; - pRet = std::make_unique<SfxItemSet>( SfxGetpApp()->GetPool(), svl::Items<SID_SCH_EDITOPTIONS, SID_SCH_EDITOPTIONS>{} ); + pRet = std::make_unique<SfxItemSet>( SfxGetpApp()->GetPool(), svl::Items<SID_SCH_EDITOPTIONS, SID_SCH_EDITOPTIONS> ); pRet->Put( SvxChartColorTableItem( SID_SCH_EDITOPTIONS, aChartOpt.GetDefaultColors() ) ); break; } @@ -1187,7 +1187,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create()); const SfxPoolItem* pItem = nullptr; - SfxItemSet aOptSet(SfxGetpApp()->GetPool(), svl::Items<SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER>{} ); + SfxItemSet aOptSet(SfxGetpApp()->GetPool(), svl::Items<SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER> ); aOptSet.Put(rSet); if(aOptSet.Count()) SfxGetpApp()->SetOptions( aOptSet ); diff --git a/cui/source/tabpages/TextColumnsPage.cxx b/cui/source/tabpages/TextColumnsPage.cxx index 9c5c27404f3d..5bfd3b47a69e 100644 --- a/cui/source/tabpages/TextColumnsPage.cxx +++ b/cui/source/tabpages/TextColumnsPage.cxx @@ -16,8 +16,8 @@ #include <TextColumnsPage.hxx> -const WhichRangesContainer SvxTextColumnsPage::pRanges( - svl::Items<SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST>::value); +const WhichRangesContainer + SvxTextColumnsPage::pRanges(svl::Items<SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST>); SvxTextColumnsPage::SvxTextColumnsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 4c9b43454c74..a49a115a13b5 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -49,7 +49,7 @@ const WhichRangesContainer AlignmentTabPage::s_pRanges( SID_ATTR_FRAMEDIRECTION, SID_ATTR_FRAMEDIRECTION, SID_ATTR_ALIGN_ASIANVERTICAL, SID_ATTR_ALIGN_ASIANVERTICAL, SID_ATTR_ALIGN_SHRINKTOFIT, SID_ATTR_ALIGN_SHRINKTOFIT, - SID_ATTR_ALIGN_HOR_JUSTIFY, SID_ATTR_ALIGN_VER_JUSTIFY>::value); + SID_ATTR_ALIGN_HOR_JUSTIFY, SID_ATTR_ALIGN_VER_JUSTIFY>); namespace { diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 229891a082fc..7b06e9a86092 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -39,7 +39,7 @@ using namespace css; const WhichRangesContainer SvxBkgTabPage::pPageRanges(svl::Items< SID_ATTR_BRUSH, SID_ATTR_BRUSH, SID_ATTR_BRUSH_CHAR, SID_ATTR_BRUSH_CHAR ->::value); +>); static sal_uInt16 lcl_GetTableDestSlot(sal_Int32 nTblDest) { diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index d21d046da82c..756e7abe9bea 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.cxx @@ -72,7 +72,7 @@ void SvxBorderBackgroundDlg::PageCreated(const OString& rPageId, SfxTabPage& rTa SfxItemSet aNew( *GetInputSetImpl()->GetPool(), svl::Items<SID_COLOR_TABLE, SID_PATTERN_LIST, - SID_OFFER_IMPORT, SID_OFFER_IMPORT>{}); + SID_OFFER_IMPORT, SID_OFFER_IMPORT>); aNew.Put(*GetInputSetImpl()); diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 430cc4e55295..435b86ad6b9d 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -75,7 +75,7 @@ const WhichRangesContainer SvxBorderTabPage::pRanges( SID_ATTR_ALIGN_MARGIN, SID_ATTR_ALIGN_MARGIN, SID_ATTR_BORDER_CONNECT, SID_ATTR_BORDER_CONNECT, SID_SW_COLLAPSING_BORDERS, SID_SW_COLLAPSING_BORDERS, - SID_ATTR_BORDER_DIAG_TLBR, SID_ATTR_BORDER_DIAG_BLTR>::value); + SID_ATTR_BORDER_DIAG_TLBR, SID_ATTR_BORDER_DIAG_BLTR>); static void lcl_SetDecimalDigitsTo1(weld::MetricSpinButton& rField) { diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index a829ace12795..821dac2bad05 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -73,7 +73,7 @@ const WhichRangesContainer SvxCharNamePage::pNameRanges(svl::Items< SID_ATTR_CHAR_LANGUAGE, SID_ATTR_CHAR_LANGUAGE, SID_ATTR_CHAR_CJK_FONT, SID_ATTR_CHAR_CJK_WEIGHT, SID_ATTR_CHAR_CTL_FONT, SID_ATTR_CHAR_CTL_WEIGHT ->::value); +>); const WhichRangesContainer SvxCharEffectsPage::pEffectsRanges(svl::Items< SID_ATTR_CHAR_SHADOWED, SID_ATTR_CHAR_UNDERLINE, @@ -84,7 +84,7 @@ const WhichRangesContainer SvxCharEffectsPage::pEffectsRanges(svl::Items< SID_ATTR_CHAR_RELIEF, SID_ATTR_CHAR_RELIEF, SID_ATTR_CHAR_HIDDEN, SID_ATTR_CHAR_HIDDEN, SID_ATTR_CHAR_OVERLINE, SID_ATTR_CHAR_OVERLINE ->::value); +>); const WhichRangesContainer SvxCharPositionPage::pPositionRanges(svl::Items< SID_ATTR_CHAR_KERNING, SID_ATTR_CHAR_KERNING, @@ -92,11 +92,11 @@ const WhichRangesContainer SvxCharPositionPage::pPositionRanges(svl::Items< SID_ATTR_CHAR_AUTOKERN, SID_ATTR_CHAR_AUTOKERN, SID_ATTR_CHAR_ROTATED, SID_ATTR_CHAR_SCALEWIDTH, SID_ATTR_CHAR_WIDTH_FIT_TO_LINE, SID_ATTR_CHAR_WIDTH_FIT_TO_LINE ->::value); +>); const WhichRangesContainer SvxCharTwoLinesPage::pTwoLinesRanges(svl::Items< SID_ATTR_CHAR_TWO_LINES, SID_ATTR_CHAR_TWO_LINES ->::value); +>); // C-Function ------------------------------------------------------------ diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index ffe14bea9754..677613191130 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -34,7 +34,7 @@ #include <connect.hxx> const WhichRangesContainer SvxConnectionPage::pRanges( - svl::Items<SDRATTR_EDGE_FIRST, SDRATTR_EDGE_LAST>::value); + svl::Items<SDRATTR_EDGE_FIRST, SDRATTR_EDGE_LAST>); /************************************************************************* |* diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index a9af513ba3f5..867a31885af7 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -55,7 +55,7 @@ const WhichRangesContainer SvxCaptionTabPage::pCaptionRanges( SDRATTR_CAPTIONANGLE, SDRATTR_CAPTIONGAP, SDRATTR_CAPTIONESCDIR, SDRATTR_CAPTIONESCISREL, SDRATTR_CAPTIONESCREL, SDRATTR_CAPTIONESCABS, - SDRATTR_CAPTIONLINELEN, SDRATTR_CAPTIONFITLINELEN>::value); + SDRATTR_CAPTIONLINELEN, SDRATTR_CAPTIONFITLINELEN>); SvxCaptionTabPage::SvxCaptionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) : SfxTabPage(pPage, pController, "cui/ui/calloutpage.ui", "CalloutPage", &rInAttrs) diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index c27f904ef970..027f52a77d18 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -37,7 +37,7 @@ #include <measure.hxx> const WhichRangesContainer SvxMeasurePage::pRanges( - svl::Items<SDRATTR_MEASURE_FIRST, SDRATTR_MEASURE_LAST>::value); + svl::Items<SDRATTR_MEASURE_FIRST, SDRATTR_MEASURE_LAST>); /************************************************************************* |* diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index f1560168b16a..3c384aa8590c 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -59,7 +59,7 @@ const WhichRangesContainer SvxNumberFormatTabPage::pRanges( SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, SID_ATTR_NUMBERFORMAT_ONE_AREA, SID_ATTR_NUMBERFORMAT_ONE_AREA, SID_ATTR_NUMBERFORMAT_NOLANGUAGE, SID_ATTR_NUMBERFORMAT_NOLANGUAGE, - SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE>::value); + SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE>); /************************************************************************* #* Method: SvxNumberPreview diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 84e3b38af282..83014c794eb3 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -64,7 +64,7 @@ const WhichRangesContainer SvxPageDescPage::pRanges( svl::Items< SID_ATTR_BORDER_OUTER, SID_ATTR_BORDER_SHADOW, SID_ATTR_LRSPACE, SID_ATTR_PAGE_SHARED, - SID_SWREGISTER_COLLECTION, SID_SWREGISTER_MODE>::value); + SID_SWREGISTER_COLLECTION, SID_SWREGISTER_MODE>); // ------- Mapping page layout ------------------------------------------ const SvxPageUsage aArr[] = @@ -1156,7 +1156,7 @@ void SvxPageDescPage::ResetBackground_Impl(const SfxItemSet& rSet) { // create FillAttributes from SvxBrushItem const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rTmpSet.Get(nWhich)); - SfxItemSet aTempSet(*rTmpSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + SfxItemSet aTempSet(*rTmpSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet); aHeaderFillAttributes = std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(aTempSet); @@ -1192,7 +1192,7 @@ void SvxPageDescPage::ResetBackground_Impl(const SfxItemSet& rSet) { // create FillAttributes from SvxBrushItem const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rTmpSet.Get(nWhich)); - SfxItemSet aTempSet(*rTmpSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + SfxItemSet aTempSet(*rTmpSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet); aFooterFillAttributes = std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(aTempSet); @@ -1218,7 +1218,7 @@ void SvxPageDescPage::ResetBackground_Impl(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); aPageFillAttributes = std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(aTempSet); @@ -1282,7 +1282,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet ) { // aBspWin.SetHdColor(rItem.GetColor()); const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rHeaderSet.Get(nWhich)); - SfxItemSet aTempSet(*rHeaderSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>::value); + SfxItemSet aTempSet(*rHeaderSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet); aHeaderFillAttributes = std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(aTempSet); @@ -1337,7 +1337,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet ) { // aBspWin.SetFtColor(rItem.GetColor()); const SvxBrushItem& rItem = static_cast<const SvxBrushItem&>(rFooterSet.Get(nWhich)); - SfxItemSet aTempSet(*rFooterSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>::value); + SfxItemSet aTempSet(*rFooterSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet); aFooterFillAttributes = std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(aTempSet); diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 8b3a14f0d38f..015853180882 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -56,15 +56,15 @@ const WhichRangesContainer SvxStdParagraphTabPage::pStdRanges( SID_ATTR_PARA_LINESPACE, SID_ATTR_PARA_LINESPACE, // 10033 SID_ATTR_LRSPACE, SID_ATTR_ULSPACE, // 10048 - 10049 SID_ATTR_PARA_REGISTER, SID_ATTR_PARA_REGISTER // 10413 - >::value); + >); const WhichRangesContainer SvxParaAlignTabPage::pAlignRanges( - svl::Items<SID_ATTR_PARA_ADJUST, SID_ATTR_PARA_ADJUST>::value); // 10027 + svl::Items<SID_ATTR_PARA_ADJUST, SID_ATTR_PARA_ADJUST>); // 10027 const WhichRangesContainer SvxExtParagraphTabPage::pExtRanges(svl::Items< SID_ATTR_PARA_PAGEBREAK, SID_ATTR_PARA_WIDOWS, // 10037 - 10041 SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP // 10065 - 10066 ->::value); +>); #define MAX_DURCH 5670 // 10 cm makes sense as maximum interline lead // according to BP @@ -2219,7 +2219,7 @@ std::unique_ptr<SfxTabPage> SvxAsianTabPage::Create(weld::Container* pPage, weld WhichRangesContainer SvxAsianTabPage::GetRanges() { - return WhichRangesContainer(svl::Items<SID_ATTR_PARA_SCRIPTSPACE, SID_ATTR_PARA_FORBIDDEN_RULES>::value); + return WhichRangesContainer(svl::Items<SID_ATTR_PARA_SCRIPTSPACE, SID_ATTR_PARA_FORBIDDEN_RULES>); } bool SvxAsianTabPage::FillItemSet( SfxItemSet* rSet ) diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index fc0e3d90ef92..5e5352aff400 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -729,7 +729,7 @@ WhichRangesContainer SvxSwPosSizeTabPage::GetRanges() SID_HTML_MODE, SID_HTML_MODE, SID_SW_FOLLOW_TEXT_FLOW, SID_SW_FOLLOW_TEXT_FLOW, SID_ATTR_TRANSFORM_HORI_POSITION, SID_ATTR_TRANSFORM_VERT_POSITION - >::value); + >); return ranges; } diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index bfc1feb108f6..762e3ab92baa 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -33,7 +33,7 @@ constexpr FieldUnit eDefUnit = FieldUnit::MM_100TH; const WhichRangesContainer SvxTabulatorTabPage::pRanges( - svl::Items<SID_ATTR_TABSTOP, SID_ATTR_TABSTOP_OFFSET>::value); + svl::Items<SID_ATTR_TABSTOP, SID_ATTR_TABSTOP_OFFSET>); static void FillUpWithDefTabs_Impl( tools::Long nDefDist, SvxTabStopItem& rTabs ) { diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 4adce8ed9d4a..95d3463a1607 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -30,7 +30,7 @@ #include <svtools/unitconv.hxx> const WhichRangesContainer SvxTextAnimationPage::pRanges( - svl::Items<SDRATTR_TEXT_ANIKIND, SDRATTR_TEXT_ANIAMOUNT>::value); + svl::Items<SDRATTR_TEXT_ANIKIND, SDRATTR_TEXT_ANIAMOUNT>); /************************************************************************* |* diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 3abf4fe0d65c..d542f9b0810e 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -39,7 +39,7 @@ const WhichRangesContainer SvxTextAttrPage::pRanges( svl::Items< SDRATTR_MISC_FIRST ,SDRATTR_TEXT_HORZADJUST, SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_WORDWRAP ->::value); +>); /************************************************************************* |* diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index bcc77512ebd7..2bacae4da9f5 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -49,7 +49,7 @@ enum FillType const WhichRangesContainer SvxAreaTabPage::pAreaRanges( svl::Items< XATTR_GRADIENTSTEPCOUNT, XATTR_GRADIENTSTEPCOUNT, - SID_ATTR_FILL_STYLE, SID_ATTR_FILL_BITMAP>::value); + SID_ATTR_FILL_STYLE, SID_ATTR_FILL_BITMAP>); namespace { diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index e996c65a8580..e93b7bfa6310 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -74,7 +74,7 @@ using namespace com::sun::star; const WhichRangesContainer SvxLineTabPage::pLineRanges(svl::Items< XATTR_LINETRANSPARENCE, XATTR_LINETRANSPARENCE, SID_ATTR_LINE_STYLE, SID_ATTR_LINE_ENDCENTER ->::value); +>); SvxLineTabPage::SvxLineTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) : SfxTabPage(pPage, pController, "cui/ui/linetabpage.ui", "LineTabPage", &rInAttrs) diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 3169b723e37d..4a538968536b 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -47,7 +47,7 @@ const WhichRangesContainer SvxShadowTabPage::pShadowRanges(svl::Items< SID_ATTR_FILL_SHADOW, SID_ATTR_FILL_SHADOW, SID_ATTR_SHADOW_BLUR, SID_ATTR_SHADOW_BLUR, SID_ATTR_SHADOW_TRANSPARENCE, SID_ATTR_SHADOW_YDISTANCE ->::value); +>); SvxShadowTabPage::SvxShadowTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) : SvxTabPage(pPage, pController, "cui/ui/shadowtabpage.ui", "ShadowTabPage", rInAttrs) diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx index c50d6728c544..b0517ad865f1 100644 --- a/cui/source/tabpages/tptrans.cxx +++ b/cui/source/tabpages/tptrans.cxx @@ -37,7 +37,7 @@ const WhichRangesContainer SvxTransparenceTabPage::pTransparenceRanges(svl::Item XATTR_FILLTRANSPARENCE, XATTR_FILLTRANSPARENCE, XATTR_FILLFLOATTRANSPARENCE, XATTR_FILLFLOATTRANSPARENCE, SDRATTR_SHADOWTRANSPARENCE, SDRATTR_SHADOWTRANSPARENCE ->::value); +>); /************************************************************************* |* diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index eec4b1e87566..5ffe490745b6 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -49,18 +49,18 @@ const WhichRangesContainer SvxPositionSizeTabPage::pPosSizeRanges(svl::Items< SID_ATTR_TRANSFORM_PROTECT_POS, SID_ATTR_TRANSFORM_INTERN, SID_ATTR_TRANSFORM_AUTOWIDTH, SID_ATTR_TRANSFORM_AUTOHEIGHT, SID_ATTR_TRANSFORM_ANCHOR, SID_ATTR_TRANSFORM_VERT_ORIENT ->::value); +>); const WhichRangesContainer SvxAngleTabPage::pAngleRanges(svl::Items< SID_ATTR_TRANSFORM_ROT_X, SID_ATTR_TRANSFORM_ANGLE, SID_ATTR_TRANSFORM_INTERN, SID_ATTR_TRANSFORM_INTERN ->::value); +>); const WhichRangesContainer SvxSlantTabPage::pSlantRanges(svl::Items< SDRATTR_CORNER_RADIUS, SDRATTR_CORNER_RADIUS, SID_ATTR_TRANSFORM_INTERN, SID_ATTR_TRANSFORM_INTERN, SID_ATTR_TRANSFORM_SHEAR, SID_ATTR_TRANSFORM_SHEAR_VERTICAL ->::value); +>); /************************************************************************* |* diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 2903b7a66ec4..2ef0c8d44553 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -772,7 +772,7 @@ bool callColumnFormatDialog(weld::Widget* _pParent, SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, SID_ATTR_NUMBERFORMAT_INFO, SID_ATTR_NUMBERFORMAT_INFO, SID_ATTR_NUMBERFORMAT_ONE_AREA, SID_ATTR_NUMBERFORMAT_ONE_AREA - >{}; + >; std::vector<SfxPoolItem*> pDefaults { diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 42a687b69088..86bec9a11c51 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -285,7 +285,7 @@ bool shouldLaunchQuickstart() if (!bQuickstart) { const SfxPoolItem* pItem=nullptr; - SfxItemSet aQLSet(SfxGetpApp()->GetPool(), svl::Items<SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER>{}); + SfxItemSet aQLSet(SfxGetpApp()->GetPool(), svl::Items<SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER>); SfxGetpApp()->GetOptions(aQLSet); SfxItemState eState = aQLSet.GetItemState(SID_ATTR_QUICKLAUNCHER, false, &pItem); if (SfxItemState::SET == eState) diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index adaff884bcae..a30111e33e66 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -1781,7 +1781,7 @@ void ContentNode::dumpAsXml(xmlTextWriterPtr pWriter) const ContentAttribs::ContentAttribs( SfxItemPool& rPool ) : pStyle(nullptr) -, aAttribSet( rPool, svl::Items<EE_PARA_START, EE_CHAR_END>{} ) +, aAttribSet( rPool, svl::Items<EE_PARA_START, EE_CHAR_END> ) { } @@ -2013,7 +2013,7 @@ void CreateFont( SvxFont& rFont, const SfxItemSet& rSet, bool bSearchInParent, S void EditDoc::CreateDefFont( bool bUseStyles ) { - SfxItemSet aTmpSet( GetItemPool(), svl::Items<EE_PARA_START, EE_CHAR_END>{} ); + SfxItemSet aTmpSet( GetItemPool(), svl::Items<EE_PARA_START, EE_CHAR_END> ); CreateFont( aDefFont, aTmpSet ); aDefFont.SetVertical( IsVertical() ); aDefFont.SetOrientation( Degree10(IsVertical() ? (IsTopToBottom() ? 2700 : 900) : 0) ); diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index e5c5cbdf4760..7dd9bdd2459d 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -93,7 +93,7 @@ const XParaPortion& XParaPortionList::operator [](size_t i) const ContentInfo::ContentInfo( SfxItemPool& rPool ) : eFamily(SfxStyleFamily::Para), - aParaAttribs(rPool, svl::Items<EE_PARA_START, EE_CHAR_END>{}) + aParaAttribs(rPool, svl::Items<EE_PARA_START, EE_CHAR_END>) { } @@ -102,7 +102,7 @@ ContentInfo::ContentInfo( const ContentInfo& rCopyFrom, SfxItemPool& rPoolToUse maText(rCopyFrom.maText), aStyle(rCopyFrom.aStyle), eFamily(rCopyFrom.eFamily), - aParaAttribs(rPoolToUse, svl::Items<EE_PARA_START, EE_CHAR_END>{}) + aParaAttribs(rPoolToUse, svl::Items<EE_PARA_START, EE_CHAR_END>) { // this should ensure that the Items end up in the correct Pool! aParaAttribs.Set( rCopyFrom.GetParaAttribs() ); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index fdc33305fd23..091bad24e080 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -728,7 +728,7 @@ const SfxItemSet& ImpEditEngine::GetEmptyItemSet() const { if ( !pEmptyItemSet ) { - pEmptyItemSet = std::make_unique<SfxItemSet>(const_cast<SfxItemPool&>(aEditDoc.GetItemPool()), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{}); + pEmptyItemSet = std::make_unique<SfxItemSet>(const_cast<SfxItemPool&>(aEditDoc.GetItemPool()), svl::Items<EE_ITEMS_START, EE_ITEMS_END>); for ( sal_uInt16 nWhich = EE_ITEMS_START; nWhich <= EE_CHAR_END; nWhich++) { pEmptyItemSet->ClearItem( nWhich ); diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 6bfb782e3e19..3fd992617695 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -2406,7 +2406,7 @@ bool SvxCharReliefItem::QueryValue( css::uno::Any& rVal, SvxScriptSetItem::SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool ) : SfxSetItem( nSlotId, SfxItemSet( rPool, - svl::Items<SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONT>{} )) + svl::Items<SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONT> )) { sal_uInt16 nLatin, nAsian, nComplex; GetWhichIds( nLatin, nAsian, nComplex ); diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx index 0cfd7a710dcf..238bdc82320f 100644 --- a/editeng/source/uno/unofdesc.cxx +++ b/editeng/source/uno/unofdesc.cxx @@ -197,7 +197,7 @@ uno::Any SvxUnoFontDescriptor::getPropertyDefault( SfxItemPool* pPool ) svl::Items< EE_CHAR_FONTINFO, EE_CHAR_FONTHEIGHT, EE_CHAR_WEIGHT, EE_CHAR_ITALIC, - EE_CHAR_WLM, EE_CHAR_WLM>{}); + EE_CHAR_WLM, EE_CHAR_WLM>); uno::Any aAny; diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 3b02a1c7bdb7..0cf3bc52f171 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2680,7 +2680,7 @@ namespace pcr SfxItemSet aCoreSet( SfxGetpApp()->GetPool(), svl::Items< - SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO>{}); + SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO>); // ripped this somewhere ... don't understand it :( // get the number formats supplier diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index 0471dfd3603a..94e84c886ca1 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -21,11 +21,8 @@ #include <sal/config.h> -#include <array> #include <cassert> #include <cstddef> -#include <initializer_list> -#include <type_traits> #include <memory> #include <utility> @@ -36,59 +33,6 @@ class SfxItemPool; -namespace svl { - -namespace detail { - -constexpr bool validRange(sal_uInt16 wid1, sal_uInt16 wid2) -{ return wid1 != 0 && wid1 <= wid2; } - -constexpr bool validGap(sal_uInt16 wid1, sal_uInt16 wid2) -{ return wid2 > wid1; } - -template<sal_uInt16 WID1, sal_uInt16 WID2> constexpr bool validRanges() -{ return validRange(WID1, WID2); } - -template<sal_uInt16 WID1, sal_uInt16 WID2, sal_uInt16 WID3, sal_uInt16... WIDs> -constexpr bool validRanges() { - return validRange(WID1, WID2) && validGap(WID2, WID3) - && validRanges<WID3, WIDs...>(); -} - -// The calculations in rangeSize cannot overflow, assuming -// std::size_t is no smaller than sal_uInt16: -constexpr std::size_t rangeSize(sal_uInt16 wid1, sal_uInt16 wid2) { - assert(validRange(wid1, wid2)); - return wid2 - wid1 + 1; -} - -} - -template<sal_uInt16... WIDs> struct Items -{ - using Array = std::array<WhichPair, sizeof...(WIDs) / 2>; - template <sal_uInt16 WID1, sal_uInt16 WID2, sal_uInt16... Rest> - static constexpr void fill(typename Array::iterator it) - { - it->first = WID1; - it->second = WID2; - if constexpr (sizeof...(Rest) > 0) - fill<Rest...>(++it); - } - static constexpr Array make() - { - assert(svl::detail::validRanges<WIDs...>()); - Array a{}; - fill<WIDs...>(a.begin()); - return a; - } - // This is passed to WhichRangesContainer so we can avoid needing to malloc() - // for compile-time data. - static constexpr Array value = make(); -}; - -} - class SAL_WARN_UNUSED SVL_DLLPUBLIC SfxItemSet { friend class SfxItemIter; @@ -138,8 +82,8 @@ public: : SfxItemSet(rPool, WhichRangesContainer(nWhichStart, nWhichEnd)) {} template<sal_uInt16... WIDs> - SfxItemSet(SfxItemPool& pool, svl::Items<WIDs...>) - : SfxItemSet(pool, WhichRangesContainer(svl::Items<WIDs...>::value)) {} + SfxItemSet(SfxItemPool& pool, svl::Items_t<WIDs...> wids) + : SfxItemSet(pool, WhichRangesContainer(wids)) {} virtual ~SfxItemSet(); diff --git a/include/svl/whichranges.hxx b/include/svl/whichranges.hxx index 44f4b15fddbe..76403968d2d7 100644 --- a/include/svl/whichranges.hxx +++ b/include/svl/whichranges.hxx @@ -17,6 +17,60 @@ typedef std::pair<sal_uInt16, sal_uInt16> WhichPair; +namespace svl +{ +namespace detail +{ +constexpr bool validRange(sal_uInt16 wid1, sal_uInt16 wid2) { return wid1 != 0 && wid1 <= wid2; } + +constexpr bool validGap(sal_uInt16 wid1, sal_uInt16 wid2) { return wid2 > wid1; } + +template <sal_uInt16 WID1, sal_uInt16 WID2> constexpr bool validRanges() +{ + return validRange(WID1, WID2); +} + +template <sal_uInt16 WID1, sal_uInt16 WID2, sal_uInt16 WID3, sal_uInt16... WIDs> +constexpr bool validRanges() +{ + return validRange(WID1, WID2) && validGap(WID2, WID3) && validRanges<WID3, WIDs...>(); +} + +// The calculations in rangeSize cannot overflow, assuming +// std::size_t is no smaller than sal_uInt16: +constexpr std::size_t rangeSize(sal_uInt16 wid1, sal_uInt16 wid2) +{ + assert(validRange(wid1, wid2)); + return wid2 - wid1 + 1; +} +} + +template <sal_uInt16... WIDs> struct Items_t +{ + using Array = std::array<WhichPair, sizeof...(WIDs) / 2>; + template <sal_uInt16 WID1, sal_uInt16 WID2, sal_uInt16... Rest> + static constexpr void fill(typename Array::iterator it) + { + it->first = WID1; + it->second = WID2; + if constexpr (sizeof...(Rest) > 0) + fill<Rest...>(++it); + } + static constexpr Array make() + { + assert(svl::detail::validRanges<WIDs...>()); + Array a{}; + fill<WIDs...>(a.begin()); + return a; + } + // This is passed to WhichRangesContainer so we can avoid needing to malloc() + // for compile-time data. + static constexpr Array value = make(); +}; + +template <sal_uInt16... WIDs> inline static constexpr auto Items = Items_t<WIDs...>{}; +} + /** * Most of the time, the which ranges we point at are a compile-time literal. * So we take advantage of that, and avoid the cost of allocating our own array and copying into it. @@ -39,10 +93,10 @@ struct SVL_DLLPUBLIC WhichRangesContainer , m_bOwnRanges(true) { } - template <std::size_t N> - WhichRangesContainer(const std::array<WhichPair, N>& ranges) - : m_pairs(ranges.data()) - , m_size(N) + template <sal_uInt16... WIDs> + WhichRangesContainer(svl::Items_t<WIDs...>) + : m_pairs(svl::Items_t<WIDs...>::value.data()) + , m_size(svl::Items_t<WIDs...>::value.size()) , m_bOwnRanges(false) { } diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 115fa2fabf59..739ee26c6048 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -723,7 +723,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep static const WhichRangesContainer pRanges(svl::Items< XATTR_FILL_FIRST, ITEMID_WEIGHT_COMPLEX - >::value); + >); rtl::Reference<SfxItemPool> pPool(new SfxItemPool("ReportCharProperties", XATTR_FILL_FIRST,ITEMID_WEIGHT_COMPLEX, aItemInfos, &pDefaults)); // not needed for font height pPool->SetDefaultMetric( MapUnit::Map100thMM ); // ripped, don't understand why diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index c6305dba182b..dbc992f33c61 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2366,7 +2366,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ static const WhichRangesContainer pRanges(svl::Items< RPTUI_ID_LRSPACE, XATTR_FILL_LAST, SID_ATTR_METRIC,SID_ATTR_METRIC - >::value); + >); rtl::Reference<SfxItemPool> pPool( new SfxItemPool("ReportPageProperties", RPTUI_ID_LRSPACE, RPTUI_ID_METRIC, aItemInfos ) ); const Graphic aNullGraphic; @@ -4214,7 +4214,7 @@ void OReportController::openZoomDialog() }; static const WhichRangesContainer pRanges(svl::Items< SID_ATTR_ZOOM,SID_ATTR_ZOOM - >::value); + >); rtl::Reference<SfxItemPool> pPool( new SfxItemPool("ZoomProperties", SID_ATTR_ZOOM,SID_ATTR_ZOOM, aItemInfos, &pDefaults) ); pPool->SetDefaultMetric( MapUnit::Map100thMM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index e74ba7739fa5..ecc35e0bcbb1 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -609,7 +609,7 @@ void OReportSection::createDefault(const OUString& _sType,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/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx index aed61f58a6cf..83791382d69c 100644 --- a/sc/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx @@ -1542,8 +1542,8 @@ void ScTiledRenderingTest::testDisableUndoRepair() SfxViewShell* pView2 = SfxViewShell::Current(); CPPUNIT_ASSERT(pView1 != pView2); { - SfxItemSet aSet1(pView1->GetPool(), svl::Items<SID_UNDO, SID_UNDO>{}); - SfxItemSet aSet2(pView2->GetPool(), svl::Items<SID_UNDO, SID_UNDO>{}); + SfxItemSet aSet1(pView1->GetPool(), svl::Items<SID_UNDO, SID_UNDO>); + SfxItemSet aSet2(pView2->GetPool(), svl::Items<SID_UNDO, SID_UNDO>); pView1->GetSlotState(SID_UNDO, nullptr, &aSet1); pView2->GetSlotState(SID_UNDO, nullptr, &aSet2); CPPUNIT_ASSERT_EQUAL(SfxItemState::DISABLED, aSet1.GetItemState(SID_UNDO)); @@ -1558,8 +1558,8 @@ void ScTiledRenderingTest::testDisableUndoRepair() pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::RETURN); Scheduler::ProcessEventsToIdle(); { - SfxItemSet aSet1(pView1->GetPool(), svl::Items<SID_UNDO, SID_UNDO>{}); - SfxItemSet aSet2(pView2->GetPool(), svl::Items<SID_UNDO, SID_UNDO>{}); + SfxItemSet aSet1(pView1->GetPool(), svl::Items<SID_UNDO, SID_UNDO>); + SfxItemSet aSet2(pView2->GetPool(), svl::Items<SID_UNDO, SID_UNDO>); pView1->GetSlotState(SID_UNDO, nullptr, &aSet1); pView2->GetSlotState(SID_UNDO, nullptr, &aSet2); CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aSet1.GetItemState(SID_UNDO)); @@ -1580,8 +1580,8 @@ void ScTiledRenderingTest::testDisableUndoRepair() pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::RETURN); Scheduler::ProcessEventsToIdle(); { - SfxItemSet aSet1(pView1->GetPool(), svl::Items<SID_UNDO, SID_UNDO>{}); - SfxItemSet aSet2(pView2->GetPool(), svl::Items<SID_UNDO, SID_UNDO>{}); + SfxItemSet aSet1(pView1->GetPool(), svl::Items<SID_UNDO, SID_UNDO>); + SfxItemSet aSet2(pView2->GetPool(), svl::Items<SID_UNDO, SID_UNDO>); pView1->GetSlotState(SID_UNDO, nullptr, &aSet1); pView2->GetSlotState(SID_UNDO, nullptr, &aSet2); CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aSet1.GetItemState(SID_UNDO)); diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index c13aadc566e8..1dd346d23e28 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -4589,7 +4589,7 @@ void TestFormula::testFormulaRefUpdateValidity() SfxUInt32Item aItem(ATTR_VALIDDATA, nIndex); ScPatternAttr aNewAttrs( - SfxItemSet(*m_pDoc->GetPool(), svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{})); + SfxItemSet(*m_pDoc->GetPool(), svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>)); aNewAttrs.GetItemSet().Put(aItem); m_pDoc->ApplyPattern(0, 1, 0, aNewAttrs); diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 6ad0c97574e1..ee4f81c337e4 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -208,7 +208,7 @@ ScDocumentPool::ScDocumentPool() ATTR_BORDER, ATTR_SHADOW, ATTR_LRSPACE, ATTR_ULSPACE, ATTR_PAGE_SIZE, ATTR_PAGE_SIZE, - ATTR_PAGE_ON, ATTR_PAGE_SHARED_FIRST>{} ); + ATTR_PAGE_ON, ATTR_PAGE_SHARED_FIRST> ); pGlobalBorderInnerAttr->SetLine(nullptr, SvxBoxInfoItemLine::HORI); pGlobalBorderInnerAttr->SetLine(nullptr, SvxBoxInfoItemLine::VERT); @@ -282,11 +282,11 @@ ScDocumentPool::ScDocumentPool() if ( ScGlobal::GetEmptyBrushItem() ) mvPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = - new ScPatternAttr( SfxItemSet( *this, svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{} ), + new ScPatternAttr( SfxItemSet( *this, svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END> ), ScResId(STR_STYLENAME_STANDARD) ); else mvPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = - new ScPatternAttr( SfxItemSet( *this, svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{} ), + new ScPatternAttr( SfxItemSet( *this, svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END> ), STRING_STANDARD ); // FIXME: without name? mvPoolDefaults[ ATTR_LRSPACE - ATTR_STARTINDEX ] = new SvxLRSpaceItem( ATTR_LRSPACE ); diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index d9321a6634cb..932b287beb2a 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -119,7 +119,7 @@ SfxPrinter* ScDocument::GetPrinter(bool bCreateIfNotExist) svl::Items<SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, SID_PRINT_SELECTEDSHEET, SID_PRINT_SELECTEDSHEET, - SID_SCPRINTOPTIONS, SID_SCPRINTOPTIONS>{} ); + SID_SCPRINTOPTIONS, SID_SCPRINTOPTIONS> ); SfxPrinterChangeFlags nFlags = SfxPrinterChangeFlags::NONE; if (officecfg::Office::Common::Print::Warning::PaperOrientation::get()) diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index a73758288ce1..fb8e7aee033f 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -82,7 +82,7 @@ ScPatternAttr::ScPatternAttr( SfxItemSet&& pItemSet ) } ScPatternAttr::ScPatternAttr( SfxItemPool* pItemPool ) - : SfxSetItem ( ATTR_PATTERN, SfxItemSet( *pItemPool, svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{} ) ), + : SfxSetItem ( ATTR_PATTERN, SfxItemSet( *pItemPool, svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END> ) ), pStyle ( nullptr ), mnKey(0) { diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index 20f4399dd98b..883e222173ce 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -144,7 +144,7 @@ SfxItemSet& ScStyleSheet::GetItemSet() ATTR_WRITINGDIR, ATTR_WRITINGDIR, ATTR_BACKGROUND, ATTR_BACKGROUND, ATTR_BORDER, ATTR_SHADOW, - ATTR_LRSPACE, ATTR_PAGE_SCALETO>{} ); + ATTR_LRSPACE, ATTR_PAGE_SCALETO> ); // If being loaded also the set is then filled in from the file, // so the defaults do not need to be set. @@ -221,7 +221,7 @@ SfxItemSet& ScStyleSheet::GetItemSet() case SfxStyleFamily::Para: default: - pSet = new SfxItemSet( GetPool()->GetPool(), svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{} ); + pSet = new SfxItemSet( GetPool()->GetPool(), svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END> ); break; } bMySet = true; diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 1074fe1f65a1..2af1cad94471 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -467,7 +467,7 @@ void ScTable::DeleteSelection( InsertDeleteFlags nDelFlag, const ScMarkData& rMa if ( IsProtected() && (nDelFlag & InsertDeleteFlags::ATTRIB) ) { ScDocumentPool* pPool = rDocument.GetPool(); - SfxItemSet aSet( *pPool, svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{} ); + SfxItemSet aSet( *pPool, svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END> ); aSet.Put( ScProtectionAttr( false ) ); SfxItemPoolCache aCache( pPool, &aSet ); ApplySelectionCache( &aCache, rMark ); diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index fc5014440645..8013ac29ab76 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -139,11 +139,11 @@ static bool lcl_HasThickLine( const SdrObject& rObj ) } ScDetectiveData::ScDetectiveData( SdrModel* pModel ) : - aBoxSet( pModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END>{} ), - aArrowSet( pModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END>{} ), - aToTabSet( pModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END>{} ), - aFromTabSet( pModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END>{} ), - aCircleSet( pModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END>{} ), + aBoxSet( pModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END> ), + aArrowSet( pModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END> ), + aToTabSet( pModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END> ), + aFromTabSet( pModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END> ), + aCircleSet( pModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END> ), nMaxLevel(0) { @@ -198,7 +198,7 @@ ScDetectiveData::ScDetectiveData( SdrModel* pModel ) : } ScCommentData::ScCommentData( ScDocument& rDoc, SdrModel* pModel ) : - aCaptionSet( pModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END, EE_ITEMS_START, EE_ITEMS_END>{} ) + aCaptionSet( pModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END, EE_ITEMS_START, EE_ITEMS_END> ) { basegfx::B2DPolygon aTriangle; aTriangle.append(basegfx::B2DPoint(10.0, 0.0)); diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index cae981a5e622..51e0fe9121d9 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -428,7 +428,7 @@ XclExpStringRef lclCreateFormattedString( // font buffer and helper item set for edit engine -> Calc item conversion XclExpFontBuffer& rFontBuffer = rRoot.GetFontBuffer(); - SfxItemSet aItemSet( *rRoot.GetDoc().GetPool(), svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{} ); + SfxItemSet aItemSet( *rRoot.GetDoc().GetPool(), svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END> ); // script type handling Reference< XBreakIterator > xBreakIt = rRoot.GetDoc().GetBreakIterator(); @@ -682,7 +682,7 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico OUString aText; sal_Int32 nHeight = 0; - SfxItemSet aItemSet( *GetDoc().GetPool(), svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{} ); + SfxItemSet aItemSet( *GetDoc().GetPool(), svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END> ); // edit engine bool bOldUpdateMode = mrEE.GetUpdateMode(); diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index a965a5e16d2c..8d0b494b7806 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -381,7 +381,7 @@ ScHeaderEditEngine& XclRoot::GetHFEditEngine() const // set Calc header/footer defaults auto pEditSet = std::make_unique<SfxItemSet>( rEE.GetEmptyItemSet() ); - SfxItemSet aItemSet( *GetDoc().GetPool(), svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{} ); + SfxItemSet aItemSet( *GetDoc().GetPool(), svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END> ); ScPatternAttr::FillToEditItemSet( *pEditSet, aItemSet ); // FillToEditItemSet() adjusts font height to 1/100th mm, we need twips pEditSet->Put( aItemSet.Get( ATTR_FONT_HEIGHT ).CloneSetWhich(EE_CHAR_FONTHEIGHT) ); diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index bccf25f7ec9b..2c9d932f3690 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -349,7 +349,7 @@ void ScModule::Execute( SfxRequest& rReq ) bSet = !GetDocOptions().IsAutoSpell(); } - SfxItemSet aSet( GetPool(), svl::Items<SID_AUTOSPELL_CHECK, SID_AUTOSPELL_CHECK>{} ); + SfxItemSet aSet( GetPool(), svl::Items<SID_AUTOSPELL_CHECK, SID_AUTOSPELL_CHECK> ); aSet.Put( SfxBoolItem( SID_AUTOSPELL_CHECK, bSet ) ); ModifyOptions( aSet ); rReq.Done(); @@ -1891,7 +1891,7 @@ std::unique_ptr<SfxItemSet> ScModule::CreateItemSet( sal_uInt16 nId ) SID_SC_INPUT_TEXTWYSIWYG, SID_SC_INPUT_TEXTWYSIWYG, SID_SC_INPUT_REPLCELLSWARN, SID_SC_INPUT_REPLCELLSWARN, // TP_VIEW: - SID_SC_OPT_SYNCZOOM, SID_SC_OPT_KEY_BINDING_COMPAT>{}); + SID_SC_OPT_SYNCZOOM, SID_SC_OPT_KEY_BINDING_COMPAT>); const ScAppOptions& rAppOpt = GetAppOptions(); diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 633db59f7688..899a56b011d9 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -26,7 +26,7 @@ #include <osl/diagnose.h> const WhichRangesContainer ScTabPageProtection::pProtectionRanges( - svl::Items<SID_SCATTR_PROTECTION, SID_SCATTR_PROTECTION>::value); + svl::Items<SID_SCATTR_PROTECTION, SID_SCATTR_PROTECTION>); // Zellschutz-Tabpage: diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index a3fca1d8822f..5fa84ab3d5cb 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -78,7 +78,7 @@ namespace ValidListType = css::sheet::TableValidationVisibility; const WhichRangesContainer ScTPValidationValue::pValueRanges(svl::Items< FID_VALID_LISTTYPE, FID_VALID_LISTTYPE, FID_VALID_MODE, FID_VALID_ERRTEXT ->::value); +>); ScValidationDlg::ScValidationDlg(weld::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabViewSh) diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 39808c00aa3f..97f685fe1591 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -646,7 +646,7 @@ void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, weld::Wind ScGlobal::getLocaleDataPtr()->getTime( aDT, false ); SfxItemSet aSet( - GetPool(), svl::Items<SID_ATTR_POSTIT_AUTHOR, SID_ATTR_POSTIT_TEXT>{}); + GetPool(), svl::Items<SID_ATTR_POSTIT_AUTHOR, SID_ATTR_POSTIT_TEXT>); aSet.Put( SvxPostItTextItem ( aComment, SID_ATTR_POSTIT_TEXT ) ); aSet.Put( SvxPostItAuthorItem( aAuthor, SID_ATTR_POSTIT_AUTHOR ) ); diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index d843ae6984a3..93ece6954f56 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -198,7 +198,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) case SID_TEXT_STANDARD: // delete hard text attributes { - SfxItemSet aEmptyAttr(GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{}); + SfxItemSet aEmptyAttr(GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>); pView->SetAttributes(aEmptyAttr, true); } break; @@ -442,7 +442,7 @@ void ScDrawShell::ExecuteMacroAssign(SdrObject* pObj, weld::Window* pWin) } // create empty itemset for macro-dlg - SfxItemSet aItemSet(SfxGetpApp()->GetPool(), svl::Items<SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG>{} ); + SfxItemSet aItemSet(SfxGetpApp()->GetPool(), svl::Items<SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG> ); aItemSet.Put ( aItem ); SfxEventNamesItem aNamesItem(SID_EVENTCONFIG); diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 94e87dd29d27..baaf81d28e5b 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -455,7 +455,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) const SfxBoolItem* pItem = rReq.GetArg<SfxBoolItem>(SID_ENABLE_HYPHENATION); if( pItem ) { - SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE>{} ); + SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE> ); bool bValue = pItem->GetValue(); aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) ); pView->SetAttributes( aSet ); diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index c9f09e6d74b2..553c6dc8370b 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -798,7 +798,7 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) if ( pOutView ) pOutView->Paint( tools::Rectangle() ); - SfxItemSet aEmptyAttr( *aEditAttr.GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{} ); + SfxItemSet aEmptyAttr( *aEditAttr.GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END> ); pView->SetAttributes( aEmptyAttr, true ); if ( pOutView ) @@ -922,7 +922,7 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) sal_uInt16 nId = SID_ATTR_PARA_LRSPACE; const SvxLRSpaceItem& rItem = static_cast<const SvxLRSpaceItem&>( pArgs->Get( nId )); - SfxItemSet aAttr( GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE>{} ); + SfxItemSet aAttr( GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE> ); nId = EE_PARA_LRSPACE; SvxLRSpaceItem aLRSpaceItem( rItem.GetLeft(), rItem.GetRight(), rItem.GetTextLeft(), @@ -934,7 +934,7 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) { SvxLineSpacingItem aLineSpaceItem = static_cast<const SvxLineSpacingItem&>(pArgs->Get( GetPool().GetWhich(nSlot))); - SfxItemSet aAttr( GetPool(), svl::Items<EE_PARA_SBL, EE_PARA_SBL>{} ); + SfxItemSet aAttr( GetPool(), svl::Items<EE_PARA_SBL, EE_PARA_SBL> ); aAttr.Put( aLineSpaceItem ); pView->SetAttributes( aAttr ); } @@ -942,7 +942,7 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) { SvxULSpaceItem aULSpaceItem = static_cast<const SvxULSpaceItem&>(pArgs->Get( GetPool().GetWhich(nSlot))); - SfxItemSet aAttr( GetPool(), svl::Items<EE_PARA_ULSPACE, EE_PARA_ULSPACE>{} ); + SfxItemSet aAttr( GetPool(), svl::Items<EE_PARA_ULSPACE, EE_PARA_ULSPACE> ); aULSpaceItem.SetWhich(EE_PARA_ULSPACE); aAttr.Put( aULSpaceItem ); pView->SetAttributes( aAttr ); diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx index 2e3a76d9f425..077c5209ae28 100644 --- a/sc/source/ui/drawfunc/drtxtob1.cxx +++ b/sc/source/ui/drawfunc/drtxtob1.cxx @@ -68,7 +68,7 @@ bool ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs, *pArgPool, svl::Items< EE_ITEMS_START, EE_ITEMS_END, - SID_ATTR_PARA_PAGEBREAK, SID_ATTR_PARA_WIDOWS>{}); + SID_ATTR_PARA_PAGEBREAK, SID_ATTR_PARA_WIDOWS>); aNewAttr.Put( rArgs ); // Values have been taken over once to show the dialog. diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index 5dbfb4ade3d5..a09f59718de8 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -82,7 +82,7 @@ void ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq ) case SID_TEXTDIRECTION_LEFT_TO_RIGHT: case SID_TEXTDIRECTION_TOP_TO_BOTTOM: { - SfxItemSet aAttr( pView->GetModel()->GetItemPool(), svl::Items<SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION>{} ); + SfxItemSet aAttr( pView->GetModel()->GetItemPool(), svl::Items<SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION> ); aAttr.Put( SvxWritingModeItem( nSlot == SID_TEXTDIRECTION_LEFT_TO_RIGHT ? css::text::WritingMode_LR_TB : css::text::WritingMode_TB_RL, @@ -98,7 +98,7 @@ void ScDrawTextObjectBar::ExecuteGlobal( SfxRequest &rReq ) const SfxBoolItem* pItem = rReq.GetArg<SfxBoolItem>(SID_ENABLE_HYPHENATION); if( pItem ) { - SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE>{} ); + SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE> ); bool bValue = pItem->GetValue(); aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) ); pView->SetAttributes( aSet ); @@ -155,7 +155,7 @@ void ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq ) { SfxItemSet aAttr( pView->GetModel()->GetItemPool(), svl::Items<EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR, - EE_PARA_JUST, EE_PARA_JUST>{} ); + EE_PARA_JUST, EE_PARA_JUST> ); bool bLeft = ( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT ); aAttr.Put( SvxFrameDirectionItem( bLeft ? SvxFrameDirection::Horizontal_LR_TB : SvxFrameDirection::Horizontal_RL_TB, diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index a3888f166d31..b9cea7984a97 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -169,7 +169,7 @@ void FuConstCustomShape::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/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 27eeab0e09e9..e80ecb39bbf3 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -395,7 +395,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) // set needed attributes for scrolling SfxItemSet aItemSet( pDrDoc->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 ) ); @@ -662,7 +662,7 @@ SdrObjectUniquePtr FuText::CreateDefaultObject(const sal_uInt16 nID, const tools if(bMarquee) { - SfxItemSet aSet(pDrDoc->GetItemPool(), svl::Items<SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST>{}); + SfxItemSet aSet(pDrDoc->GetItemPool(), svl::Items<SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST>); aSet.Put( makeSdrTextAutoGrowWidthItem( false ) ); aSet.Put( makeSdrTextAutoGrowHeightItem( false ) ); diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index b62fca5feeaa..bc4457870c76 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -42,7 +42,7 @@ ScHFPage::ScHFPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, sal_uInt16 nSetId) : SvxHFPage(pPage, pController, rSet, nSetId) - , aDataSet(*rSet.GetPool(), svl::Items<ATTR_PAGE, ATTR_PAGE, ATTR_PAGE_HEADERLEFT, ATTR_PAGE_FOOTERFIRST>{}) + , aDataSet(*rSet.GetPool(), svl::Items<ATTR_PAGE, ATTR_PAGE, ATTR_PAGE_HEADERLEFT, ATTR_PAGE_FOOTERFIRST>) , nPageUsage(SvxPageUsage::All) , pStyleDlg(nullptr) , m_xBtnEdit(m_xBuilder->weld_button("buttonEdit")) diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index cb4c19c4d549..de63dd437fc7 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -31,7 +31,7 @@ // Static Data const WhichRangesContainer ScTablePage::pPageTableRanges( - svl::Items<ATTR_PAGE_NOTES, ATTR_PAGE_FIRSTPAGENO>::value); + svl::Items<ATTR_PAGE_NOTES, ATTR_PAGE_FIRSTPAGENO>); static bool lcl_PutVObjModeItem(sal_uInt16 nWhich, SfxItemSet& rCoreSet, diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 2f9550812260..6c52c2c3ddf7 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -242,7 +242,7 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( svl::Items<SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, SID_PRINT_SELECTEDSHEET, SID_PRINT_SELECTEDSHEET, - SID_SCPRINTOPTIONS, SID_SCPRINTOPTIONS>{} ); + SID_SCPRINTOPTIONS, SID_SCPRINTOPTIONS> ); SfxPrinter* pPrinter = pDocShell->GetPrinter(); bool bPreferPrinterPapersize = false; diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 1fac839ac367..fa0b55d75e66 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -3272,7 +3272,7 @@ void ScCellShell::ExecuteSubtotals(SfxRequest& rReq) ScopedVclPtr<SfxAbstractTabDialog> pDlg; ScSubTotalParam aSubTotalParam; - SfxItemSet aArgSet( GetPool(), svl::Items<SCITEM_SUBTDATA, SCITEM_SUBTDATA>{} ); + SfxItemSet aArgSet( GetPool(), svl::Items<SCITEM_SUBTDATA, SCITEM_SUBTDATA> ); bool bAnonymous; diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index b8ba37cc9244..241477511629 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -500,7 +500,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) if( lcl_GetSortParam( rData, aSortParam ) ) { ScDocument& rDoc = GetViewData().GetDocument(); - SfxItemSet aArgSet( GetPool(), svl::Items<SCITEM_SORTDATA, SCITEM_SORTDATA>{} ); + SfxItemSet aArgSet( GetPool(), svl::Items<SCITEM_SORTDATA, SCITEM_SORTDATA> ); pDBData->GetSortParam( aSortParam ); bool bHasHeader = rDoc.HasColHeader( aSortParam.nCol1, aSortParam.nRow1, aSortParam.nCol2, aSortParam.nRow2, rData.GetTabNo() ); diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 25c808886443..e3f9c79368e0 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -456,11 +456,11 @@ void ScCellShell::Execute( SfxRequest& rReq ) SfxItemSet aEmptySet( *pReqArgs->GetPool(), svl::Items<ATTR_PATTERN_START, - ATTR_PATTERN_END>{} ); + ATTR_PATTERN_END> ); SfxItemSet aNewSet( *pReqArgs->GetPool(), svl::Items<ATTR_PATTERN_START, - ATTR_PATTERN_END>{} ); + ATTR_PATTERN_END> ); const SfxPoolItem* pAttr = nullptr; sal_uInt16 nWhich = 0; diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index c8829737f589..61261477a109 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -1136,7 +1136,7 @@ SdrObject* ScDrawView::ApplyGraphicToObject( { AddUndo(std::make_unique<SdrUndoAttrObj>(rHitObject)); - SfxItemSet aSet(GetModel()->GetItemPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLBITMAP>{}); + SfxItemSet aSet(GetModel()->GetItemPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLBITMAP>); aSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP)); aSet.Put(XFillBitmapItem(OUString(), rGraphic)); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index a418f3185c8a..cb67ced9817f 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -1233,7 +1233,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) const SfxItemSet& rOldSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); SfxItemPool* pDocPool = GetViewData().GetDocument().GetPool(); - SfxItemSet aNewSet( *pDocPool, svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{} ); + SfxItemSet aNewSet( *pDocPool, svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END> ); aNewSet.Put( *pItem ); pTabViewShell->ApplyAttributes( &aNewSet, &rOldSet ); } @@ -1899,10 +1899,10 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) const ScPatternAttr* pOldAttrs = pTabViewShell->GetSelectionPattern(); SfxItemSet aOldSet( *rDoc.GetPool(), svl::Items<ATTR_PATTERN_START, - ATTR_PATTERN_END>{} ); + ATTR_PATTERN_END> ); SfxItemSet aNewSet( *rDoc.GetPool(), svl::Items<ATTR_PATTERN_START, - ATTR_PATTERN_END>{} ); + ATTR_PATTERN_END> ); const SfxPoolItem& rBorderAttr = pOldAttrs->GetItemSet(). Get( ATTR_BORDER ); diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index bf1b7597b185..f9a29bb3b5d7 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -196,7 +196,7 @@ void ScGridWindow::DoPushPivotButton( SCCOL nCol, SCROW nRow, const MouseEvent& } SfxItemSet aArgSet( mrViewData.GetViewShell()->GetPool(), - svl::Items<SCITEM_QUERYDATA, SCITEM_QUERYDATA>{} ); + svl::Items<SCITEM_QUERYDATA, SCITEM_QUERYDATA> ); aArgSet.Put( ScQueryItem( SCITEM_QUERYDATA, &mrViewData, &aQueryParam ) ); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index ae60b18a5cbf..25d8eb0729c6 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -340,7 +340,7 @@ void ScGridWindow::UpdateStatusPosSize() if (!pPV) return; // shouldn't be called in that case either - SfxItemSet aSet(mrViewData.GetViewShell()->GetPool(), svl::Items<SID_ATTR_POSITION, SID_ATTR_SIZE>{}); + SfxItemSet aSet(mrViewData.GetViewShell()->GetPool(), svl::Items<SID_ATTR_POSITION, SID_ATTR_SIZE>); // Fill items for position and size: // show action rectangle during action, diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx index 654ad6f279f8..eb21ece4e33c 100644 --- a/sc/source/ui/view/pivotsh.cxx +++ b/sc/source/ui/view/pivotsh.cxx @@ -95,7 +95,7 @@ void ScPivotShell::Execute( const SfxRequest& rReq ) ScViewData& rViewData = pViewShell->GetViewData(); SfxItemSet aArgSet( pViewShell->GetPool(), - svl::Items<SCITEM_QUERYDATA, SCITEM_QUERYDATA>{} ); + svl::Items<SCITEM_QUERYDATA, SCITEM_QUERYDATA> ); aArgSet.Put( ScQueryItem( SCITEM_QUERYDATA, &rViewData, &aQueryParam ) ); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index c2495c24386f..56f0277e03ff 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -635,7 +635,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq ) } else { - SfxItemSet aSet ( GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>{} ); + SfxItemSet aSet ( GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM> ); SvxZoomItem aZoomItem( SvxZoomType::PERCENT, pPreview->GetZoom(), SID_ATTR_ZOOM ); aSet.Put( aZoomItem ); diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 7bbbd9647a4e..e0b5a6e2d44a 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -756,7 +756,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } else { - SfxItemSet aSet ( GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>{} ); + SfxItemSet aSet ( GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM> ); SvxZoomItem aZoomItem( eOldZoomType, nOldZoom, SID_ATTR_ZOOM ); ScopedVclPtr<AbstractSvxZoomDialog> pDlg; ScMarkData& rMark = GetViewData().GetMarkData(); diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 2249f25decb2..43313394b2b5 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -276,7 +276,7 @@ std::shared_ptr<SfxModelessDialogController> ScTabViewShell::CreateRefDialogCont { SfxItemSet aArgSet( GetPool(), svl::Items<SCITEM_CONSOLIDATEDATA, - SCITEM_CONSOLIDATEDATA>{} ); + SCITEM_CONSOLIDATEDATA> ); const ScConsolidateParam* pDlgData = rDoc.GetConsolidateDlgData(); @@ -315,7 +315,7 @@ std::shared_ptr<SfxModelessDialogController> ScTabViewShell::CreateRefDialogCont ScQueryParam aQueryParam; SfxItemSet aArgSet( GetPool(), svl::Items<SCITEM_QUERYDATA, - SCITEM_QUERYDATA>{} ); + SCITEM_QUERYDATA> ); ScDBData* pDBData = GetDBData(false, SC_DB_MAKE, ScGetDBSelection::RowDown); pDBData->ExtendDataArea(rDoc); @@ -340,7 +340,7 @@ std::shared_ptr<SfxModelessDialogController> ScTabViewShell::CreateRefDialogCont ScQueryParam aQueryParam; SfxItemSet aArgSet( GetPool(), svl::Items<SCITEM_QUERYDATA, - SCITEM_QUERYDATA>{} ); + SCITEM_QUERYDATA> ); ScDBData* pDBData = GetDBData(false, SC_DB_MAKE, ScGetDBSelection::RowDown); pDBData->ExtendDataArea(rDoc); diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index b87e60becb3f..293199e4c455 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -3334,10 +3334,10 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, { SfxItemSet aOldSet( *rDoc.GetPool(), svl::Items<ATTR_PATTERN_START, - ATTR_PATTERN_END>{} ); + ATTR_PATTERN_END> ); SfxItemSet aNewSet(*rDoc.GetPool(), svl::Items<ATTR_PATTERN_START, - ATTR_PATTERN_END>{} ); + ATTR_PATTERN_END> ); SvxBorderLine aLine; diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index acea298aab32..22f2d26cd98a 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -1006,7 +1006,7 @@ void ScViewFunc::ApplyAttr( const SfxPoolItem& rAttrItem, bool bAdjustBlockHeigh } ScPatternAttr aNewAttrs( SfxItemSet( *GetViewData().GetDocument().GetPool(), - svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END>{} ) ); + svl::Items<ATTR_PATTERN_START, ATTR_PATTERN_END> ) ); aNewAttrs.GetItemSet().Put( rAttrItem ); // if justify is set (with Buttons), always indentation 0 diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx index f796823fc426..50272165e702 100644 --- a/sd/qa/unit/dialogs-test.cxx +++ b/sd/qa/unit/dialogs-test.cxx @@ -199,7 +199,7 @@ const SfxItemSet& SdDialogsTest::getEmptyFillStyleSfxItemSet() { SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc(); CPPUNIT_ASSERT(pDrawDoc); - mpEmptyFillStyleSfxItemSet.reset( new SfxItemSet(pDrawDoc->GetItemPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}) ); + mpEmptyFillStyleSfxItemSet.reset( new SfxItemSet(pDrawDoc->GetItemPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>) ); CPPUNIT_ASSERT(mpEmptyFillStyleSfxItemSet); mpEmptyFillStyleSfxItemSet->Put(XFillStyleItem(drawing::FillStyle_NONE)); } @@ -328,7 +328,7 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID) // CreateSdSnapLineDlg(const SfxItemSet& rInAttrs, ::sd::View* pView) override; SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc(); CPPUNIT_ASSERT(pDrawDoc); - SfxItemSet aNewAttr(pDrawDoc->GetItemPool(), svl::Items<ATTR_SNAPLINE_START, ATTR_SNAPLINE_END>{}); + SfxItemSet aNewAttr(pDrawDoc->GetItemPool(), svl::Items<ATTR_SNAPLINE_START, ATTR_SNAPLINE_END>); aNewAttr.Put(SfxInt32Item(ATTR_SNAPLINE_X, 0)); aNewAttr.Put(SfxInt32Item(ATTR_SNAPLINE_Y, 0)); pRetval = getSdAbstractDialogFactory()->CreateSdSnapLineDlg( @@ -342,7 +342,7 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID) // CreateSdInsertLayerDlg(const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr) override; SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc(); CPPUNIT_ASSERT(pDrawDoc); - SfxItemSet aNewAttr(pDrawDoc->GetItemPool(), svl::Items<ATTR_LAYER_START, ATTR_LAYER_END>{}); + SfxItemSet aNewAttr(pDrawDoc->GetItemPool(), svl::Items<ATTR_LAYER_START, ATTR_LAYER_END>); const OUString aLayerName = SdResId(STR_LAYER); // + OUString::number(2); aNewAttr.Put(makeSdAttrLayerName(aLayerName)); aNewAttr.Put(makeSdAttrLayerTitle()); @@ -410,7 +410,7 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID) // CreateSdStartPresentationDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList) override; SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc(); CPPUNIT_ASSERT(pDrawDoc); - SfxItemSet aDlgSet(pDrawDoc->GetItemPool(), svl::Items<ATTR_PRESENT_START, ATTR_PRESENT_END>{}); + SfxItemSet aDlgSet(pDrawDoc->GetItemPool(), svl::Items<ATTR_PRESENT_START, ATTR_PRESENT_END>); ::sd::PresentationSettings& rPresentationSettings = pDrawDoc->getPresentationSettings(); aDlgSet.Put(SfxBoolItem(ATTR_PRESENT_ALL, rPresentationSettings.mbAll)); aDlgSet.Put(SfxBoolItem(ATTR_PRESENT_CUSTOMSHOW, rPresentationSettings.mbCustomShow)); @@ -496,7 +496,7 @@ VclPtr<VclAbstractDialog> SdDialogsTest::createDialogByID(sal_uInt32 nID) // CreatSdActionDialog(const SfxItemSet* pAttr, ::sd::View* pView) override; SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc(); CPPUNIT_ASSERT(pDrawDoc); - SfxItemSet aSet(pDrawDoc->GetItemPool(), svl::Items<ATTR_ANIMATION_START, ATTR_ACTION_END>{}); + SfxItemSet aSet(pDrawDoc->GetItemPool(), svl::Items<ATTR_ANIMATION_START, ATTR_ACTION_END>); aSet.Put(SfxBoolItem(ATTR_ANIMATION_ACTIVE, false)); aSet.Put(SfxUInt16Item(ATTR_ANIMATION_EFFECT, sal_uInt16(presentation::AnimationEffect_NONE))); aSet.Put(SfxUInt16Item(ATTR_ANIMATION_TEXTEFFECT, sal_uInt16(presentation::AnimationEffect_NONE))); diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 098947eb96b4..9d8f13df75db 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2105,7 +2105,7 @@ static SdrObject* convertPresentationObjectImpl(SdPage& rPage, SdrObject* pSourc } // Remove LRSpace item - SfxItemSet aSet(rModel.GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE>{} ); + SfxItemSet aSet(rModel.GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE> ); aSet.Put(pNewObj->GetMergedItemSet()); @@ -2142,7 +2142,7 @@ static SdrObject* convertPresentationObjectImpl(SdPage& rPage, SdrObject* pSourc pNewObj->SetEmptyPresObj(false); // reset left indent - SfxItemSet aSet(rModel.GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE>{} ); + SfxItemSet aSet(rModel.GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE> ); aSet.Put(pNewObj->GetMergedItemSet()); diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 1277d1297cb0..29f1dc8d14d7 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -448,7 +448,7 @@ SfxStyleSheet* SdPage::GetTextStyleSheetForObject( SdrObject* pObj ) const SfxItemSet* SdPage::getOrCreateItems() { if( mpItems == nullptr ) - mpItems = std::make_unique<SfxItemSet>( getSdrModelFromSdrPage().GetItemPool(), svl::Items<SDRATTR_XMLATTRIBUTES, SDRATTR_XMLATTRIBUTES>{} ); + mpItems = std::make_unique<SfxItemSet>( getSdrModelFromSdrPage().GetItemPool(), svl::Items<SDRATTR_XMLATTRIBUTES, SDRATTR_XMLATTRIBUTES> ); return mpItems.get(); } diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 9bd424e12a1f..9f87290c52f2 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -220,7 +220,7 @@ SfxItemSet& SdStyleSheet::GetItemSet() SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_WORDWRAP, SDRATTR_EDGE_FIRST, SDRATTR_MEASURE_LAST, SDRATTR_3D_FIRST, SDRATTR_3D_LAST, - EE_PARA_START, EE_CHAR_END>{}); + EE_PARA_START, EE_CHAR_END>); bMySet = true; } @@ -240,7 +240,7 @@ SfxItemSet& SdStyleSheet::GetItemSet() SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_XMLATTRIBUTES, SDRATTR_TEXT_WORDWRAP, SDRATTR_TEXT_WORDWRAP, SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST, - EE_PARA_START, EE_CHAR_END>{}); + EE_PARA_START, EE_CHAR_END>); bMySet = true; } @@ -271,7 +271,7 @@ SfxItemSet& SdStyleSheet::GetItemSet() SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_WORDWRAP, SDRATTR_EDGE_FIRST, SDRATTR_MEASURE_LAST, SDRATTR_3D_FIRST, SDRATTR_3D_LAST, - EE_PARA_START, EE_CHAR_END>{}); + EE_PARA_START, EE_CHAR_END>); bMySet = true; } diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 0080a0db1c50..2b9f389ed22d 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -458,7 +458,7 @@ std::unique_ptr<SfxItemSet> SdModule::CreateItemSet( sal_uInt16 nSlot ) SID_ATTR_GRID_OPTIONS, SID_ATTR_GRID_OPTIONS, SID_ATTR_METRIC, SID_ATTR_METRIC, SID_ATTR_DEFTABSTOP, SID_ATTR_DEFTABSTOP, - ATTR_OPTIONS_LAYOUT, ATTR_OPTIONS_SCALE_END>{}); + ATTR_OPTIONS_LAYOUT, ATTR_OPTIONS_SCALE_END>); // TP_OPTIONS_LAYOUT: pRet->Put( SdOptionsLayoutItem( pOptions, pFrameView ) ); @@ -629,7 +629,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) SfxItemSet aPrintSet( GetPool(), svl::Items<SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, - ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT>{} ); + ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT> ); // Print const SdOptionsPrintItem* pPrintItem = nullptr; diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index dd8b4535d045..76d9eb2de9ea 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -281,7 +281,7 @@ IMPL_LINK_NOARG(SdModifyFieldDlg, LanguageChangeHdl, weld::ComboBox&, void) SfxItemSet SdModifyFieldDlg::GetItemSet() const { - SfxItemSet aOutput( *m_aInputSet.GetPool(), svl::Items<EE_CHAR_LANGUAGE, EE_CHAR_LANGUAGE_CTL>{} ); + SfxItemSet aOutput( *m_aInputSet.GetPool(), svl::Items<EE_CHAR_LANGUAGE, EE_CHAR_LANGUAGE_CTL> ); if (m_xLbLanguage->get_active_id_changed_from_saved()) { diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index e7eec89fe998..35a5df67a2d5 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -70,7 +70,7 @@ std::unique_ptr<SfxTabPage> SdParagraphNumTabPage::Create(weld::Container* pPage WhichRangesContainer SdParagraphNumTabPage::GetRanges() { - return WhichRangesContainer(svl::Items<ATTR_PARANUMBERING_START, ATTR_PARANUMBERING_END>::value); + return WhichRangesContainer(svl::Items<ATTR_PARANUMBERING_START, ATTR_PARANUMBERING_END>); } bool SdParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index a4ef27fed216..8271b39608ba 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -51,7 +51,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg(SfxObjectShell const * pDocSh, : SfxTabDialogController(pParent, "modules/sdraw/ui/drawprtldialog.ui", "DrawPRTLDialog") , mpDocShell(pDocSh) , ePO(_ePO) - , aInputSet(*rStyleBase.GetItemSet().GetPool(), svl::Items<SID_PARAM_NUM_PRESET, SID_PARAM_CUR_NUM_LEVEL>{}) + , aInputSet(*rStyleBase.GetItemSet().GetPool(), svl::Items<SID_PARAM_NUM_PRESET, SID_PARAM_CUR_NUM_LEVEL>) { const SfxItemSet* pOrgSet(&rStyleBase.GetItemSet()); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 8175c00892b3..18c48afd441f 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -97,7 +97,7 @@ SfxPrinter* DrawDocShell::GetPrinter(bool bCreate) auto pSet = std::make_unique<SfxItemSet>( GetPool(), svl::Items<SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, - ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT>{} ); + ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT> ); // set PrintOptionsSet SdOptionsPrintItem aPrintItem( SD_MOD()->GetSdOptions(mpDoc->GetDocumentType()) ); SfxFlagItem aFlagItem( SID_PRINTER_CHANGESTODOC ); diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 296a09ce3298..661b0cb69452 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -239,7 +239,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest const & rReq ) empty string). */ pOV->InsertText( "" ); - SfxItemSet aOldSet( mpDoc->GetPool(), svl::Items<EE_CHAR_FONTINFO, EE_CHAR_FONTINFO>{} ); + SfxItemSet aOldSet( mpDoc->GetPool(), svl::Items<EE_CHAR_FONTINFO, EE_CHAR_FONTINFO> ); aOldSet.Put( pOV->GetAttribs() ); SfxUndoManager& rUndoMgr = pOL->GetUndoManager(); diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index a1c69e25b041..145dcb993600 100644 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -62,7 +62,7 @@ void FuChar::DoExecute( SfxRequest& rReq ) SfxItemSet aEditAttr( mpDoc->GetPool() ); mpView->GetAttributes( aEditAttr ); - SfxItemSet aNewAttr(mpViewShell->GetPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLCOLOR, EE_ITEMS_START, EE_ITEMS_END>{}); + SfxItemSet aNewAttr(mpViewShell->GetPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLCOLOR, EE_ITEMS_START, EE_ITEMS_END>); aNewAttr.Put( aEditAttr, false ); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index 0d2a406e0e14..2af3549e51d6 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -181,7 +181,7 @@ void FuConstructCustomShape::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 ); // Enables Word-wrap by default (tdf#134369) diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index c291e3468349..1e7a7457964a 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -75,7 +75,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) if( !pArgs ) { SfxItemSet aSet( mpViewShell->GetPool(), - svl::Items<ATTR_COPY_START, ATTR_COPY_END>{} ); + svl::Items<ATTR_COPY_START, ATTR_COPY_END> ); // indicate color attribute SfxItemSet aAttr( mpDoc->GetPool() ); @@ -204,7 +204,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) if( ( 1 == i ) && bColor ) { - SfxItemSet aNewSet( mpViewShell->GetPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLCOLOR>{} ); + SfxItemSet aNewSet( mpViewShell->GetPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLCOLOR> ); aNewSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) ); aNewSet.Put( XFillColorItem( OUString(), aStartColor ) ); mpView->SetAttributes( aNewSet ); @@ -266,7 +266,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) sal_uInt8 nGreen = aStartColor.GetGreen() + static_cast<sal_uInt8>( ( static_cast<::tools::Long>(aEndColor.GetGreen()) - static_cast<::tools::Long>(aStartColor.GetGreen()) ) * static_cast<::tools::Long>(i) / static_cast<::tools::Long>(nNumber) ); sal_uInt8 nBlue = aStartColor.GetBlue() + static_cast<sal_uInt8>( ( static_cast<::tools::Long>(aEndColor.GetBlue()) - static_cast<::tools::Long>(aStartColor.GetBlue()) ) * static_cast<::tools::Long>(i) / static_cast<::tools::Long>(nNumber) ); Color aNewColor( nRed, nGreen, nBlue ); - SfxItemSet aNewSet( mpViewShell->GetPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLCOLOR>{} ); + SfxItemSet aNewSet( mpViewShell->GetPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLCOLOR> ); aNewSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) ); aNewSet.Put( XFillColorItem( OUString(), aNewColor ) ); mpView->SetAttributes( aNewSet ); diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index ebaa0ee5d944..833d628742e0 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -114,7 +114,7 @@ void FuExpandPage::DoExecute( SfxRequest& ) aOutliner.SetText(*pParaObj); // remove hard paragraph- and character attributes - SfxItemSet aEmptyEEAttr(mpDoc->GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{}); + SfxItemSet aEmptyEEAttr(mpDoc->GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>); sal_Int32 nParaCount1 = aOutliner.GetParagraphCount(); for (sal_Int32 nPara = 0; nPara < nParaCount1; nPara++) diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 842cd001b85e..cf51719d3857 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -332,7 +332,7 @@ void FuMorph::ImpInsertPolygons( ::tools::Long nEndLineWidth = 0; SdrPageView* pPageView = mpView->GetSdrPageView(); SfxItemPool & rPool = pObj1->GetObjectItemPool(); - SfxItemSet aSet1( rPool,svl::Items<SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,EE_ITEMS_START,EE_ITEMS_END>{} ); + SfxItemSet aSet1( rPool,svl::Items<SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,EE_ITEMS_START,EE_ITEMS_END> ); SfxItemSet aSet2( aSet1 ); bool bLineColor = false; bool bFillColor = false; diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index d6b7fa49115d..4d42aaa06a3c 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -336,7 +336,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) if(!pArgs) { // fill ItemSet for dialog - SfxItemSet aSet(mpDoc->GetPool(), svl::Items<ATTR_ANIMATION_START, ATTR_ACTION_END>{}); + SfxItemSet aSet(mpDoc->GetPool(), svl::Items<ATTR_ANIMATION_START, ATTR_ACTION_END>); // fill the set if (nAnimationSet == ATTR_SET) diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 4efb6d196263..ba1c728616c7 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -79,7 +79,7 @@ void FuBulletAndPosition::DoExecute( SfxRequest& rReq ) SfxItemSet aEditAttr( mpDoc->GetPool() ); mpView->GetAttributes( aEditAttr ); - SfxItemSet aNewAttr( mpViewShell->GetPool(), svl::Items<EE_PARA_NUMBULLET, EE_PARA_BULLET>{} ); + SfxItemSet aNewAttr( mpViewShell->GetPool(), svl::Items<EE_PARA_NUMBULLET, EE_PARA_BULLET> ); aNewAttr.Put( aEditAttr, false ); auto pView = mpView; @@ -117,7 +117,7 @@ void FuBulletAndPosition::SetCurrentBulletsNumbering(SfxRequest& rReq) return; } - SfxItemSet aNewAttr( mpViewShell->GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{} ); + SfxItemSet aNewAttr( mpViewShell->GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END> ); { SfxItemSet aEditAttr( mpDoc->GetPool() ); mpView->GetAttributes( aEditAttr ); @@ -233,7 +233,7 @@ void FuBulletAndPosition::SetCurrentBulletsNumbering(SfxRequest& rReq) if (bInMasterView && pNumRule) { - SfxItemSet aSetAttr( mpViewShell->GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{} ); + SfxItemSet aSetAttr( mpViewShell->GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END> ); aSetAttr.Put(SvxNumBulletItem( *pNumRule, nNumItemId )); mpView->SetAttributes(aSetAttr); } diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index b37ee29fb5ff..076c63f95e67 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -208,7 +208,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& SID_ATTR_PAGE, SID_ATTR_PAGE_SHARED, SID_ATTR_CHAR_GRABBAG, SID_ATTR_CHAR_GRABBAG, SID_ATTR_PAGE_COLOR, SID_ATTR_PAGE_FILLSTYLE - >{}); + >); // Keep it sorted aNewAttr.MergeRange(mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE), mpDoc->GetPool().GetWhich(SID_ATTR_ULSPACE)); @@ -330,12 +330,12 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& if (nError == ERRCODE_NONE) { - pTempSet.emplace( mpDoc->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{} ); + pTempSet.emplace( mpDoc->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST> ); pTempSet->Put( XFillStyleItem( drawing::FillStyle_BITMAP ) ); // MigrateItemSet makes sure the XFillBitmapItem will have a unique name - SfxItemSet aMigrateSet( mpDoc->GetPool(), svl::Items<XATTR_FILLBITMAP, XATTR_FILLBITMAP>{} ); + SfxItemSet aMigrateSet( mpDoc->GetPool(), svl::Items<XATTR_FILLBITMAP, XATTR_FILLBITMAP> ); aMigrateSet.Put(XFillBitmapItem("background", aGraphic)); SdrModel::MigrateItemSet( &aMigrateSet, &*pTempSet, mpDoc ); @@ -396,7 +396,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& if (pTempGradItem && pTempGradItem->GetName().isEmpty()) { // MigrateItemSet guarantees unique gradient names - SfxItemSet aMigrateSet( mpDoc->GetPool(), svl::Items<XATTR_FILLGRADIENT, XATTR_FILLGRADIENT>{} ); + SfxItemSet aMigrateSet( mpDoc->GetPool(), svl::Items<XATTR_FILLGRADIENT, XATTR_FILLGRADIENT> ); aMigrateSet.Put( XFillGradientItem("gradient", pTempGradItem->GetGradientValue()) ); SdrModel::MigrateItemSet( &aMigrateSet, &*pTempSet, mpDoc); } @@ -405,7 +405,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& if (pTempHatchItem && pTempHatchItem->GetName().isEmpty()) { // MigrateItemSet guarantees unique hatch names - SfxItemSet aMigrateSet( mpDoc->GetPool(), svl::Items<XATTR_FILLHATCH, XATTR_FILLHATCH>{} ); + SfxItemSet aMigrateSet( mpDoc->GetPool(), svl::Items<XATTR_FILLHATCH, XATTR_FILLHATCH> ); aMigrateSet.Put( XFillHatchItem("hatch", pTempHatchItem->GetHatchValue()) ); SdrModel::MigrateItemSet( &aMigrateSet, &*pTempSet, mpDoc); } diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index 19560db03da1..bd0d5c75c1fb 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -70,7 +70,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq ) SfxItemSet aNewAttr( *pPool, svl::Items<EE_ITEMS_START, EE_ITEMS_END, SID_ATTR_TABSTOP_OFFSET, SID_ATTR_TABSTOP_OFFSET, - ATTR_PARANUMBERING_START, ATTR_PARANUMBERING_END>{} ); + ATTR_PARANUMBERING_START, ATTR_PARANUMBERING_END> ); aNewAttr.Put( aEditAttr ); diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 8ee1a4899740..fa8eafd9ecf9 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -128,7 +128,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) bool bLoad = false; // appear the new master pages? OUString aFile; - SfxItemSet aSet(mpDoc->GetPool(), svl::Items<ATTR_PRESLAYOUT_START, ATTR_PRESLAYOUT_END>{}); + SfxItemSet aSet(mpDoc->GetPool(), svl::Items<ATTR_PRESLAYOUT_START, ATTR_PRESLAYOUT_END>); aSet.Put( SfxBoolItem( ATTR_PRESLAYOUT_LOAD, bLoad)); aSet.Put( SfxBoolItem( ATTR_PRESLAYOUT_MASTER_PAGE, bMasterPage ) ); diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index 0edd726251e6..acb12f133612 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -71,7 +71,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) /* does the selections end in a unique presentation layout? if not, it is not allowed to edit the templates */ - SfxItemSet aSet(mpDoc->GetItemPool(), svl::Items<SID_STATUS_LAYOUT, SID_STATUS_LAYOUT>{}); + SfxItemSet aSet(mpDoc->GetItemPool(), svl::Items<SID_STATUS_LAYOUT, SID_STATUS_LAYOUT>); pOutlineViewShell->GetStatusBarState( aSet ); OUString aLayoutName = static_cast<const SfxStringItem&>(aSet.Get(SID_STATUS_LAYOUT)).GetValue(); DBG_ASSERT(!aLayoutName.isEmpty(), "Layout not defined"); diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index 9bcca7f95b3b..1ea9a588c441 100644 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -66,7 +66,7 @@ void FuScale::DoExecute( SfxRequest& rReq ) if( !pArgs ) { - SfxItemSet aNewAttr( mpDoc->GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>{} ); + SfxItemSet aNewAttr( mpDoc->GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM> ); std::unique_ptr<SvxZoomItem> pZoomItem; SvxZoomEnableFlags nZoomValues = SvxZoomEnableFlags::ALL; diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index 4fcc5fd9f5ce..3f08f0f52d72 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -59,7 +59,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) { PresentationSettings& rPresentationSettings = mpDoc->getPresentationSettings(); - SfxItemSet aDlgSet( mpDoc->GetPool(), svl::Items<ATTR_PRESENT_START, ATTR_PRESENT_END>{} ); + SfxItemSet aDlgSet( mpDoc->GetPool(), svl::Items<ATTR_PRESENT_START, ATTR_PRESENT_END> ); std::vector<OUString> aPageNameList(mpDoc->GetSdPageCount( PageKind::Standard )); const OUString& rPresPage = rPresentationSettings.maPresPage; OUString aFirstPage; diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index b4e93d7b41e1..80a5e35d8c1f 100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -69,7 +69,7 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) if (!pArgs) { - SfxItemSet aNewAttr(mpViewShell->GetPool(), svl::Items<ATTR_SNAPLINE_START, ATTR_SNAPLINE_END>{}); + SfxItemSet aNewAttr(mpViewShell->GetPool(), svl::Items<ATTR_SNAPLINE_START, ATTR_SNAPLINE_END>); bool bLineExist (false); Point aLinePos; diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index 5e97176ccc18..8122b43fe67b 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -193,7 +193,7 @@ void FuSummaryPage::DoExecute( SfxRequest& ) return; // remove hard break- and character attributes - SfxItemSet aEmptyEEAttr(mpDoc->GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{}); + SfxItemSet aEmptyEEAttr(mpDoc->GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>); sal_Int32 nParaCount = pOutl->GetParagraphCount(); for (sal_Int32 nPara = 0; nPara < nParaCount; nPara++) diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 945965e1b951..c3f4895a9098 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -565,7 +565,7 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj) void FuText::ImpSetAttributesFitToSize(SdrTextObj* pTxtObj) { // FitToSize (fit to frame) - SfxItemSet aSet(mpViewShell->GetPool(), svl::Items<SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWWIDTH>{}); + SfxItemSet aSet(mpViewShell->GetPool(), svl::Items<SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWWIDTH>); aSet.Put(SdrTextFitToSizeTypeItem(drawing::TextFitToSizeType_PROPORTIONAL)); aSet.Put(makeSdrTextAutoGrowHeightItem(false)); aSet.Put(makeSdrTextAutoGrowWidthItem(false)); @@ -576,7 +576,7 @@ void FuText::ImpSetAttributesFitToSize(SdrTextObj* pTxtObj) void FuText::ImpSetAttributesFitToSizeVertical(SdrTextObj* pTxtObj) { SfxItemSet aSet(mpViewShell->GetPool(), - svl::Items<SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWWIDTH>{}); + svl::Items<SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWWIDTH>); aSet.Put(SdrTextFitToSizeTypeItem(drawing::TextFitToSizeType_PROPORTIONAL)); aSet.Put(makeSdrTextAutoGrowHeightItem(false)); aSet.Put(makeSdrTextAutoGrowWidthItem(false)); diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 666fbacdf623..1f5554502412 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -779,7 +779,7 @@ DocumentSettings::_setPropertyValues(const PropertyMapEntry** ppEntries, pItemSet = std::make_unique<SfxItemSet>(pDoc->GetPool(), svl::Items<SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, - ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT>{} ); + ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT> ); } pPrinter = SfxPrinter::Create ( aStream, std::move(pItemSet) ); diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 416370d56ae4..f774fad439ef 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -2430,7 +2430,7 @@ void SdDrawPage::setBackground( const Any& rValue ) // is it our own implementation? SdUnoPageBackground* pBack = comphelper::getUnoTunnelImplementation<SdUnoPageBackground>( xSet ); - SfxItemSet aSet( GetModel()->GetDoc()->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{} ); + SfxItemSet aSet( GetModel()->GetDoc()->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST> ); if( pBack ) { @@ -2798,7 +2798,7 @@ void SdMasterPage::setBackground( const Any& rValue ) // is it our own implementation? SdUnoPageBackground* pBack = comphelper::getUnoTunnelImplementation<SdUnoPageBackground>( xInputSet ); - SfxItemSet aSet( GetModel()->GetDoc()->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{} ); + SfxItemSet aSet( GetModel()->GetDoc()->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST> ); if( pBack ) { diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 99d4042ad4a8..646f6db0cb44 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -57,7 +57,7 @@ SdUnoPageBackground::SdUnoPageBackground( if( pDoc ) { StartListening( *pDoc ); - mpSet = std::make_unique<SfxItemSet>( pDoc->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{} ); + mpSet = std::make_unique<SfxItemSet>( pDoc->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST> ); if( pSet ) mpSet->Put(*pSet); @@ -96,7 +96,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) StartListening( *pDoc ); mpDoc = pDoc; - mpSet = std::make_unique<SfxItemSet>( *rSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{} ); + mpSet = std::make_unique<SfxItemSet>( *rSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST> ); if( mpPropSet->AreThereOwnUsrAnys() ) { diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 1f64da0b7e1c..3e28a56a489d 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -118,7 +118,7 @@ void TextObjectBar::GetCharState( SfxItemSet& rSet ) SfxItemSet aCharAttrSet( mpView->GetDoc().GetPool() ); mpView->GetAttributes( aCharAttrSet ); - SfxItemSet aNewAttr( mpViewShell->GetPool(),svl::Items<EE_ITEMS_START,EE_ITEMS_END>{}); + SfxItemSet aNewAttr( mpViewShell->GetPool(),svl::Items<EE_ITEMS_START,EE_ITEMS_END>); aNewAttr.Put(aCharAttrSet, false); rSet.Put(aNewAttr, false); diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 8c636345fc5b..1646df14d46b 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -357,7 +357,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) SvxLRSpaceItem aLRSpace = static_cast<const SvxLRSpaceItem&>(pArgs->Get( GetPool().GetWhich(SID_ATTR_PARA_LRSPACE))); - SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE>{} ); + SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE> ); aLRSpace.SetWhich( EE_PARA_LRSPACE ); aEditAttr.Put( aLRSpace ); @@ -369,7 +369,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) case SID_HANGING_INDENT: { - SfxItemSet aLRSpaceSet( GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE>{} ); + SfxItemSet aLRSpaceSet( GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE> ); mpView->GetAttributes( aLRSpaceSet ); SvxLRSpaceItem aParaMargin( aLRSpaceSet.Get( EE_PARA_LRSPACE ) ); @@ -417,7 +417,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) // tdf#131571: SdrEndTextEdit invalidates pTextEditOutlinerView, the pointer retrieved for pOLV // so reinitialize pOLV pOLV=mpView->GetTextEditOutlinerView(); - SfxItemSet aAttr( mpView->GetDoc().GetPool(), svl::Items<SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION>{} ); + SfxItemSet aAttr( mpView->GetDoc().GetPool(), svl::Items<SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION> ); aAttr.Put( SvxWritingModeItem( nSlot == SID_TEXTDIRECTION_LEFT_TO_RIGHT ? css::text::WritingMode_LR_TB : css::text::WritingMode_TB_RL, diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 36ff551eb7c3..00f32b6d57b6 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -438,7 +438,7 @@ private: nParagraph++; pOutliner->Insert(""); - SfxItemSet aItemSet(m_rDrawViewShell.GetDoc()->GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{}); + SfxItemSet aItemSet(m_rDrawViewShell.GetDoc()->GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>); if (rResult.msName == "BOLD") aItemSet.Put(SvxWeightItem(WEIGHT_BOLD, EE_CHAR_WEIGHT)); @@ -729,7 +729,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( pItem ) { - SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE>{} ); + SfxItemSet aSet( GetPool(), svl::Items<EE_PARA_HYPHENATE, EE_PARA_HYPHENATE> ); bool bValue = pItem->GetValue(); aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) ); mpDrawView->SetAttributes( aSet ); @@ -737,7 +737,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) else // only for testing purpose { OSL_FAIL(" no value for hyphenation!"); - 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, true ) ); mpDrawView->SetAttributes( aSet ); } @@ -1242,7 +1242,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (mpDrawView->IsTextEdit()) { - pSet.emplace( GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{} ); + pSet.emplace( GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END> ); mpDrawView->SetAttributes( *pSet, true ); } else @@ -1263,7 +1263,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( pPresPage->IsPresObj( pObj ) ) { - auto pNewSet = std::make_unique<SfxItemSet>( GetDoc()->GetPool(), svl::Items<SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT>{} ); + auto pNewSet = std::make_unique<SfxItemSet>( GetDoc()->GetPool(), svl::Items<SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT> ); pNewSet->Put(pObj->GetMergedItemSet()); aAttrList.emplace_back(std::move(pNewSet), pObj->GetUserCall()); } @@ -1805,7 +1805,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_CONNECTION_NEW_ROUTING: { - SfxItemSet aDefAttr( GetPool(), svl::Items<SDRATTR_EDGELINE1DELTA, SDRATTR_EDGELINE3DELTA>{} ); + SfxItemSet aDefAttr( GetPool(), svl::Items<SDRATTR_EDGELINE1DELTA, SDRATTR_EDGELINE3DELTA> ); GetView()->SetAttributes( aDefAttr, true ); // (ReplaceAll) Cancel(); @@ -1924,7 +1924,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (! pArgs) { - SfxItemSet aNewAttr( GetDoc()->GetPool(), svl::Items<ATTR_LAYER_START, ATTR_LAYER_END>{} ); + SfxItemSet aNewAttr( GetDoc()->GetPool(), svl::Items<ATTR_LAYER_START, ATTR_LAYER_END> ); aNewAttr.Put( makeSdAttrLayerName( aLayerName ) ); aNewAttr.Put( makeSdAttrLayerTitle() ); @@ -2077,7 +2077,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (! pArgs) { - SfxItemSet aNewAttr( GetDoc()->GetPool(), svl::Items<ATTR_LAYER_START, ATTR_LAYER_END>{} ); + SfxItemSet aNewAttr( GetDoc()->GetPool(), svl::Items<ATTR_LAYER_START, ATTR_LAYER_END> ); aNewAttr.Put( makeSdAttrLayerName( aLayerName ) ); aNewAttr.Put( makeSdAttrLayerTitle( aLayerTitle ) ); diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 6160df65004a..bf8483c15596 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -714,7 +714,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) { const SvxTabStopItem& rItem = pArgs->Get( EE_PARA_TABS ); - SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_TABS, EE_PARA_TABS>{} ); + SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_TABS, EE_PARA_TABS> ); aEditAttr.Put( rItem ); mpDrawView->SetAttributes( aEditAttr ); @@ -728,7 +728,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) SvxLineSpacingItem aParaLineSP = static_cast<const SvxLineSpacingItem&>(pArgs->Get( GetPool().GetWhich(SID_ATTR_PARA_LINESPACE))); - SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_SBL, EE_PARA_SBL>{} ); + SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_SBL, EE_PARA_SBL> ); aParaLineSP.SetWhich( EE_PARA_SBL ); aEditAttr.Put( aParaLineSP ); @@ -740,7 +740,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) case SID_ATTR_PARA_ADJUST_LEFT: { SvxAdjustItem aItem( SvxAdjust::Left, EE_PARA_JUST ); - SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_JUST, EE_PARA_JUST>{} ); + SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_JUST, EE_PARA_JUST> ); aEditAttr.Put( aItem ); mpDrawView->SetAttributes( aEditAttr ); @@ -751,7 +751,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) case SID_ATTR_PARA_ADJUST_CENTER: { SvxAdjustItem aItem( SvxAdjust::Center, EE_PARA_JUST ); - SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_JUST, EE_PARA_JUST>{} ); + SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_JUST, EE_PARA_JUST> ); aEditAttr.Put( aItem ); mpDrawView->SetAttributes( aEditAttr ); @@ -762,7 +762,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) case SID_ATTR_PARA_ADJUST_RIGHT: { SvxAdjustItem aItem( SvxAdjust::Right, EE_PARA_JUST ); - SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_JUST, EE_PARA_JUST>{} ); + SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_JUST, EE_PARA_JUST> ); aEditAttr.Put( aItem ); mpDrawView->SetAttributes( aEditAttr ); @@ -773,7 +773,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) case SID_ATTR_PARA_ADJUST_BLOCK: { SvxAdjustItem aItem( SvxAdjust::Block, EE_PARA_JUST ); - SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_JUST, EE_PARA_JUST>{} ); + SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_JUST, EE_PARA_JUST> ); aEditAttr.Put( aItem ); mpDrawView->SetAttributes( aEditAttr ); @@ -786,7 +786,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) { SvxULSpaceItem aULSP = static_cast<const SvxULSpaceItem&>(pArgs->Get( GetPool().GetWhich(SID_ATTR_PARA_ULSPACE))); - SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_ULSPACE, EE_PARA_ULSPACE>{} ); + SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_ULSPACE, EE_PARA_ULSPACE> ); aULSP.SetWhich( EE_PARA_ULSPACE ); aEditAttr.Put( aULSP ); @@ -801,7 +801,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) SvxLRSpaceItem aLRSpace = static_cast<const SvxLRSpaceItem&>(pArgs->Get( GetPool().GetWhich(SID_ATTR_PARA_LRSPACE))); - SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE>{} ); + SfxItemSet aEditAttr( GetPool(), svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE> ); aLRSpace.SetWhich( EE_PARA_LRSPACE ); aEditAttr.Put( aLRSpace ); @@ -820,7 +820,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) static const auto aWhichTable = svl::Items< EE_PARA_NUMBULLET, EE_PARA_NUMBULLET, EE_PARA_OUTLLEVEL, EE_PARA_OUTLLEVEL, - EE_PARA_LRSPACE, EE_PARA_LRSPACE>{}; + EE_PARA_LRSPACE, EE_PARA_LRSPACE>; SfxItemSet aEditAttr( GetDoc()->GetPool(), aWhichTable ); @@ -887,7 +887,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) // only put lrSpace item SfxItemSet aEditAttrReduced( GetDoc()->GetPool(), - svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE>{} ); + svl::Items<EE_PARA_LRSPACE, EE_PARA_LRSPACE> ); aEditAttrReduced.Put( aLRSpaceItem ); mpDrawView->SetAttributes( aEditAttrReduced ); diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index ad5d7411a35e..7cf042178d73 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -905,7 +905,7 @@ void DrawViewShell::ShowMousePosInfo(const ::tools::Rectangle& rRect, GetPool(), svl::Items< SID_CONTEXT, SID_CONTEXT, - SID_ATTR_POSITION, SID_ATTR_SIZE>{}); + SID_ATTR_POSITION, SID_ATTR_SIZE>); GetStatusBarState(aSet); diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index dcc57a2ae247..a2f9ae6141af 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -1588,7 +1588,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) SdPage* pPage = GetActualPage(); if (pPage != nullptr && GetDoc() != nullptr) { - SfxItemSet aMergedAttr(GetDoc()->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + SfxItemSet aMergedAttr(GetDoc()->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); SdStyleSheet* pStyleSheet = pPage->getPresentationStyle(HID_PSEUDOSHEET_BACKGROUND); MergePageBackgroundFilling(pPage, pStyleSheet, meEditMode == EditMode::MasterPage, aMergedAttr); if (drawing::FillStyle_BITMAP == aMergedAttr.Get(XATTR_FILLSTYLE).GetValue()) @@ -1836,7 +1836,7 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq) XFillGradientItem aGradientItem( XGradient::fromJSON(pJSON->GetValue()) ); // MigrateItemSet guarantees unique gradient names - SfxItemSet aMigrateSet( mpDrawView->GetModel()->GetItemPool(), svl::Items<XATTR_FILLGRADIENT, XATTR_FILLGRADIENT>{} ); + SfxItemSet aMigrateSet( mpDrawView->GetModel()->GetItemPool(), svl::Items<XATTR_FILLGRADIENT, XATTR_FILLGRADIENT> ); aMigrateSet.Put( aGradientItem ); SdrModel::MigrateItemSet( &aMigrateSet, pTempSet.get(), mpDrawView->GetModel() ); @@ -1848,7 +1848,7 @@ void DrawViewShell::SetPageProperties (SfxRequest& rReq) XFillGradientItem aGradientItem( pArgs->Get( XATTR_FILLGRADIENT ) ); // MigrateItemSet guarantees unique gradient names - SfxItemSet aMigrateSet( mpDrawView->GetModel()->GetItemPool(), svl::Items<XATTR_FILLGRADIENT, XATTR_FILLGRADIENT>{} ); + SfxItemSet aMigrateSet( mpDrawView->GetModel()->GetItemPool(), svl::Items<XATTR_FILLGRADIENT, XATTR_FILLGRADIENT> ); aMigrateSet.Put( aGradientItem ); SdrModel::MigrateItemSet( &aMigrateSet, pTempSet.get(), mpDrawView->GetModel() ); diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 6a9ebdc94f1c..220fb33ab6bf 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -613,7 +613,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SfxItemSet aEditAttr( GetDoc()->GetPool() ); mpDrawView->GetAttributes( aEditAttr ); - SfxItemSet aNewAttr( GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{} ); + SfxItemSet aNewAttr( GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END> ); aNewAttr.Put( aEditAttr, false ); std::unique_ptr<SvxNumRule> pNumRule; diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index e83e175a9d9f..832fad9e1b01 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -108,7 +108,7 @@ void DrawViewShell::AssignFrom3DWindow() if(!GetView()->IsPresObjSelected()) { SfxItemSet aSet( GetDoc()->GetPool(), - svl::Items<SDRATTR_START, SDRATTR_END>{}); + svl::Items<SDRATTR_START, SDRATTR_END>); p3DWin->GetAttr( aSet ); // own UNDO-compounding also around transformation in 3D @@ -118,7 +118,7 @@ void DrawViewShell::AssignFrom3DWindow() { // assign only text-attribute SfxItemSet aTextSet( GetDoc()->GetPool(), - svl::Items<EE_ITEMS_START, EE_ITEMS_END>{} ); + svl::Items<EE_ITEMS_START, EE_ITEMS_END> ); aTextSet.Put( aSet, false ); GetView()->SetAttributes( aTextSet ); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index ed810ca0f4fe..7a423c0d96df 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -820,7 +820,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) // does the selection provide a unique presentation layout? // if not, the templates must not be edited - SfxItemSet aSet(*rSet.GetPool(), svl::Items<SID_STATUS_LAYOUT, SID_STATUS_LAYOUT>{}); + SfxItemSet aSet(*rSet.GetPool(), svl::Items<SID_STATUS_LAYOUT, SID_STATUS_LAYOUT>); GetStatusBarState(aSet); OUString aTest = static_cast<const SfxStringItem&>(aSet.Get(SID_STATUS_LAYOUT)).GetValue(); if (aTest.isEmpty()) @@ -1466,7 +1466,7 @@ void OutlineViewShell::GetAttrState( SfxItemSet& rSet ) SfxUInt16Item* pFamilyItem = dynamic_cast<SfxUInt16Item*>(pItem.get()); if (pFamilyItem && static_cast<SfxStyleFamily>(pFamilyItem->GetValue()) == SfxStyleFamily::Pseudo) { - SfxItemSet aSet(*rSet.GetPool(), svl::Items<SID_STATUS_LAYOUT, SID_STATUS_LAYOUT>{}); + SfxItemSet aSet(*rSet.GetPool(), svl::Items<SID_STATUS_LAYOUT, SID_STATUS_LAYOUT>); GetStatusBarState(aSet); OUString aRealStyle = static_cast<const SfxStringItem&>(aSet.Get(SID_STATUS_LAYOUT)).GetValue(); if (aRealStyle.isEmpty()) diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 8470118e6ceb..a4828a390300 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -960,8 +960,8 @@ bool View::IsMorphingAllowed() const ( nKind1 != OBJ_CAPTION && nKind2 != OBJ_CAPTION ) && dynamic_cast< const E3dObject *>( pObj1 ) == nullptr && dynamic_cast< const E3dObject *>( pObj2 ) == nullptr ) { - SfxItemSet aSet1( mrDoc.GetPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLSTYLE>{} ); - SfxItemSet aSet2( mrDoc.GetPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLSTYLE>{} ); + SfxItemSet aSet1( mrDoc.GetPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLSTYLE> ); + SfxItemSet aSet2( mrDoc.GetPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLSTYLE> ); aSet1.Put(pObj1->GetMergedItemSet()); aSet2.Put(pObj2->GetMergedItemSet()); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 4bac17745309..8bbb9ce7e24f 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -782,8 +782,8 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, if( dynamic_cast< E3dObject *>( pPickObj ) != nullptr && dynamic_cast< E3dObject *>( pObj ) != nullptr ) { // handle 3D attribute in addition - SfxItemSet aNewSet( mrDoc.GetPool(), svl::Items<SID_ATTR_3D_START, SID_ATTR_3D_END>{} ); - SfxItemSet aOldSet( mrDoc.GetPool(), svl::Items<SID_ATTR_3D_START, SID_ATTR_3D_END>{} ); + SfxItemSet aNewSet( mrDoc.GetPool(), svl::Items<SID_ATTR_3D_START, SID_ATTR_3D_END> ); + SfxItemSet aOldSet( mrDoc.GetPool(), svl::Items<SID_ATTR_3D_START, SID_ATTR_3D_END> ); aOldSet.Put(pPickObj->GetMergedItemSet()); aNewSet.Put( pObj->GetMergedItemSet() ); diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 6a7c49224052..bc6e48286889 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -161,7 +161,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, EndUndo(); } - SfxItemSet aSet(mpDocSh->GetPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLBITMAP>{}); + SfxItemSet aSet(mpDocSh->GetPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLBITMAP>); aSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP)); aSet.Put(XFillBitmapItem(rGraphic)); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 4e4e5f90c3a2..6693eb56892a 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -401,7 +401,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) const SfxStringItem* pStringItem = rReq.GetArg<SfxStringItem>(SID_CONFIG); SfxItemSet aSet( - GetPool(), svl::Items<SID_CONFIG, SID_CONFIG>{} ); + GetPool(), svl::Items<SID_CONFIG, SID_CONFIG> ); if ( pStringItem ) { @@ -1618,7 +1618,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) case SID_AUTO_CORRECT_DLG: { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - SfxItemSet aSet(GetPool(), svl::Items<SID_AUTO_CORRECT_DLG, SID_AUTO_CORRECT_DLG>{}); + SfxItemSet aSet(GetPool(), svl::Items<SID_AUTO_CORRECT_DLG, SID_AUTO_CORRECT_DLG>); const SfxPoolItem* pItem=nullptr; const SfxItemSet* pSet = rReq.GetArgs(); SfxItemPool* pSetPool = pSet ? pSet->GetPool() : nullptr; diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index cdbb281916a7..5da675a3dcb4 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -593,7 +593,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) aDocInfoItem.SetTemplate(false); SfxItemSet aSet(GetPool(), svl::Items<SID_DOCINFO, SID_DOCINFO, SID_DOC_READONLY, SID_DOC_READONLY, - SID_EXPLORER_PROPS_START, SID_EXPLORER_PROPS_START, SID_BASEURL, SID_BASEURL>{} ); + SID_EXPLORER_PROPS_START, SID_EXPLORER_PROPS_START, SID_BASEURL, SID_BASEURL> ); aSet.Put( aDocInfoItem ); aSet.Put( SfxBoolItem( SID_DOC_READONLY, bReadOnly ) ); aSet.Put( SfxStringItem( SID_EXPLORER_PROPS_START, GetTitle() ) ); diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index ba1d6c81e56d..f3719b886bad 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -486,7 +486,7 @@ void Test::viewZoom() } { - SfxItemSet aSet(SmDocShell::GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>{}); + SfxItemSet aSet(SmDocShell::GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>); aSet.Put(SvxZoomItem(SvxZoomType::OPTIMAL, 0)); SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet); m_pViewShell->Execute(aZoom); @@ -532,7 +532,7 @@ void Test::viewZoom() nFinalZoom = rGraphicWindow.GetZoom(); CPPUNIT_ASSERT_MESSAGE("Should not be optimal zoom", nFinalZoom != nOptimalZoom); - SfxItemSet aSet(SmDocShell::GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>{}); + SfxItemSet aSet(SmDocShell::GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>); aSet.Put(SvxZoomItem(SvxZoomType::PERCENT, 50)); SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet); m_pViewShell->Execute(aZoom); @@ -541,7 +541,7 @@ void Test::viewZoom() } { - SfxItemSet aSet(SmDocShell::GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>{}); + SfxItemSet aSet(SmDocShell::GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>); aSet.Put(SvxZoomItem(SvxZoomType::PERCENT, 5)); SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet); m_pViewShell->Execute(aZoom); @@ -550,7 +550,7 @@ void Test::viewZoom() } { - SfxItemSet aSet(SmDocShell::GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>{}); + SfxItemSet aSet(SmDocShell::GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>); aSet.Put(SvxZoomItem(SvxZoomType::PERCENT, 1000)); SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet); m_pViewShell->Execute(aZoom); diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 2b924341265f..23a0caf847fb 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -495,7 +495,7 @@ Printer* SmDocShell::GetPrt() svl::Items< SID_PRINTTITLE, SID_PRINTZOOM, SID_NO_RIGHT_SPACES, SID_SAVE_ONLY_USED_SYMBOLS, - SID_AUTO_CLOSE_BRACKETS, SID_AUTO_CLOSE_BRACKETS>{}); + SID_AUTO_CLOSE_BRACKETS, SID_AUTO_CLOSE_BRACKETS>); SmModule *pp = SM_MOD(); pp->GetConfig()->ConfigToItemSet(*pOptions); mpPrinter = VclPtr<SfxPrinter>::Create(std::move(pOptions)); diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index d4f197406bcc..10a1a3f2216b 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -212,7 +212,7 @@ std::unique_ptr<SfxItemSet> SmModule::CreateItemSet( sal_uInt16 nId ) SID_PRINTTITLE, SID_PRINTZOOM, SID_NO_RIGHT_SPACES, SID_SAVE_ONLY_USED_SYMBOLS, SID_AUTO_CLOSE_BRACKETS, SID_AUTO_CLOSE_BRACKETS, - SID_SMEDITWINDOWZOOM, SID_SMEDITWINDOWZOOM>{}); + SID_SMEDITWINDOWZOOM, SID_SMEDITWINDOWZOOM>); GetConfig()->ConfigToItemSet(*pRet); } diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index f66f9a3a7648..b2e38bf645f9 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -612,7 +612,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* SID_NO_RIGHT_SPACES, SID_NO_RIGHT_SPACES, SID_SAVE_ONLY_USED_SYMBOLS, SID_SAVE_ONLY_USED_SYMBOLS, SID_AUTO_CLOSE_BRACKETS, SID_AUTO_CLOSE_BRACKETS, - SID_SMEDITWINDOWZOOM, SID_SMEDITWINDOWZOOM>{} ); + SID_SMEDITWINDOWZOOM, SID_SMEDITWINDOWZOOM> ); SmModule *pp = SM_MOD(); pp->GetConfig()->ConfigToItemSet(*pItemSet); VclPtr<SfxPrinter> pPrinter = SfxPrinter::Create ( aStream, std::move(pItemSet) ); diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 338c667cdbd7..ef05e243f798 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1852,7 +1852,7 @@ void SmViewShell::Execute(SfxRequest& rReq) } else { - SfxItemSet aSet( SmDocShell::GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>{}); + SfxItemSet aSet( SmDocShell::GetPool(), svl::Items<SID_ATTR_ZOOM, SID_ATTR_ZOOM>); aSet.Put( SvxZoomItem( SvxZoomType::PERCENT, mxGraphicWindow->GetZoom())); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ScopedVclPtr<AbstractSvxZoomDialog> xDlg(pFact->CreateSvxZoomDialog(GetViewFrame()->GetWindow().GetFrameWeld(), aSet)); diff --git a/svl/qa/unit/items/stylepool.cxx b/svl/qa/unit/items/stylepool.cxx index 5fb94f29f9cd..01f0d8867b48 100644 --- a/svl/qa/unit/items/stylepool.cxx +++ b/svl/qa/unit/items/stylepool.cxx @@ -32,20 +32,20 @@ CPPUNIT_TEST_FIXTURE(StylePoolTest, testIterationOrder) pPool->SetDefaults(&aDefaults); { // Set up parents in mixed order to make sure we do not sort by pointer address. - SfxItemSet aParent1(*pPool, svl::Items<1, 1>{}); - SfxItemSet aChild1(*pPool, svl::Items<1, 1>{}); + SfxItemSet aParent1(*pPool, svl::Items<1, 1>); + SfxItemSet aChild1(*pPool, svl::Items<1, 1>); aChild1.SetParent(&aParent1); SfxStringItem aItem1(1, "Item1"); aChild1.Put(aItem1); - SfxItemSet aParent3(*pPool, svl::Items<1, 1>{}); - SfxItemSet aChild3(*pPool, svl::Items<1, 1>{}); + SfxItemSet aParent3(*pPool, svl::Items<1, 1>); + SfxItemSet aChild3(*pPool, svl::Items<1, 1>); aChild3.SetParent(&aParent3); SfxStringItem aItem3(1, "Item3"); aChild3.Put(aItem3); - SfxItemSet aParent2(*pPool, svl::Items<1, 1>{}); - SfxItemSet aChild2(*pPool, svl::Items<1, 1>{}); + SfxItemSet aParent2(*pPool, svl::Items<1, 1>); + SfxItemSet aChild2(*pPool, svl::Items<1, 1>); aChild2.SetParent(&aParent2); SfxStringItem aItem2(1, "Item2"); aChild2.Put(aItem2); diff --git a/svx/qa/unit/removewhichrange.cxx b/svx/qa/unit/removewhichrange.cxx index 1c45e2d7874e..7ea534aab96a 100644 --- a/svx/qa/unit/removewhichrange.cxx +++ b/svx/qa/unit/removewhichrange.cxx @@ -34,19 +34,19 @@ class TestRemoveWhichRange : public CppUnit::TestFixture CPPUNIT_ASSERT(out.empty()); } { - WhichRangesContainer in(svl::Items<10, 20, 30, 40>::value); + WhichRangesContainer in(svl::Items<10, 20, 30, 40>); auto const out = RemoveWhichRange(in, 0, 20); CPPUNIT_ASSERT_EQUAL(sal_uInt16(30), out[0].first); CPPUNIT_ASSERT_EQUAL(sal_uInt16(40), out[0].second); } { - WhichRangesContainer in(svl::Items<10, 20, 30, 40>::value); + WhichRangesContainer in(svl::Items<10, 20, 30, 40>); auto const out = RemoveWhichRange(in, 10, 20); CPPUNIT_ASSERT_EQUAL(sal_uInt16(30), out[0].first); CPPUNIT_ASSERT_EQUAL(sal_uInt16(40), out[0].second); } { - WhichRangesContainer in(svl::Items<10, 20, 30, 40>::value); + WhichRangesContainer in(svl::Items<10, 20, 30, 40>); auto const out = RemoveWhichRange(in, 15, 20); CPPUNIT_ASSERT_EQUAL(sal_uInt16(10), out[0].first); CPPUNIT_ASSERT_EQUAL(sal_uInt16(14), out[0].second); @@ -54,19 +54,19 @@ class TestRemoveWhichRange : public CppUnit::TestFixture CPPUNIT_ASSERT_EQUAL(sal_uInt16(40), out[1].second); } { - WhichRangesContainer in(svl::Items<10, 20, 30, 40>::value); + WhichRangesContainer in(svl::Items<10, 20, 30, 40>); auto const out = RemoveWhichRange(in, 30, 40); CPPUNIT_ASSERT_EQUAL(sal_uInt16(10), out[0].first); CPPUNIT_ASSERT_EQUAL(sal_uInt16(20), out[0].second); } { - WhichRangesContainer in(svl::Items<10, 20, 30, 40>::value); + WhichRangesContainer in(svl::Items<10, 20, 30, 40>); auto const out = RemoveWhichRange(in, 30, 50); CPPUNIT_ASSERT_EQUAL(sal_uInt16(10), out[0].first); CPPUNIT_ASSERT_EQUAL(sal_uInt16(20), out[0].second); } { - WhichRangesContainer in(svl::Items<10, 20, 30, 40>::value); + WhichRangesContainer in(svl::Items<10, 20, 30, 40>); auto const out = RemoveWhichRange(in, 30, 35); CPPUNIT_ASSERT_EQUAL(sal_uInt16(10), out[0].first); CPPUNIT_ASSERT_EQUAL(sal_uInt16(20), out[0].second); @@ -74,7 +74,7 @@ class TestRemoveWhichRange : public CppUnit::TestFixture CPPUNIT_ASSERT_EQUAL(sal_uInt16(40), out[1].second); } { - WhichRangesContainer in(svl::Items<10, 20, 30, 40>::value); + WhichRangesContainer in(svl::Items<10, 20, 30, 40>); auto const out = RemoveWhichRange(in, 15, 35); CPPUNIT_ASSERT_EQUAL(sal_uInt16(10), out[0].first); CPPUNIT_ASSERT_EQUAL(sal_uInt16(14), out[0].second); @@ -82,7 +82,7 @@ class TestRemoveWhichRange : public CppUnit::TestFixture CPPUNIT_ASSERT_EQUAL(sal_uInt16(40), out[1].second); } { - WhichRangesContainer in(svl::Items<10, 20, 30, 40>::value); + WhichRangesContainer in(svl::Items<10, 20, 30, 40>); auto const out = RemoveWhichRange(in, 12, 15); CPPUNIT_ASSERT_EQUAL(sal_uInt16(10), out[0].first); CPPUNIT_ASSERT_EQUAL(sal_uInt16(11), out[0].second); @@ -92,12 +92,12 @@ class TestRemoveWhichRange : public CppUnit::TestFixture CPPUNIT_ASSERT_EQUAL(sal_uInt16(40), out[2].second); } { - WhichRangesContainer in(svl::Items<10, 20, 30, 40>::value); + WhichRangesContainer in(svl::Items<10, 20, 30, 40>); auto const out = RemoveWhichRange(in, 0, 100); CPPUNIT_ASSERT(out.empty()); } { - WhichRangesContainer in(svl::Items<10, 20, 40, 50>::value); + WhichRangesContainer in(svl::Items<10, 20, 40, 50>); auto const out = RemoveWhichRange(in, 25, 35); CPPUNIT_ASSERT_EQUAL(sal_uInt16(10), out[0].first); CPPUNIT_ASSERT_EQUAL(sal_uInt16(20), out[0].second); @@ -105,7 +105,7 @@ class TestRemoveWhichRange : public CppUnit::TestFixture CPPUNIT_ASSERT_EQUAL(sal_uInt16(50), out[1].second); } { - WhichRangesContainer in(svl::Items<10, 20, 40, 50>::value); + WhichRangesContainer in(svl::Items<10, 20, 40, 50>); auto const out = RemoveWhichRange(in, 50, 100); CPPUNIT_ASSERT_EQUAL(sal_uInt16(10), out[0].first); CPPUNIT_ASSERT_EQUAL(sal_uInt16(20), out[0].second); diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx index 93efd7cbc89e..1bc9ef29b985 100644 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -31,7 +31,7 @@ namespace svx { sal_uInt16 nResult = RET_CANCEL; - SfxItemSet aRegistrationItems( SfxGetpApp()->GetPool(), svl::Items<SID_SB_DB_REGISTER, SID_SB_DB_REGISTER>{} ); + SfxItemSet aRegistrationItems( SfxGetpApp()->GetPool(), svl::Items<SID_SB_DB_REGISTER, SID_SB_DB_REGISTER> ); SvxAbstractDialogFactory* pDialogFactory = SvxAbstractDialogFactory::Create(); ScopedVclPtr<SfxAbstractDialog> pDialog(pDialogFactory->CreateSfxDialog(parentWindow, aRegistrationItems, nullptr, RID_SFXPAGE_DBREGISTER)); diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 0c7c62229bc9..ff12e03137cd 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -124,7 +124,7 @@ void Svx3DPreviewControl::Construct() SfxItemSet aSet( mpModel->GetItemPool(), svl::Items<XATTR_LINESTYLE, XATTR_LINESTYLE, - XATTR_FILL_FIRST, XATTR_FILLBITMAP>{} ); + XATTR_FILL_FIRST, XATTR_FILLBITMAP> ); aSet.Put( XLineStyleItem( drawing::LineStyle_NONE ) ); aSet.Put( XFillStyleItem( drawing::FillStyle_SOLID ) ); aSet.Put( XFillColorItem( "", COL_WHITE ) ); @@ -180,7 +180,7 @@ void Svx3DPreviewControl::SetObjectType(SvxPreviewObjectType nType) if(mnObjectType == nType && mp3DObj) return; - SfxItemSet aSet(mpModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END>{}); + SfxItemSet aSet(mpModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END>); mnObjectType = nType; if( mp3DObj ) diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 4fa388274755..9ab8f6b9dcdd 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -73,7 +73,7 @@ const WhichRangesContainer SvxHFPage::pRanges(svl::Items< SID_ATTR_PAGE_SHARED, SID_ATTR_PAGE_SHARED, SID_ATTR_HDFT_DYNAMIC_SPACING, SID_ATTR_HDFT_DYNAMIC_SPACING, SID_ATTR_PAGE_SHARED_FIRST, SID_ATTR_PAGE_SHARED_FIRST ->::value); +>); namespace svx { @@ -204,7 +204,7 @@ bool SvxHFPage::FillItemSet( SfxItemSet* rSet ) DBG_ASSERT(pPool,"no pool :-("); MapUnit eUnit = pPool->GetMetric(nWSize); // take over DrawingLayer FillStyles - SfxItemSet aSet(*pPool, svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + SfxItemSet aSet(*pPool, svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); // Keep it valid aSet.MergeRange(nWSize, nWSize); aSet.MergeRange(nWLRSpace, nWLRSpace); @@ -533,7 +533,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, weld::Button&, void) pBBSet.reset(new SfxItemSet( *GetItemSet().GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST, // DrawingLayer FillStyle definitions - SID_COLOR_TABLE, SID_PATTERN_LIST>{})); // XPropertyLists for Color, Gradient, Hatch and Graphic fills + SID_COLOR_TABLE, SID_PATTERN_LIST>)); // XPropertyLists for Color, Gradient, Hatch and Graphic fills // Keep it valid pBBSet->MergeRange(nOuter, nOuter); pBBSet->MergeRange(nInner, nInner); @@ -570,7 +570,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, weld::Button&, void) pBBSet.reset( new SfxItemSet( *GetItemSet().GetPool(), - svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}) ); + svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>) ); // Keep it valid pBBSet->MergeRange(nBrush, nBrush); pBBSet->MergeRange(nOuter, nOuter); @@ -644,7 +644,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, weld::Button&, void) const SvxBrushItem& rItem = static_cast<const SvxBrushItem&>(pBBSet->Get(nWhich)); SfxItemSet aTempSet(*pBBSet->GetPool(), - svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet); aFillAttributes = @@ -718,7 +718,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) { // create FillAttributes from SvxBrushItem const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rTmpSet.Get(nWhich)); - SfxItemSet aTempSet(*rTmpSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + SfxItemSet aTempSet(*rTmpSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet); aHeaderFillAttributes = std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(aTempSet); @@ -754,7 +754,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) { // create FillAttributes from SvxBrushItem const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rTmpSet.Get(nWhich)); - SfxItemSet aTempSet(*rTmpSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + SfxItemSet aTempSet(*rTmpSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet); aFooterFillAttributes = std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(aTempSet); @@ -780,7 +780,7 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) { // create FillAttributes from SvxBrushItem const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(rSet.Get(nWhich)); - 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); aPageFillAttributes = std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(aTempSet); diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 484980e70d7c..5f820685dd2d 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -659,7 +659,7 @@ void IMapWindow::DoMacroAssign() if ( !pSdrObj ) return; - SfxItemSet aSet( *pIMapPool, svl::Items<SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG>{} ); + SfxItemSet aSet(*pIMapPool, svl::Items<SID_ATTR_MACROITEM, SID_ATTR_MACROITEM, SID_EVENTCONFIG, SID_EVENTCONFIG>); SfxEventNamesItem aNamesItem(SID_EVENTCONFIG); aNamesItem.AddEvent( "MouseOver", "", SvMacroItemId::OnMouseOver ); diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index a3bd5f9ce430..790f5e740b16 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -466,7 +466,7 @@ void Svx3DWin::Update( SfxItemSet const & rAttrs ) else mpRemember2DAttributes = std::make_unique<SfxItemSet>(*rAttrs.GetPool(), svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST, - SDRATTR_3D_FIRST, SDRATTR_3D_LAST>{}); + SDRATTR_3D_FIRST, SDRATTR_3D_LAST>); SfxWhichIter aIter(*mpRemember2DAttributes); sal_uInt16 nWhich(aIter.FirstWhich()); @@ -2746,7 +2746,7 @@ void Svx3DWin::UpdatePreview() } // Get Itemset - SfxItemSet aSet( pModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END>{}); + SfxItemSet aSet( pModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END>); // Get Attributes and set the preview GetAttr( aSet ); diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 8bbda29a9b1a..617eaebe9706 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -94,7 +94,7 @@ SfxItemSet E3dView::Get3DAttributes() const SfxItemSet aSet( mpModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END, - SID_ATTR_3D_INTERN, SID_ATTR_3D_INTERN>{}); + SID_ATTR_3D_INTERN, SID_ATTR_3D_INTERN>); sal_uInt32 nSelectedItems(0); @@ -118,7 +118,7 @@ SfxItemSet E3dView::Get3DAttributes() const if(!nSelectedItems) { // Get defaults and apply - SfxItemSet aDefaultSet(mpModel->GetItemPool(), svl::Items<SDRATTR_3D_FIRST, SDRATTR_3D_LAST>{}); + SfxItemSet aDefaultSet(mpModel->GetItemPool(), svl::Items<SDRATTR_3D_FIRST, SDRATTR_3D_LAST>); GetAttributes(aDefaultSet); aSet.Put(aDefaultSet); @@ -158,7 +158,7 @@ void E3dView::Set3DAttributes( const SfxItemSet& rAttr) if(!nSelectedItems) { // Set defaults - SfxItemSet aDefaultSet(mpModel->GetItemPool(), svl::Items<SDRATTR_3D_FIRST, SDRATTR_3D_LAST>{}); + SfxItemSet aDefaultSet(mpModel->GetItemPool(), svl::Items<SDRATTR_3D_FIRST, SDRATTR_3D_LAST>); aDefaultSet.Put(rAttr); SetAttributes(aDefaultSet); } diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 2dfd9e819981..cfdd2ebb97a7 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -130,7 +130,7 @@ namespace sdr::properties svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST, SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, - SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST>{}); + SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST>); } AttributeProperties::AttributeProperties(SdrObject& rObj) diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx index d073aa91b91e..8a579a0509e7 100644 --- a/svx/source/sdr/properties/captionproperties.cxx +++ b/svx/source/sdr/properties/captionproperties.cxx @@ -40,7 +40,7 @@ namespace sdr::properties SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST, // Range from SdrTextObj: - EE_ITEMS_START, EE_ITEMS_END>{}); + EE_ITEMS_START, EE_ITEMS_END>); } CaptionProperties::CaptionProperties(SdrObject& rObj) diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx index dab008ff6957..058a45e5249d 100644 --- a/svx/source/sdr/properties/circleproperties.cxx +++ b/svx/source/sdr/properties/circleproperties.cxx @@ -44,7 +44,7 @@ namespace sdr::properties SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST, // Range from SdrTextObj: - EE_ITEMS_START, EE_ITEMS_END>{}); + EE_ITEMS_START, EE_ITEMS_END>); } CircleProperties::CircleProperties(SdrObject& rObj) diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx index 97063011f79c..7da10e21f213 100644 --- a/svx/source/sdr/properties/connectorproperties.cxx +++ b/svx/source/sdr/properties/connectorproperties.cxx @@ -41,7 +41,7 @@ namespace sdr::properties SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST, // Range from SdrTextObj: - EE_ITEMS_START, EE_ITEMS_END>{}); + EE_ITEMS_START, EE_ITEMS_END>); } ConnectorProperties::ConnectorProperties(SdrObject& rObj) diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx index 771c76183280..8b6466cfa995 100644 --- a/svx/source/sdr/properties/customshapeproperties.cxx +++ b/svx/source/sdr/properties/customshapeproperties.cxx @@ -74,7 +74,7 @@ namespace sdr::properties SDRATTR_GLOW_FIRST, SDRATTR_SOFTEDGE_LAST, SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST, // Range from SdrTextObj: - EE_ITEMS_START, EE_ITEMS_END>{}); + EE_ITEMS_START, EE_ITEMS_END>); } bool CustomShapeProperties::AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem ) const diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index d20d75f4f8cf..186bebab6d7e 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -176,7 +176,7 @@ namespace sdr::properties const SfxPoolItem *pPoolItem; std::vector< sal_uInt16 > aPostItemChangeList; bool bDidChange(false); - SfxItemSet aSet(GetSdrObject().GetObjectItemPool(), svl::Items<SDRATTR_START, EE_ITEMS_END>{}); + SfxItemSet aSet(GetSdrObject().GetObjectItemPool(), svl::Items<SDRATTR_START, EE_ITEMS_END>); // give a hint to STL_Vector aPostItemChangeList.reserve(rSet.Count()); diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx index 8b6d1f5f60e2..e3fe78e47679 100644 --- a/svx/source/sdr/properties/e3dcompoundproperties.cxx +++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx @@ -56,7 +56,7 @@ namespace sdr::properties GetObjectItemSet(); // add filtered scene properties (SDRATTR_3DSCENE_) to local itemset - SfxItemSet aSet(*mxItemSet->GetPool(), svl::Items<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST>{}); + SfxItemSet aSet(*mxItemSet->GetPool(), svl::Items<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST>); aSet.Put(pScene->GetProperties().GetObjectItemSet()); mxItemSet->Put(aSet); } @@ -77,7 +77,7 @@ namespace sdr::properties GetObjectItemSet(); // Generate filtered scene properties (SDRATTR_3DSCENE_) itemset - SfxItemSet aSet(*mxItemSet->GetPool(), svl::Items<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST>{}); + SfxItemSet aSet(*mxItemSet->GetPool(), svl::Items<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST>); aSet.Put(rSet); if(bClearAllItems) diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx index 393b3c9f072c..9d291ddd3c1d 100644 --- a/svx/source/sdr/properties/e3dproperties.cxx +++ b/svx/source/sdr/properties/e3dproperties.cxx @@ -38,7 +38,7 @@ namespace sdr::properties SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, // ranges from E3dObject, contains object and scene because of GetMergedItemSet() - SDRATTR_3D_FIRST, SDRATTR_3D_LAST>{}); + SDRATTR_3D_FIRST, SDRATTR_3D_LAST>); } E3dProperties::E3dProperties(SdrObject& rObj) diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index 7635f32f806d..f04bc4b88236 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -53,7 +53,7 @@ namespace sdr::properties if(mxItemSet) { // filter for SDRATTR_3DSCENE_ items, only keep those items - SfxItemSet aNew(*mxItemSet->GetPool(), svl::Items<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST>{}); + SfxItemSet aNew(*mxItemSet->GetPool(), svl::Items<SDRATTR_3DSCENE_FIRST, SDRATTR_3DSCENE_LAST>); aNew.Put(*mxItemSet); mxItemSet->ClearItem(); mxItemSet->Put(aNew); diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index 78ca9a83bd23..dd59a41a1be7 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -71,7 +71,7 @@ namespace sdr::properties SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST, // range from SdrTextObj - EE_ITEMS_START, EE_ITEMS_END>{}); + EE_ITEMS_START, EE_ITEMS_END>); } GraphicProperties::GraphicProperties(SdrObject& rObj) diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index e503c5710810..08e2009af0ae 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -50,7 +50,7 @@ namespace sdr::properties SDRATTR_TEXTDIRECTION, SDRATTR_TEXTDIRECTION, SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST, // Range from SdrTextObj: - EE_ITEMS_START, EE_ITEMS_END>{}); + EE_ITEMS_START, EE_ITEMS_END>); } MeasureProperties::MeasureProperties(SdrObject& rObj) diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 9161cbde2f52..062ef79d4420 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -57,7 +57,7 @@ namespace sdr::properties SDRATTR_TEXTCOLUMNS_FIRST, SDRATTR_TEXTCOLUMNS_LAST, // range from SdrTextObj - EE_ITEMS_START, EE_ITEMS_END>{}); + EE_ITEMS_START, EE_ITEMS_END>); } TextProperties::TextProperties(SdrObject& rObj) @@ -478,7 +478,7 @@ namespace sdr::properties if(bHasURL) { - SfxItemSet aColorSet(*aSet.GetPool(), svl::Items<EE_CHAR_COLOR, EE_CHAR_COLOR>{} ); + SfxItemSet aColorSet(*aSet.GetPool(), svl::Items<EE_CHAR_COLOR, EE_CHAR_COLOR> ); aColorSet.Put(aSet, false); ESelection aSel(nPara, 0); diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 4d3453889704..c1d965606d3f 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -3841,7 +3841,7 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/) sal_Int32 nBottomCrop = static_cast<sal_Int32>( rOldCrop.GetBottom() - nDiffBottom * fScaleY ); SfxItemPool& rPool = getSdrDragView().GetModel()->GetItemPool(); - SfxItemSet aSet( rPool, svl::Items<SDRATTR_GRAFCROP, SDRATTR_GRAFCROP>{} ); + SfxItemSet aSet( rPool, svl::Items<SDRATTR_GRAFCROP, SDRATTR_GRAFCROP> ); aSet.Put( SdrGrafCropItem( nLeftCrop, nTopCrop, nRightCrop, nBottomCrop ) ); getSdrDragView().SetAttributes( aSet, false ); } diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index e5b7ac5d2fc6..bdb05d6cce34 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -1344,7 +1344,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const svl::Items< // SID_ATTR_TRANSFORM_... from s:svxids.hrc SDRATTR_CORNER_RADIUS, SDRATTR_CORNER_RADIUS, SID_ATTR_TRANSFORM_POS_X, SID_ATTR_TRANSFORM_ANGLE, - SID_ATTR_TRANSFORM_PROTECT_POS, SID_ATTR_TRANSFORM_AUTOHEIGHT>{}); + SID_ATTR_TRANSFORM_PROTECT_POS, SID_ATTR_TRANSFORM_AUTOHEIGHT>); if (AreObjectsMarked()) { diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 27df56d91d76..edd2c8310fdc 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -561,7 +561,7 @@ void SdrEditView::ImpCopyAttributes(const SdrObject* pSource, SdrObject* pDest) SfxItemSet aSet(mpModel->GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_NOTPERSIST_FIRST-1, SDRATTR_NOTPERSIST_LAST+1, SDRATTR_END, - EE_ITEMS_START, EE_ITEMS_END>{}); + EE_ITEMS_START, EE_ITEMS_END>); aSet.Put(pSource->GetMergedItemSet()); diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 5f4c4529bef0..c11238a1b004 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -2632,11 +2632,11 @@ static WhichRangesContainer GetFormatRangeImpl(bool bTextOnly) SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, // table cell formats SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST, SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST, - EE_PARA_START, EE_PARA_END, EE_CHAR_START, EE_CHAR_END>::value); + EE_PARA_START, EE_PARA_END, EE_CHAR_START, EE_CHAR_END>); static const WhichRangesContainer gTextOnly( svl::Items<SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, EE_PARA_START, EE_PARA_END, EE_CHAR_START, - EE_CHAR_END>::value); + EE_CHAR_END>); return bTextOnly ? gTextOnly : gFull; } diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index c2e43c07d43c..66d2acc86b9b 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -110,9 +110,9 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport( mpVD->SetLineColor(); mpVD->SetFillColor(); maOldLineColor.SetRed( mpVD->GetLineColor().GetRed() + 1 ); - mpLineAttr = std::make_unique<SfxItemSet>(rModel.GetItemPool(), svl::Items<XATTR_LINE_FIRST, XATTR_LINE_LAST>{}); - mpFillAttr = std::make_unique<SfxItemSet>(rModel.GetItemPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); - mpTextAttr = std::make_unique<SfxItemSet>(rModel.GetItemPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{}); + mpLineAttr = std::make_unique<SfxItemSet>(rModel.GetItemPool(), svl::Items<XATTR_LINE_FIRST, XATTR_LINE_LAST>); + mpFillAttr = std::make_unique<SfxItemSet>(rModel.GetItemPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); + mpTextAttr = std::make_unique<SfxItemSet>(rModel.GetItemPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>); checkClip(); } @@ -723,7 +723,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaRoundRectAction const & rAct) SetAttributes(pRect); tools::Long nRad=(rAct.GetHorzRound()+rAct.GetVertRound())/2; if (nRad!=0) { - SfxItemSet aSet(*mpLineAttr->GetPool(), svl::Items<SDRATTR_CORNER_RADIUS, SDRATTR_CORNER_RADIUS>{}); + SfxItemSet aSet(*mpLineAttr->GetPool(), svl::Items<SDRATTR_CORNER_RADIUS, SDRATTR_CORNER_RADIUS>); aSet.Put(SdrMetricItem(SDRATTR_CORNER_RADIUS, nRad)); pRect->SetMergedItemSet(aSet); } @@ -1049,7 +1049,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rSt if (!aFnt.IsTransparent()) { - SfxItemSet aAttr(*mpFillAttr->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + SfxItemSet aAttr(*mpFillAttr->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); aAttr.Put(XFillStyleItem(drawing::FillStyle_SOLID)); aAttr.Put(XFillColorItem(OUString(), aFnt.GetFillColor())); pText->SetMergedItemSet(aAttr); diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index b5d028b7315f..e90a257308f3 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -1390,7 +1390,7 @@ void SdrObjCustomShape::AdaptTextMinSize() SfxItemSet aSet( *GetObjectItemSet().GetPool(), svl::Items<SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT, - SDRATTR_TEXT_MINFRAMEWIDTH, SDRATTR_TEXT_AUTOGROWWIDTH>{}); // contains SDRATTR_TEXT_MAXFRAMEWIDTH + SDRATTR_TEXT_MINFRAMEWIDTH, SDRATTR_TEXT_AUTOGROWWIDTH>); // contains SDRATTR_TEXT_MAXFRAMEWIDTH if(bResizeShapeToFitText) { @@ -2219,7 +2219,7 @@ void SdrObjCustomShape::SetVerticalWriting( bool bVertical ) svl::Items<SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT, // Expanded item ranges to also support horizontal and vertical adjust. SDRATTR_TEXT_VERTADJUST, SDRATTR_TEXT_VERTADJUST, - SDRATTR_TEXT_AUTOGROWWIDTH, SDRATTR_TEXT_HORZADJUST>{}); + SDRATTR_TEXT_AUTOGROWWIDTH, SDRATTR_TEXT_HORZADJUST>); aNewSet.Put(rSet); diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 41dbe69be174..34987b6bf34d 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -537,7 +537,7 @@ void SdrTextObj::AdaptTextMinSize() SfxItemSet aSet( *GetObjectItemSet().GetPool(), svl::Items<SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT, - SDRATTR_TEXT_MINFRAMEWIDTH, SDRATTR_TEXT_AUTOGROWWIDTH>{}); // contains SDRATTR_TEXT_MAXFRAMEWIDTH + SDRATTR_TEXT_MINFRAMEWIDTH, SDRATTR_TEXT_AUTOGROWWIDTH>); // contains SDRATTR_TEXT_MAXFRAMEWIDTH if(bW) { @@ -1513,7 +1513,7 @@ void SdrTextObj::SetVerticalWriting(bool bVertical) svl::Items<SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT, // Expanded item ranges to also support hor and ver adjust. SDRATTR_TEXT_VERTADJUST, SDRATTR_TEXT_VERTADJUST, - SDRATTR_TEXT_AUTOGROWWIDTH, SDRATTR_TEXT_HORZADJUST>{}); + SDRATTR_TEXT_AUTOGROWWIDTH, SDRATTR_TEXT_HORZADJUST>); aNewSet.Put(rSet); aNewSet.Put(makeSdrTextAutoGrowWidthItem(bAutoGrowHeight)); diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index 13c4440c0d77..4426c0587218 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -95,7 +95,7 @@ bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) // at SetParaAttribs(), all attributes contained in the parent become // attributed hard to the paragraph. const SfxItemSet& rSet = GetObjectItemSet(); - SfxItemSet aFilteredSet(*rSet.GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>{}); + SfxItemSet aFilteredSet(*rSet.GetPool(), svl::Items<EE_ITEMS_START, EE_ITEMS_END>); aFilteredSet.Put(rSet); rOutl.SetParaAttribs(0, aFilteredSet); } diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index dde75e15c28e..0e723da67e40 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1162,7 +1162,7 @@ SdrPageProperties::SdrPageProperties(SdrPage& rSdrPage) mpStyleSheet(nullptr), maProperties( mpSdrPage->getSdrModelFromSdrPage().GetItemPool(), - svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}) + svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>) { if(!rSdrPage.IsMasterPage()) { diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index adb68732d0cb..9605a4dfeb42 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -111,11 +111,11 @@ ImpSdrPdfImport::ImpSdrPdfImport(SdrModel& rModel, SdrLayerID nLay, const tools: mpVD->SetFillColor(); maOldLineColor.SetRed(mpVD->GetLineColor().GetRed() + 1); mpLineAttr = std::make_unique<SfxItemSet>(rModel.GetItemPool(), - svl::Items<XATTR_LINE_FIRST, XATTR_LINE_LAST>{}); + svl::Items<XATTR_LINE_FIRST, XATTR_LINE_LAST>); mpFillAttr = std::make_unique<SfxItemSet>(rModel.GetItemPool(), - svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); mpTextAttr = std::make_unique<SfxItemSet>(rModel.GetItemPool(), - svl::Items<EE_ITEMS_START, EE_ITEMS_END>{}); + svl::Items<EE_ITEMS_START, EE_ITEMS_END>); checkClip(); // Load the buffer using pdfium. @@ -831,7 +831,7 @@ void ImpSdrPdfImport::InsertTextObject(const Point& rPos, const Size& rSize, con if (!aFont.IsTransparent()) { - SfxItemSet aAttr(*mpFillAttr->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + SfxItemSet aAttr(*mpFillAttr->GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); aAttr.Put(XFillStyleItem(drawing::FillStyle_SOLID)); aAttr.Put(XFillColorItem(OUString(), aFont.GetFillColor())); pText->SetMergedItemSet(aAttr); diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 87bf71c431cd..ed16ada82763 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -190,7 +190,7 @@ namespace sdr::properties SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST, // range from SdrTextObj - EE_ITEMS_START, EE_ITEMS_END>{}); + EE_ITEMS_START, EE_ITEMS_END>); } const svx::ITextProvider& CellProperties::getTextProvider() const @@ -361,7 +361,7 @@ namespace sdr::properties // prepare ItemSet to set exchanged width and height items SfxItemSet aNewSet(*rSet.GetPool(), - svl::Items<SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT>{}); + svl::Items<SDRATTR_TEXT_AUTOGROWHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT>); aNewSet.Put(rSet); aNewSet.Put(makeSdrTextAutoGrowWidthItem(bAutoGrowHeight)); diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index ee56034aa58c..f460a8a10f59 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -139,7 +139,7 @@ SfxItemSet TableProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool) SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST, // range from SdrTextObj - EE_ITEMS_START, EE_ITEMS_END>{}); + EE_ITEMS_START, EE_ITEMS_END>); } namespace { diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 54464406febe..83561dcc9550 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -2749,7 +2749,7 @@ void SvxTableController::SetAttrToSelectedShape(const SfxItemSet& rAttr) return; // Filter out non-shadow items from rAttr. - SfxItemSet aSet(*rAttr.GetPool(), svl::Items<SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST>{}); + SfxItemSet aSet(*rAttr.GetPool(), svl::Items<SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST>); aSet.Put(rAttr); // Set shadow items on the marked shape. diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 7d68069e8507..7a2efef8af57 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -501,7 +501,7 @@ VclPtr<InterimItemWindow> SvxGrafModeToolBoxControl::CreateItemWindow( vcl::Wind void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) { SfxItemPool& rPool = rView.GetModel()->GetItemPool(); - SfxItemSet aSet( rPool, svl::Items<SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST>{} ); + SfxItemSet aSet( rPool, svl::Items<SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST> ); OUString aUndoStr; const bool bUndo = rView.IsUndoEnabled(); @@ -618,7 +618,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) if( ( pObj->GetGraphicType() != GraphicType::NONE ) && ( pObj->GetGraphicType() != GraphicType::Default ) ) { - SfxItemSet aGrfAttr( rPool, svl::Items<SDRATTR_GRAFCROP, SDRATTR_GRAFCROP>{} ); + SfxItemSet aGrfAttr( rPool, svl::Items<SDRATTR_GRAFCROP, SDRATTR_GRAFCROP> ); const MapUnit eOldMetric = rPool.GetMetric( 0 ); const MapMode aMap100( MapUnit::Map100thMM ); const MapMode aMapTwip( MapUnit::MapTwip ); @@ -632,7 +632,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) SDRATTR_GRAFCROP, SDRATTR_GRAFCROP, SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, SID_ATTR_GRAF_CROP, SID_ATTR_GRAF_FRMSIZE, - SID_ATTR_GRAF_GRAPHIC, SID_ATTR_GRAF_GRAPHIC>{}); + SID_ATTR_GRAF_GRAPHIC, SID_ATTR_GRAF_GRAPHIC>); aCropDlgAttr.Put( SvxBrushItem( pObj->GetGraphic(), GPOS_MM, SID_ATTR_GRAF_GRAPHIC ) ); aCropDlgAttr.Put( SvxSizeItem( SID_ATTR_PAGE_SIZE, diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index bca16038a99d..0fdf63b49f77 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -155,7 +155,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getSupportedServiceNames( void SvxUnoMarkerTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement ) { maItemSetVector.push_back( - std::make_unique<SfxItemSet>( *mpModelPool, svl::Items<XATTR_LINESTART, XATTR_LINEEND>{} )); + std::make_unique<SfxItemSet>( *mpModelPool, svl::Items<XATTR_LINESTART, XATTR_LINEEND> )); auto pInSet = maItemSetVector.back().get(); XLineEndItem aEndMarker(XATTR_LINEEND); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index ad3aefa4d88c..2a84ba1082c7 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -631,7 +631,7 @@ void SvxShape::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet) DBG_TESTSOLARMUTEX(); if(HasSdrObject() && rPropSet.AreThereOwnUsrAnys()) { - SfxItemSet aSet( GetSdrObject()->getSdrModelFromSdrObject().GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END>{}); + SfxItemSet aSet( GetSdrObject()->getSdrModelFromSdrObject().GetItemPool(), svl::Items<SDRATTR_START, SDRATTR_END>); Reference< beans::XPropertySet > xShape( static_cast<OWeakObject*>(this), UNO_QUERY ); SvxItemPropertySet_ObtainSettingsFromPropertySet(rPropSet, aSet, xShape, &mpPropSet->getPropertyMap() ); diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index ea32ddea2cb4..3057a8406038 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -3005,7 +3005,7 @@ XLineAttrSetItem::XLineAttrSetItem( SfxItemSet&& pItemSet ) : XLineAttrSetItem::XLineAttrSetItem( SfxItemPool* pItemPool ) : SfxSetItem( XATTRSET_LINE, - SfxItemSet( *pItemPool, svl::Items<XATTR_LINE_FIRST, XATTR_LINE_LAST>{})) + SfxItemSet( *pItemPool, svl::Items<XATTR_LINE_FIRST, XATTR_LINE_LAST>)) { } @@ -3033,7 +3033,7 @@ XFillAttrSetItem::XFillAttrSetItem( SfxItemSet&& pItemSet ) : XFillAttrSetItem::XFillAttrSetItem( SfxItemPool* pItemPool ) : SfxSetItem( XATTRSET_FILL, - SfxItemSet( *pItemPool, svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{})) + SfxItemSet( *pItemPool, svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>)) { } diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index 928098ceca68..594573a879ac 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -142,10 +142,10 @@ XOutdevItemPool::XOutdevItemPool(SfxItemPool* _pMaster) // create SetItems rPoolDefaults[XATTRSET_LINE - XATTR_START] = new XLineAttrSetItem( SfxItemSet( - *_pMaster, svl::Items<XATTR_LINE_FIRST, XATTR_LINE_LAST>{})); + *_pMaster, svl::Items<XATTR_LINE_FIRST, XATTR_LINE_LAST>)); rPoolDefaults[XATTRSET_FILL - XATTR_START] = new XFillAttrSetItem( SfxItemSet( - *_pMaster, svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{})); + *_pMaster, svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>)); // create ItemInfos for(sal_uInt16 i(GetFirstWhich()); i <= GetLastWhich(); i++) diff --git a/sw/qa/core/doc/doc.cxx b/sw/qa/core/doc/doc.cxx index faf6b822e7c1..7cf0be3c0bb3 100644 --- a/sw/qa/core/doc/doc.cxx +++ b/sw/qa/core/doc/doc.cxx @@ -103,8 +103,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreDocTest, testLocaleIndependentTemplate) SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "locale-independent-template.odt"); SwDocShell* pDocShell = pDoc->GetDocShell(); SwWrtShell* pWrtShell = pDocShell->GetWrtShell(); - SfxItemSet aSet(pWrtShell->GetAttrPool(), - svl::Items<RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE>{}); + SfxItemSet aSet(pWrtShell->GetAttrPool(), svl::Items<RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE>); pWrtShell->GetCurAttr(aSet); const SvxLanguageItem* pItem = aSet.GetItem(RES_CHRATR_LANGUAGE); CPPUNIT_ASSERT(pItem); diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index 4f9ffdb98c40..f676f96c7bde 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -986,7 +986,7 @@ void SwDocTest::testGraphicAnchorDeletion() aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), RTL_CONSTASCII_LENGTH("graphic anchor>>")); //Insert a graphic at X of >>X<< in paragraph 2 - SfxItemSet aFlySet(m_pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{}); + SfxItemSet aFlySet(m_pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>); SwFormatAnchor aAnchor(RndStdIds::FLY_AS_CHAR); aAnchor.SetAnchor(aPaM.GetPoint()); aFlySet.Put(aAnchor); diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 4940a37e41c4..8dd576987d9a 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -226,7 +226,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInBody) pWrtShell->SplitNode(false); pWrtShell->Insert("baz"); SfxItemSet flySet(pDoc->GetAttrPool(), - svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{}); + svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>); SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR); pWrtShell->StartOfSection(false); pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, /*bBasicCall=*/false); @@ -557,7 +557,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInHeader) pWrtShell->SplitNode(false); pWrtShell->Insert("baz"); SfxItemSet flySet(pDoc->GetAttrPool(), - svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{}); + svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>); SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR); pWrtShell->StartOfSection(false); pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, /*bBasicCall=*/false); @@ -910,7 +910,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInFootnote) CPPUNIT_ASSERT(pWrtShell->IsCursorInFootnote()); SfxItemSet flySet(pDoc->GetAttrPool(), - svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{}); + svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>); SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000); flySet.Put(size); // set a size, else we get 1 char per line... SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR); @@ -1436,7 +1436,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInFlys) pWrtShell->SplitNode(false); pWrtShell->Insert("baz"); SfxItemSet flySet(pDoc->GetAttrPool(), - svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{}); + svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>); SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000); flySet.Put(size); // set a size, else we get 1 char per line... pWrtShell->StartOfSection(false); @@ -1900,7 +1900,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysAtFlys) pWrtShell->SplitNode(false); pWrtShell->Insert("baz"); SfxItemSet flySet(pDoc->GetAttrPool(), - svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{}); + svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>); SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000); flySet.Put(size); // set a size, else we get 1 char per line... pWrtShell->StartOfSection(false); @@ -3232,7 +3232,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124770) // Set font to italic 20pt Liberation Serif. SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); SfxItemSet aTextSet(pWrtShell->GetView().GetPool(), - svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>{}); + svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>); SvxFontItem aFont(RES_CHRATR_FONT); aFont.SetFamilyName("Liberation Serif"); aTextSet.Put(aFont); diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 54f4ecc7b9a9..91f6689f1d73 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -1527,7 +1527,7 @@ void SwTiledRenderingTest::testTrackChangesCallback() CPPUNIT_ASSERT_EQUAL(-1, m_nTrackedChangeIndex); pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, /*bBasicCall=*/false); - SfxItemSet aSet(pWrtShell->GetDoc()->GetAttrPool(), svl::Items<FN_REDLINE_ACCEPT_DIRECT, FN_REDLINE_ACCEPT_DIRECT>{}); + SfxItemSet aSet(pWrtShell->GetDoc()->GetAttrPool(), svl::Items<FN_REDLINE_ACCEPT_DIRECT, FN_REDLINE_ACCEPT_DIRECT>); SfxVoidItem aItem(FN_REDLINE_ACCEPT_DIRECT); aSet.Put(aItem); pWrtShell->GetView().GetState(aSet); @@ -1863,8 +1863,8 @@ namespace { void checkUndoRepairStates(SwXTextDocument* pXTextDocument, SwView* pView1, SwView* pView2) { - SfxItemSet aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>{}); - SfxItemSet aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>{}); + SfxItemSet aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>); + SfxItemSet aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>); // first view, undo enabled pView1->GetState(aItemSet1); CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aItemSet1.GetItemState(SID_UNDO)); @@ -1895,8 +1895,8 @@ void SwTiledRenderingTest::testDisableUndoRepair() int nView2 = SfxLokHelper::getView(); { - SfxItemSet aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>{}); - SfxItemSet aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>{}); + SfxItemSet aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>); + SfxItemSet aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>); pView1->GetState(aItemSet1); CPPUNIT_ASSERT_EQUAL(SfxItemState::DISABLED, aItemSet1.GetItemState(SID_UNDO)); pView2->GetState(aItemSet2); @@ -1916,8 +1916,8 @@ void SwTiledRenderingTest::testDisableUndoRepair() pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'u', 0); Scheduler::ProcessEventsToIdle(); { - SfxItemSet aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>{}); - SfxItemSet aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>{}); + SfxItemSet aItemSet1(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>); + SfxItemSet aItemSet2(pXTextDocument->GetDocShell()->GetDoc()->GetAttrPool(), svl::Items<SID_UNDO, SID_UNDO>); // second view, undo enabled pView2->GetState(aItemSet2); CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, aItemSet2.GetItemState(SID_UNDO)); @@ -2628,7 +2628,7 @@ void SwTiledRenderingTest::testAnchorTypes() SwDoc* pDoc = pXTextDocument->GetDocShell()->GetDoc(); SwView* pView = pXTextDocument->GetDocShell()->GetView(); pView->GetViewFrame()->GetDispatcher()->Execute(FN_CNTNT_TO_NEXT_FRAME, SfxCallMode::SYNCHRON); - SfxItemSet aSet(pDoc->GetAttrPool(), svl::Items<FN_TOOL_ANCHOR_PAGE, FN_TOOL_ANCHOR_PAGE>{}); + SfxItemSet aSet(pDoc->GetAttrPool(), svl::Items<FN_TOOL_ANCHOR_PAGE, FN_TOOL_ANCHOR_PAGE>); SfxBoolItem aItem(FN_TOOL_ANCHOR_PAGE); aSet.Put(aItem); auto pShell = dynamic_cast<SwBaseShell*>(pView->GetCurShell()); diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index ea8e797b5737..f857b3f8da01 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -1162,7 +1162,7 @@ void SwUiWriterTest::testCp1000071() // Change the document layout to be 2 columns, and then undo. pWrtShell->SelAll(); SwSectionData section(SectionType::Content, pWrtShell->GetUniqueSectionName()); - SfxItemSet set( pDoc->GetDocShell()->GetPool(), svl::Items<RES_COL, RES_COL>{} ); + SfxItemSet set( pDoc->GetDocShell()->GetPool(), svl::Items<RES_COL, RES_COL> ); SwFormatCol col; col.Init( 2, 0, 10000 ); set.Put( col ); @@ -2562,7 +2562,7 @@ void SwUiWriterTest::testTdf72788() //Apply a *Bold* attribute to selection SvxWeightItem aWeightItem(WEIGHT_BOLD, RES_CHRATR_WEIGHT); rIDCO.InsertPoolItem(*pCursor, aWeightItem); - SfxItemSet aSet( pDoc->GetAttrPool(), svl::Items<RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT>{}); + SfxItemSet aSet( pDoc->GetAttrPool(), svl::Items<RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT>); //Add selected text's attributes to aSet pCursor->GetNode().GetTextNode()->GetParaAttr(aSet, 5, 12); SfxPoolItem const * pPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT); @@ -3737,8 +3737,8 @@ void SwUiWriterTest::testUndoDelAsCharTdf107512() sw::UndoManager & rUndoManager(pDoc->GetUndoManager()); IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations()); SwCursorShell * pShell(pDoc->GetEditShell()); - SfxItemSet frameSet(pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{}); - SfxItemSet grfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END-1>{}); + SfxItemSet frameSet(pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>); + SfxItemSet grfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END-1>); rIDCO.InsertString(*pShell->GetCursor(), "foo"); pShell->ClearMark(); SwFormatAnchor anchor(RndStdIds::FLY_AS_CHAR); @@ -3757,7 +3757,7 @@ void SwUiWriterTest::testUndoDelAsCharTdf107512() CPPUNIT_ASSERT(pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(4, RES_TXTATR_FLYCNT)); CPPUNIT_ASSERT_EQUAL(OUString(OUStringChar(CH_TXTATR_BREAKWORD) + u"foo" + OUStringChar(CH_TXTATR_BREAKWORD)), pShell->GetCursor()->GetNode().GetTextNode()->GetText()); SfxPoolItem const* pItem; - SfxItemSet query(pDoc->GetAttrPool(), svl::Items<RES_CHRATR_HIDDEN, RES_CHRATR_HIDDEN>{}); + SfxItemSet query(pDoc->GetAttrPool(), svl::Items<RES_CHRATR_HIDDEN, RES_CHRATR_HIDDEN>); pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 1, 4); CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem)); CPPUNIT_ASSERT(static_cast<SvxCharHiddenItem const*>(pItem)->GetValue()); @@ -3870,7 +3870,7 @@ void SwUiWriterTest::testUndoCharAttribute() // Apply a "Bold" attribute to selection SvxWeightItem aWeightItem(WEIGHT_BOLD, RES_CHRATR_WEIGHT); rIDCO.InsertPoolItem(*pCursor, aWeightItem); - SfxItemSet aSet( pDoc->GetAttrPool(), svl::Items<RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT>{}); + SfxItemSet aSet( pDoc->GetAttrPool(), svl::Items<RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT>); // Adds selected text's attributes to aSet pCursor->GetNode().GetTextNode()->GetParaAttr(aSet, 10, 19); SfxPoolItem const * pPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT); @@ -3891,8 +3891,8 @@ void SwUiWriterTest::testUndoDelAsChar() sw::UndoManager & rUndoManager(pDoc->GetUndoManager()); IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations()); SwCursorShell * pShell(pDoc->GetEditShell()); - SfxItemSet frameSet(pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{}); - SfxItemSet grfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END-1>{}); + SfxItemSet frameSet(pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>); + SfxItemSet grfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END-1>); SwFormatAnchor anchor(RndStdIds::FLY_AS_CHAR); frameSet.Put(anchor); GraphicObject grf; diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx index 50af673c5d0e..7dfb8d634255 100644 --- a/sw/qa/extras/uiwriter/uiwriter2.cxx +++ b/sw/qa/extras/uiwriter/uiwriter2.cxx @@ -185,7 +185,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf101534) // Go to the second paragraph, assert that we have margins as direct // formatting. pWrtShell->Down(/*bSelect=*/false); - SfxItemSet aSet(pWrtShell->GetAttrPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE>{}); + SfxItemSet aSet(pWrtShell->GetAttrPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE>); pWrtShell->GetCurAttr(aSet); CPPUNIT_ASSERT(aSet.HasItem(RES_LR_SPACE)); @@ -632,7 +632,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137245) SwFormatAnchor anchor(RndStdIds::FLY_AT_PARA); anchor.SetAnchor(pWrtShell->GetCursor()->GetPoint()); SfxItemSet flySet(pDoc->GetAttrPool(), - svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{}); + svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>); flySet.Put(anchor); SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000); flySet.Put(size); // set a size, else we get 1 char per line... @@ -643,7 +643,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137245) SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR); anchor.SetAnchor(pWrtShell->GetCursor()->GetPoint()); SfxItemSet flySet(pDoc->GetAttrPool(), - svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{}); + svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>); flySet.Put(anchor); SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000); flySet.Put(size); // set a size, else we get 1 char per line... @@ -660,7 +660,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137245) SwFormatAnchor anchor(RndStdIds::FLY_AT_PARA); anchor.SetAnchor(pWrtShell->GetCursor()->GetPoint()); SfxItemSet flySet(pDoc->GetAttrPool(), - svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{}); + svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>); flySet.Put(anchor); SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000); flySet.Put(size); // set a size, else we get 1 char per line... @@ -671,7 +671,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137245) SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR); anchor.SetAnchor(pWrtShell->GetCursor()->GetPoint()); SfxItemSet flySet(pDoc->GetAttrPool(), - svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{}); + svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>); flySet.Put(anchor); SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000); flySet.Put(size); // set a size, else we get 1 char per line... @@ -691,7 +691,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137245) // check that the AutoFormat did something pWrtShell->SttEndDoc(true); - SfxItemSet set{ pDoc->GetAttrPool(), svl::Items<RES_BOX, RES_BOX>{} }; + SfxItemSet set{ pDoc->GetAttrPool(), svl::Items<RES_BOX, RES_BOX> }; pWrtShell->GetCurParAttr(set); CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, set.GetItemState(RES_BOX, false)); } @@ -730,7 +730,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf131912) { SfxItemSet flySet(pDoc->GetAttrPool(), - svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{}); + svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>); SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR); pWrtShell->StartOfSection(false); pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 2, /*bBasicCall=*/false); @@ -1235,7 +1235,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf109376_redline) SwFormatAnchor anchor(RndStdIds::FLY_AT_PARA); anchor.SetAnchor(pWrtShell->GetCursor()->GetPoint()); SfxItemSet flySet(pDoc->GetAttrPool(), - svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{}); + svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>); flySet.Put(anchor); SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000); flySet.Put(size); // set a size, else we get 1 char per line... @@ -1286,7 +1286,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf109376) SwFormatAnchor anchor(RndStdIds::FLY_AT_PARA); anchor.SetAnchor(pWrtShell->GetCursor()->GetPoint()); SfxItemSet flySet(pDoc->GetAttrPool(), - svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>{}); + svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_ANCHOR, RES_ANCHOR>); flySet.Put(anchor); SwFormatFrameSize size(SwFrameSize::Minimum, 1000, 1000); flySet.Put(size); // set a size, else we get 1 char per line... diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx b/sw/qa/extras/uiwriter/uiwriter3.cxx index 62325b1c9c49..e835acf648cf 100644 --- a/sw/qa/extras/uiwriter/uiwriter3.cxx +++ b/sw/qa/extras/uiwriter/uiwriter3.cxx @@ -661,7 +661,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks) { // ToC toxmark pWrtShell->Down(false); SfxItemSet aSet(pWrtShell->GetAttrPool(), - svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{}); + svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>); pWrtShell->GetCurAttr(aSet); CPPUNIT_ASSERT(aSet.HasItem(RES_TXTATR_INETFMT)); pWrtShell->Push(); @@ -676,7 +676,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks) { // ToC heading pWrtShell->Down(false); SfxItemSet aSet(pWrtShell->GetAttrPool(), - svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{}); + svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>); pWrtShell->GetCurAttr(aSet); CPPUNIT_ASSERT(aSet.HasItem(RES_TXTATR_INETFMT)); pWrtShell->Push(); @@ -696,7 +696,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks) { // UD1 toxmark 1 pWrtShell->Down(false); SfxItemSet aSet(pWrtShell->GetAttrPool(), - svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{}); + svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>); pWrtShell->GetCurAttr(aSet); CPPUNIT_ASSERT(aSet.HasItem(RES_TXTATR_INETFMT)); pWrtShell->Push(); @@ -711,7 +711,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks) { // UD1 toxmark 2 (with same text) pWrtShell->Down(false); SfxItemSet aSet(pWrtShell->GetAttrPool(), - svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{}); + svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>); pWrtShell->GetCurAttr(aSet); CPPUNIT_ASSERT(aSet.HasItem(RES_TXTATR_INETFMT)); pWrtShell->Push(); @@ -726,7 +726,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks) { // UD heading pWrtShell->Down(false); SfxItemSet aSet(pWrtShell->GetAttrPool(), - svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{}); + svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>); pWrtShell->GetCurAttr(aSet); CPPUNIT_ASSERT(aSet.HasItem(RES_TXTATR_INETFMT)); pWrtShell->Push(); @@ -746,7 +746,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testToxmarkLinks) { // UD2 toxmark, with same text as those in other UD pWrtShell->Down(false); SfxItemSet aSet(pWrtShell->GetAttrPool(), - svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{}); + svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>); pWrtShell->GetCurAttr(aSet); CPPUNIT_ASSERT(aSet.HasItem(RES_TXTATR_INETFMT)); pWrtShell->Push(); diff --git a/sw/qa/extras/unowriter/unowriter.cxx b/sw/qa/extras/unowriter/unowriter.cxx index e22f71c27ada..a602259c30c2 100644 --- a/sw/qa/extras/unowriter/unowriter.cxx +++ b/sw/qa/extras/unowriter/unowriter.cxx @@ -696,8 +696,8 @@ CPPUNIT_TEST_FIXTURE(SwUnoWriter, testDeleteFlyAtCharAtStart) // insert fly anchored at start of body text pWrtShell->ClearMark(); pWrtShell->SttEndDoc(true); - SfxItemSet frameSet(pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1>{}); - SfxItemSet grfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END - 1>{}); + SfxItemSet frameSet(pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1>); + SfxItemSet grfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END - 1>); SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR); frameSet.Put(anchor); GraphicObject grf; diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index 2d17a7ff88fb..94f2c1753793 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -115,7 +115,7 @@ protected: // emulate the behavior from tdf#94386 - insert an envelope to the // document - SfxItemSet aSet(pWrtShell->GetView().GetCurShell()->GetPool(), svl::Items<FN_ENVELOP, FN_ENVELOP>{}); + SfxItemSet aSet(pWrtShell->GetView().GetCurShell()->GetPool(), svl::Items<FN_ENVELOP, FN_ENVELOP>); aSet.Put(SwEnvItem()); SfxRequest aRequest(FN_ENVELOP, SfxCallMode::SYNCHRON, aSet); SW_MOD()->ExecOther(aRequest); diff --git a/sw/qa/uibase/dochdl/dochdl.cxx b/sw/qa/uibase/dochdl/dochdl.cxx index 2006022fc587..c882eab89ea9 100644 --- a/sw/qa/uibase/dochdl/dochdl.cxx +++ b/sw/qa/uibase/dochdl/dochdl.cxx @@ -60,7 +60,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseDochdlTest, testComplexSelection) pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, /*bBasicCall=*/false); pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 1, /*bBasicCall=*/false); SfxItemSet aSet(pWrtShell->GetView().GetPool(), - svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>{}); + svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>); // Bold, italic, underline. aSet.Put(SvxWeightItem(WEIGHT_BOLD, RES_CHRATR_WEIGHT)); aSet.Put(SvxPostureItem(ITALIC_NORMAL, RES_CHRATR_POSTURE)); diff --git a/sw/qa/uibase/shells/shells.cxx b/sw/qa/uibase/shells/shells.cxx index 6334be3a553b..badc17d1f4ce 100644 --- a/sw/qa/uibase/shells/shells.cxx +++ b/sw/qa/uibase/shells/shells.cxx @@ -46,8 +46,8 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testTdf130179) SwDoc* pDoc = createSwDoc(); IDocumentContentOperations& rIDCO = pDoc->getIDocumentContentOperations(); SwCursorShell* pShell(pDoc->GetEditShell()); - SfxItemSet aFrameSet(pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1>{}); - SfxItemSet aGrfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END - 1>{}); + SfxItemSet aFrameSet(pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1>); + SfxItemSet aGrfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END - 1>); SwFormatAnchor aAnchor(RndStdIds::FLY_AT_PARA); aFrameSet.Put(aAnchor); GraphicObject aGrf; diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 8ae0e98f6bf8..d079c994dd5e 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1451,12 +1451,12 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( pSet.emplace( const_cast<SwAttrPool&>(pTextNode->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> ); } else { pSet.emplace( const_cast<SwAttrPool&>(pTextNode->GetDoc().GetAttrPool()), - svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>{} ); + svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1> ); } // #i82637# - From the perspective of the a11y API the default character // attributes are the character attributes, which are set at the paragraph style @@ -1468,7 +1468,7 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( { SfxItemSet aParaSet( const_cast<SwAttrPool&>(pTextNode->GetDoc().GetAttrPool()), svl::Items<RES_PARATR_BEGIN, RES_PARATR_END - 1, - RES_FRMATR_BEGIN, RES_FRMATR_END - 1>{} ); + RES_FRMATR_BEGIN, RES_FRMATR_END - 1> ); pTextNode->SwContentNode::GetAttr( aParaSet ); pSet->Put( aParaSet ); } @@ -1478,7 +1478,7 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( if ( pTextNode->GetTextColl() ) { SfxItemSet aCharSet( const_cast<SwAttrPool&>(pTextNode->GetDoc().GetAttrPool()), - svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>{} ); + svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1> ); SetPutRecursive( aCharSet, pTextNode->GetTextColl()->GetAttrSet() ); pSet->Put( aCharSet ); } @@ -1646,7 +1646,7 @@ void SwAccessibleParagraph::_getRunAttributesImpl( // retrieve character attributes for the created PaM <pPaM> SfxItemSet aSet( pPaM->GetDoc().GetAttrPool(), - svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END -1>{} ); + svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END -1> ); // #i82637# // From the perspective of the a11y API the character attributes, which // are set at the automatic paragraph style of the paragraph, are treated @@ -1657,7 +1657,7 @@ void SwAccessibleParagraph::_getRunAttributesImpl( if ( pTextNode->HasSwAttrSet() ) { SfxItemSet aAutomaticParaStyleCharAttrs( pPaM->GetDoc().GetAttrPool(), - svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END -1>{} ); + svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END -1> ); aAutomaticParaStyleCharAttrs.Put( *(pTextNode->GetpSwAttrSet()), false ); aSet.Put( aAutomaticParaStyleCharAttrs ); } @@ -1665,7 +1665,7 @@ void SwAccessibleParagraph::_getRunAttributesImpl( // get character attributes at <pPaM> and merge these into <aSet> { SfxItemSet aCharAttrsAtPaM( pPaM->GetDoc().GetAttrPool(), - svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END -1>{} ); + svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END -1> ); SwUnoCursorHelper::GetCursorAttr(*pPaM, aCharAttrsAtPaM, true); aSet.Put( aCharAttrsAtPaM ); } @@ -1760,7 +1760,7 @@ void SwAccessibleParagraph::_getSupplementalAttributesImpl( RES_PARATR_TABSTOP, RES_PARATR_TABSTOP, RES_PARATR_NUMRULE, RES_PARATR_NUMRULE, RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END - 1, - RES_LR_SPACE, RES_UL_SPACE>{}); + RES_LR_SPACE, RES_UL_SPACE>); if ( pTextNode->HasBullet() || pTextNode->HasNumber() ) { diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index aa2675fc919f..960f3072bf80 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -459,7 +459,7 @@ bool SwFormat::SetFormatAttr( const SfxPoolItem& rAttr ) { // FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes (simple fallback is in place and used)"); - SfxItemSet aTempSet(*m_aSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + SfxItemSet aTempSet(*m_aSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); const SvxBrushItem& rSource = rAttr.StaticWhichCast(RES_BACKGROUND); // fill a local ItemSet with the attributes corresponding as good as possible diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index f0a05c70e8c6..90a883229f4b 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -140,7 +140,7 @@ using namespace ::com::sun::star; // AttrSet range for the 2 break attributes WhichRangesContainer const aBreakSetRange(svl::Items< RES_PAGEDESC, RES_BREAK ->::value); +>); // AttrSet range for TextFormatColl // list attributes ( RES_PARATR_LIST_BEGIN - RES_PARATR_LIST_END ) are not @@ -154,14 +154,14 @@ WhichRangesContainer const aTextFormatCollSetRange(svl::Items< // FillAttribute support XATTR_FILL_FIRST, XATTR_FILL_LAST ->::value); +>); // AttrSet range for GrfFormatColl WhichRangesContainer const aGrfFormatCollSetRange(svl::Items< RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_GRFATR_BEGIN, RES_GRFATR_END-1, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1 ->::value); +>); // AttrSet range for TextNode WhichRangesContainer const aTextNodeSetRange(svl::Items< @@ -174,14 +174,14 @@ WhichRangesContainer const aTextNodeSetRange(svl::Items< // FillAttribute support (paragraph FillStyle) XATTR_FILL_FIRST, XATTR_FILL_LAST ->::value); +>); // AttrSet range for NoTextNode WhichRangesContainer const aNoTextNodeSetRange(svl::Items< RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_GRFATR_BEGIN, RES_GRFATR_END-1, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1 ->::value); +>); WhichRangesContainer const aTableSetRange(svl::Items< RES_FILL_ORDER, RES_FRM_SIZE, @@ -196,7 +196,7 @@ WhichRangesContainer const aTableSetRange(svl::Items< // <-- collapsing RES_FRMATR_GRABBAG, RES_FRMATR_GRABBAG, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1 ->::value); +>); WhichRangesContainer const aTableLineSetRange(svl::Items< RES_FILL_ORDER, RES_FRM_SIZE, @@ -209,7 +209,7 @@ WhichRangesContainer const aTableLineSetRange(svl::Items< RES_ROW_SPLIT, RES_ROW_SPLIT, RES_FRMATR_GRABBAG, RES_FRMATR_GRABBAG, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1 ->::value); +>); WhichRangesContainer const aTableBoxSetRange(svl::Items< RES_FILL_ORDER, RES_FRM_SIZE, @@ -221,7 +221,7 @@ WhichRangesContainer const aTableBoxSetRange(svl::Items< RES_FRMATR_GRABBAG, RES_FRMATR_GRABBAG, RES_BOXATR_BEGIN, RES_BOXATR_END-1, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1 ->::value); +>); // AttrSet range for SwFrameFormat WhichRangesContainer const aFrameFormatSetRange(svl::Items< @@ -231,26 +231,26 @@ WhichRangesContainer const aFrameFormatSetRange(svl::Items< // FillAttribute support (TextFrame, OLE, Writer GraphicObject) XATTR_FILL_FIRST, XATTR_FILL_LAST ->::value); +>); // AttrSet range for SwCharFormat WhichRangesContainer const aCharFormatSetRange(svl::Items< RES_CHRATR_BEGIN, RES_CHRATR_END-1, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1 ->::value); +>); // AttrSet range for character autostyles WhichRangesContainer const aCharAutoFormatSetRange(svl::Items< RES_CHRATR_BEGIN, RES_CHRATR_END-1, RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1 ->::value); +>); // AttrSet range for SwPageDescFormat WhichRangesContainer const aPgFrameFormatSetRange(svl::Items< RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1 ->::value); +>); // create table for accessing default format attributes SwDfltAttrTab aAttrTab( POOLATTR_END - POOLATTR_BEGIN, nullptr ); diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 3e8056fe8daf..4ba5d741a68a 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1771,7 +1771,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt, { const sal_Int32 n = aPos.nContent.GetIndex(); SfxItemSet aSet( GetDoc()->GetAttrPool(), svl::Items<POOLATTR_BEGIN, - POOLATTR_END - 1>{} ); + POOLATTR_END - 1> ); if( pTextNd->GetpSwpHints() ) { for( size_t i = 0; i < pTextNd->GetSwpHints().Count(); ++i ) @@ -2133,7 +2133,7 @@ bool SwCursorShell::SetShadowCursorPos( const Point& rPt, SwFillMode eFillMode ) GetDoc()->GetAttrPool(), svl::Items< RES_PARATR_ADJUST, RES_PARATR_ADJUST, - RES_LR_SPACE, RES_LR_SPACE>{}); + RES_LR_SPACE, RES_LR_SPACE>); SvxLRSpaceItem aLR(pCNd->GetAttr(RES_LR_SPACE).StaticWhichCast(RES_LR_SPACE)); aLR.SetTextLeft( aFPos.nTabCnt ); aLR.SetTextFirstLineOffset( 0 ); diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index 09f78df324e8..a9bb69fe17ed 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -214,7 +214,7 @@ SwAttrCheckArr::SwAttrCheckArr( const SfxItemSet& rSet, bool bFwd, , m_nNodeEnd(0) , m_nFound(0) , m_nStackCount(0) - , m_aComapeSet( *rSet.GetPool(), svl::Items<RES_CHRATR_BEGIN, RES_TXTATR_END-1>{} ) + , m_aComapeSet( *rSet.GetPool(), svl::Items<RES_CHRATR_BEGIN, RES_TXTATR_END-1> ) , m_bNoColls(bNoCollections) , m_bForward(bFwd) { @@ -1055,7 +1055,7 @@ static bool FindAttrsImpl(SwPaM & rSearchPam, // check which text/char attributes are searched SwAttrCheckArr aCmpArr( rSet, bSrchForward, bNoColls ); SfxItemSet aOtherSet( rSearchPam.GetDoc().GetAttrPool(), - svl::Items<RES_PARATR_BEGIN, RES_GRFATR_END-1>{} ); + svl::Items<RES_PARATR_BEGIN, RES_GRFATR_END-1> ); aOtherSet.Put( rSet, false ); // got all invalid items FnSearchAttr fnSearch = bSrchForward diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 4d60a0d6e573..59c1848fc539 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -274,7 +274,7 @@ void SwVisibleCursor::SetPosAndShow(SfxViewShell const * pViewShell) { SfxItemSet aSet(m_pCursorShell->GetSfxViewShell()->GetPool(), svl::Items<RES_TXTATR_INETFMT, - RES_TXTATR_INETFMT>{}); + RES_TXTATR_INETFMT>); pShell->GetCurAttr(aSet); if(SfxItemState::SET <= aSet.GetItemState( RES_TXTATR_INETFMT )) { diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index f7e88c891ee8..29a2ce5d3e48 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -1272,7 +1272,7 @@ namespace //local functions originally from docfmt.cxx RES_CHRATR_BEGIN, RES_CHRATR_END - 1, RES_TXTATR_AUTOFMT, RES_TXTATR_CHARFMT, RES_TXTATR_UNKNOWN_CONTAINER, - RES_TXTATR_UNKNOWN_CONTAINER>{}); + RES_TXTATR_UNKNOWN_CONTAINER>); SfxItemSet* pTmpOtherItemSet = new SfxItemSet( rDoc.GetAttrPool(), @@ -1280,7 +1280,7 @@ namespace //local functions originally from docfmt.cxx RES_PARATR_BEGIN, RES_GRFATR_END - 1, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END - 1, // FillAttribute support: - XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + XATTR_FILL_FIRST, XATTR_FILL_LAST>); pTmpCharItemSet->Put( rChgSet ); pTmpOtherItemSet->Put( rChgSet ); @@ -1370,7 +1370,7 @@ namespace //local functions originally from docfmt.cxx if ( !bCharAttr && !bOtherAttr ) { SfxItemSet aTextSet( rDoc.GetAttrPool(), - svl::Items<RES_TXTATR_NOEND_BEGIN, RES_TXTATR_NOEND_END-1>{} ); + svl::Items<RES_TXTATR_NOEND_BEGIN, RES_TXTATR_NOEND_END-1> ); aTextSet.Put( rChgSet ); if( aTextSet.Count() ) { @@ -1405,7 +1405,7 @@ namespace //local functions originally from docfmt.cxx svl::Items< RES_TXTATR_REFMARK, RES_TXTATR_METAFIELD, RES_TXTATR_CJK_RUBY, RES_TXTATR_CJK_RUBY, - RES_TXTATR_INPUTFIELD, RES_TXTATR_INPUTFIELD>{}); + RES_TXTATR_INPUTFIELD, RES_TXTATR_INPUTFIELD>); aTextSet.Put( rChgSet ); if( aTextSet.Count() ) @@ -1539,7 +1539,7 @@ namespace //local functions originally from docfmt.cxx } SfxItemSet firstSet(rDoc.GetAttrPool(), - svl::Items<RES_PAGEDESC, RES_BREAK>{}); + svl::Items<RES_PAGEDESC, RES_BREAK>); if (pOtherSet && pOtherSet->Count()) { // actually only RES_BREAK is possible here... firstSet.Put(*pOtherSet); @@ -1547,7 +1547,7 @@ namespace //local functions originally from docfmt.cxx SfxItemSet propsSet(rDoc.GetAttrPool(), svl::Items<RES_PARATR_BEGIN, RES_PAGEDESC, RES_BREAK+1, RES_FRMATR_END, - XATTR_FILL_FIRST, XATTR_FILL_LAST+1>{}); + XATTR_FILL_FIRST, XATTR_FILL_LAST+1>); if (pOtherSet && pOtherSet->Count()) { propsSet.Put(*pOtherSet); @@ -4323,7 +4323,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt // Apply the first character's attributes to the ReplaceText SfxItemSet aSet( m_rDoc.GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_TXTATR_WITHEND_END - 1, - RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1>{} ); + RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1> ); pTextNd->GetParaAttr( aSet, nStt+1, nStt+1 ); aSet.ClearItem( RES_TXTATR_REFMARK ); diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx index 5d80bb991b89..5719a26e6076 100644 --- a/sw/source/core/doc/DocumentDeviceManager.cxx +++ b/sw/source/core/doc/DocumentDeviceManager.cxx @@ -211,7 +211,7 @@ void DocumentDeviceManager::setJobsetup(/*[in]*/ const JobSetup &rJobSetup ) 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> p = VclPtr<SfxPrinter>::Create( std::move(pSet), rJobSetup ); if ( bCheckPageDescs ) setPrinter( p, true, true ); @@ -296,7 +296,7 @@ SfxPrinter& DocumentDeviceManager::CreatePrinter_() const 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> pNewPrt = VclPtr<SfxPrinter>::Create( std::move(pSet) ); diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index aa52a22be144..85f4761fb13d 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -854,7 +854,7 @@ void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* pHt ) SwFrameFormat* pFormat = pBox->ClaimFrameFormat(); SfxItemSet aTmp( m_rDoc.GetAttrPool(), - svl::Items<RES_BOXATR_BEGIN,RES_BOXATR_END-1>{} ); + svl::Items<RES_BOXATR_BEGIN,RES_BOXATR_END-1> ); if( pCalc->IsCalcError() ) nValue = DBL_MAX; diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index 1a3e0da61041..7706ccb35cd3 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -408,7 +408,7 @@ namespace svl::Items< RES_PARATR_BEGIN, RES_PARATR_END - 3, // skip RSID and GRABBAG RES_PARATR_LIST_BEGIN, RES_UL_SPACE, // skip PAGEDESC and BREAK - RES_CNTNT, RES_FRMATR_END - 1>{}); + RES_CNTNT, RES_FRMATR_END - 1>); SfxItemSet aTmp2(aTmp); pToNode->GetParaAttr(aTmp, 0, 0); diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx index 5e417afecd38..6ff9bf910240 100644 --- a/sw/source/core/doc/docfly.cxx +++ b/sw/source/core/doc/docfly.cxx @@ -1119,7 +1119,7 @@ SwChainRet SwDoc::Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest ) SetAttr( aChain, rDestFormat ); SfxItemSet aSet( GetAttrPool(), svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, - RES_CHAIN, RES_CHAIN>{} ); + RES_CHAIN, RES_CHAIN> ); // Attach Follow to the Master. aChain.SetPrev( &static_cast<SwFlyFrameFormat&>(rSource) ); diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index d3b742ee9f93..aa9d21c9015c 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -115,13 +115,13 @@ static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs ) svl::Items< RES_PARATR_NUMRULE, RES_PARATR_NUMRULE, RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END - 1, - RES_PAGEDESC, RES_BREAK>{}); + RES_PAGEDESC, RES_BREAK>); const SfxItemSet* pAttrSetOfNode = pNode->GetpSwAttrSet(); std::vector<sal_uInt16> aClearWhichIds; // restoring all paragraph list attributes { - SfxItemSet aListAttrSet( rDoc.GetAttrPool(), svl::Items<RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END - 1>{} ); + SfxItemSet aListAttrSet( rDoc.GetAttrPool(), svl::Items<RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END - 1> ); aListAttrSet.Set(*pAttrSetOfNode); if ( aListAttrSet.Count() ) { @@ -322,7 +322,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg, SfxItemSet aDelSet(GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1, RES_TXTATR_INETFMT, RES_TXTATR_UNKNOWN_CONTAINER, RES_PARATR_BEGIN, RES_FRMATR_END - 1, - RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END - 1>{}); + RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END - 1>); for( auto it = rAttrs.rbegin(); it != rAttrs.rend(); ++it ) { if( POOLATTR_END > *it ) @@ -414,7 +414,7 @@ void SwDoc::UpdateRsid( const SwPaM &rRg, const sal_Int32 nLen ) const sal_Int32 nStart(rRg.GetPoint()->nContent.GetIndex() - nLen); SvxRsidItem aRsid( mnRsid, RES_CHRATR_RSID ); - SfxItemSet aSet(GetAttrPool(), svl::Items<RES_CHRATR_RSID, RES_CHRATR_RSID>{}); + SfxItemSet aSet(GetAttrPool(), svl::Items<RES_CHRATR_RSID, RES_CHRATR_RSID>); aSet.Put(aRsid); bool const bRet(pTextNode->SetAttr(aSet, nStart, rRg.GetPoint()->nContent.GetIndex())); diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 53ccf3c902c1..e4b0a23040c3 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -350,7 +350,7 @@ SwDoc::SwDoc() // pass empty item set containing the paragraph's list attributes // as ignorable items to the stype manager. { - SfxItemSet aIgnorableParagraphItems( GetAttrPool(), svl::Items<RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1>{}); + SfxItemSet aIgnorableParagraphItems( GetAttrPool(), svl::Items<RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1>); mpStyleAccess = createStyleManager( &aIgnorableParagraphItems ); } @@ -851,7 +851,7 @@ void SwDoc::ReplaceDefaults(const SwDoc& rSource) RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1, XATTR_START, XATTR_END-1 - >::value); + >); SfxItemSet aNewDefaults(GetAttrPool(), aRangeOfDefaults); diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index fbed71be7f1e..ffde46e7db9e 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -884,7 +884,7 @@ void FlatFndBox::FillFlat(const FndBox_& rBox, bool bLastBox) m_pDoc->GetAttrPool(), svl::Items< RES_VERT_ORIENT, RES_VERT_ORIENT, - RES_BOXATR_FORMAT, RES_BOXATR_VALUE>{}); + RES_BOXATR_FORMAT, RES_BOXATR_VALUE>); pSet->Put( pFormat->GetAttrSet() ); if( m_ppItemSets.empty() ) { diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx index 337c7bcef619..c305bf91c438 100644 --- a/sw/source/core/doc/tblcpy.cxx +++ b/sw/source/core/doc/tblcpy.cxx @@ -618,7 +618,7 @@ static void lcl_CpyBox( const SwTable& rCpyTable, const SwTableBox* pCpyBox, return; SfxItemSet aBoxAttrSet( pCpyDoc->GetAttrPool(), svl::Items<RES_BOXATR_FORMAT, - RES_BOXATR_VALUE>{} ); + RES_BOXATR_VALUE> ); aBoxAttrSet.Put( pCpyBox->GetFrameFormat()->GetAttrSet() ); if( !aBoxAttrSet.Count() ) return; diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 7b5367255fda..15840f18bcd0 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -1890,7 +1890,7 @@ static void lcl_CopyBoxToDoc(FndBox_ const& rFndBox, CpyPara *const pCpyPara) // We can also copy formulas and values, if we copy the content { SfxItemSet aBoxAttrSet( pCpyPara->rDoc.GetAttrPool(), - svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_VALUE>{} ); + svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_VALUE> ); aBoxAttrSet.Put(rFndBox.GetBox()->GetFrameFormat()->GetAttrSet()); if( aBoxAttrSet.Count() ) { diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 6e44077c5614..d74a2638fde3 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -483,7 +483,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTableOpts, const sal_uInt16 nBoxArrLen = pTAFormat ? 16 : 4; aBoxFormatArr.resize( nBoxArrLen, nullptr ); } - SfxItemSet aCharSet( GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_PARATR_LIST_END-1>{} ); + SfxItemSet aCharSet( GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_PARATR_LIST_END-1> ); SwNodeIndex aNdIdx( *pTableNd, 1 ); // Set to StartNode of first Box SwTableLines& rLines = rNdTable.GetTabLines(); @@ -769,7 +769,7 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTableOpts, aBoxFormatArr2 = std::vector<SwTableBoxFormat*>( nBoxArrLen, nullptr ); } - SfxItemSet aCharSet( GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_PARATR_LIST_END-1>{} ); + SfxItemSet aCharSet( GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_PARATR_LIST_END-1> ); SwHistory* pHistory = pUndo ? &pUndo->GetHistory() : nullptr; @@ -3055,7 +3055,7 @@ void sw_BoxSetSplitBoxFormats( SwTableBox* pBox, SwCollectTableLineBoxes* pSplPa svl::Items<RES_LR_SPACE, RES_UL_SPACE, RES_PROTECT, RES_PROTECT, RES_VERT_ORIENT, RES_VERT_ORIENT, - RES_BACKGROUND, RES_SHADOW>{} ); + RES_BACKGROUND, RES_SHADOW> ); aTmpSet.Put( pFormat->GetAttrSet() ); if( aTmpSet.Count() ) pBox->ClaimFrameFormat()->SetFormatAttr( aTmpSet ); @@ -3672,7 +3672,7 @@ static bool lcl_SetAFormatBox(FndBox_ & rBox, SetAFormatTabPara *pSetPara, bool pSetBox->SetDirectFormatting(false); SwDoc* pDoc = pSetBox->GetFrameFormat()->GetDoc(); - SfxItemSet aCharSet(pDoc->GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_PARATR_LIST_END-1>{}); + SfxItemSet aCharSet(pDoc->GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_PARATR_LIST_END-1>); SfxItemSet aBoxSet(pDoc->GetAttrPool(), aTableBoxSetRange); sal_uInt8 nPos = pSetPara->nAFormatLine * 4 + pSetPara->nAFormatBox; const bool bSingleRowTable = pSetPara->bSingleRowTable; @@ -4060,7 +4060,7 @@ void SwDoc::ChkBoxNumFormat( SwTableBox& rBox, bool bCallUpdate ) } SwTableBoxFormat* pBoxFormat = static_cast<SwTableBoxFormat*>(rBox.GetFrameFormat()); - SfxItemSet aBoxSet( GetAttrPool(), svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_VALUE>{} ); + SfxItemSet aBoxSet( GetAttrPool(), svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_VALUE> ); bool bLockModify = true; bool bSetNumberFormat = IsInsTableFormatNum(); @@ -4214,7 +4214,7 @@ void SwDoc::ClearLineNumAttrs( SwPosition const & rPos ) const SfxPoolItem* pFormatItem = nullptr; SfxItemSet rSet( pTextNode->GetDoc().GetAttrPool(), - svl::Items<RES_PARATR_BEGIN, RES_PARATR_END - 1>{}); + svl::Items<RES_PARATR_BEGIN, RES_PARATR_END - 1>); pTextNode->SwContentNode::GetAttr( rSet ); if ( SfxItemState::SET != rSet.GetItemState( RES_PARATR_NUMRULE , false , &pFormatItem ) ) return; diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 8979184c729d..b5522aad34fc 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -157,7 +157,7 @@ static bool Put( std::shared_ptr<const SfxItemSet>& rpAttrSet, const SwContentNo std::optional<SfxItemSet> pStyleNames; if ( SfxItemState::SET == rSet.GetItemState( RES_FRMATR_STYLE_NAME, false ) ) { - pStyleNames.emplace( *aNewSet.GetPool(), svl::Items<RES_FRMATR_STYLE_NAME, RES_FRMATR_CONDITIONAL_STYLE_NAME>{} ); + pStyleNames.emplace( *aNewSet.GetPool(), svl::Items<RES_FRMATR_STYLE_NAME, RES_FRMATR_CONDITIONAL_STYLE_NAME> ); pStyleNames->Put( aNewSet ); } @@ -204,7 +204,7 @@ static bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet, std::optional<SfxItemSet> pStyleNames; if ( SfxItemState::SET == rSet.GetItemState( RES_FRMATR_STYLE_NAME, false ) ) { - pStyleNames.emplace( *aNewSet.GetPool(), svl::Items<RES_FRMATR_STYLE_NAME, RES_FRMATR_CONDITIONAL_STYLE_NAME>{} ); + pStyleNames.emplace( *aNewSet.GetPool(), svl::Items<RES_FRMATR_STYLE_NAME, RES_FRMATR_CONDITIONAL_STYLE_NAME> ); pStyleNames->Put( aNewSet ); } diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 512ce30da3ff..189430f0363f 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1089,7 +1089,7 @@ static void lcl_textBoxSizeNotify(SwFrameFormat* pFormat) if (SwTextBoxHelper::isTextBox(pFormat, RES_DRAWFRMFMT)) { // Just notify the textbox that the size has changed, the actual object size is not interesting. - SfxItemSet aResizeSet(pFormat->GetDoc()->GetAttrPool(), svl::Items<RES_FRM_SIZE, RES_FRM_SIZE>{}); + SfxItemSet aResizeSet(pFormat->GetDoc()->GetAttrPool(), svl::Items<RES_FRM_SIZE, RES_FRM_SIZE>); SwFormatFrameSize aSize; aResizeSet.Put(aSize); SwTextBoxHelper::syncFlyFrameAttr(*pFormat, aResizeSet); @@ -1279,7 +1279,7 @@ void SwDrawContact::Changed_( const SdrObject& rObj, } } SfxItemSet aSet( GetFormat()->GetDoc()->GetAttrPool(), - svl::Items<RES_VERT_ORIENT, RES_HORI_ORIENT>{} ); + svl::Items<RES_VERT_ORIENT, RES_HORI_ORIENT> ); const SwFormatVertOrient& rVert = GetFormat()->GetVertOrient(); if ( nYPosDiff != 0 ) { @@ -1351,7 +1351,7 @@ void SwDrawContact::Changed_( const SdrObject& rObj, pDoc->getIDocumentState().SetEnableSetModified(false); SfxItemSet aSyncSet(pDoc->GetAttrPool(), - svl::Items<RES_VERT_ORIENT, RES_ANCHOR>{}); + svl::Items<RES_VERT_ORIENT, RES_ANCHOR>); aSyncSet.Put(SwFormatVertOrient(aObjRect.Top() - rPageFrame->getFrameArea().Top(), text::VertOrientation::NONE, text::RelOrientation::PAGE_FRAME)); diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index a6a834efdb5f..fcb598966280 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -868,7 +868,7 @@ void SwVirtFlyDrawObj::NbcCrop(const basegfx::B2DPoint& rRef, double fxFact, dou Fraction(fyFact)); // Get old values for crop in 10th of mm - SfxItemSet aSet( pSh->GetAttrPool(), svl::Items<RES_GRFATR_CROPGRF, RES_GRFATR_CROPGRF>{} ); + SfxItemSet aSet( pSh->GetAttrPool(), svl::Items<RES_GRFATR_CROPGRF, RES_GRFATR_CROPGRF> ); pSh->GetCurAttr( aSet ); SwCropGrf aCrop( aSet.Get(RES_GRFATR_CROPGRF) ); diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index 9a8e45cb137c..f2270aa731af 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -320,7 +320,7 @@ bool SwAutoCorrDoc::SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& pFrame->MapViewToModelPos(TextFrameIndex(nEnd))); SfxItemSet aSet( m_rEditSh.GetDoc()->GetAttrPool(), - svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT>{} ); + svl::Items<RES_TXTATR_INETFMT, RES_TXTATR_INETFMT> ); aSet.Put( SwFormatINetFormat( rURL, OUString() )); m_rEditSh.GetDoc()->SetFormatItemByAutoFormat( aPam, aSet ); if( m_bUndoIdInitialized ) diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 0763cc06784c..7b4a467166e1 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -590,7 +590,7 @@ bool SwAutoFormat::DoUnderline() } SfxItemSet aSet(m_pDoc->GetAttrPool(), svl::Items<RES_PARATR_CONNECT_BORDER, RES_PARATR_CONNECT_BORDER, - RES_BOX, RES_BOX>{}); + RES_BOX, RES_BOX>); aSet.Put( SwParaConnectBorderItem( false ) ); SvxBoxItem aBox( RES_BOX ); aBox.SetLine( &aLine, SvxBoxItemLine::BOTTOM ); @@ -1009,7 +1009,7 @@ void SwAutoFormat::SetColl( sal_uInt16 nId, bool bHdLineOrText ) RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE, RES_PARATR_ADJUST, RES_PARATR_ADJUST, RES_PARATR_TABSTOP, RES_PARATR_DROP, - RES_BACKGROUND, RES_SHADOW>{}); + RES_BACKGROUND, RES_SHADOW>); if (m_aDelPam.GetPoint()->nNode.GetNode().GetTextNode()->HasSwAttrSet()) { diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx index ec03360cdc8f..f579862ae362 100644 --- a/sw/source/core/edit/edfmt.cxx +++ b/sw/source/core/edit/edfmt.cxx @@ -41,7 +41,7 @@ SwCharFormat* SwEditShell::GetCurCharFormat() const { SwCharFormat *pFormat = nullptr; SfxItemSet aSet( GetDoc()->GetAttrPool(), svl::Items<RES_TXTATR_CHARFMT, - RES_TXTATR_CHARFMT>{} ); + RES_TXTATR_CHARFMT> ); const SfxPoolItem* pItem; if( GetCurAttr( aSet ) && SfxItemState::SET == aSet.GetItemState( RES_TXTATR_CHARFMT, false, &pItem ) ) diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx index a3a32b80b98e..0e3a9617ffc1 100644 --- a/sw/source/core/fields/cellfml.cxx +++ b/sw/source/core/fields/cellfml.cxx @@ -124,7 +124,7 @@ double SwTableBox::GetValue( SwTableCalcPara& rCalcPara ) const { SwFrameFormat* pFormat = pBox->ClaimFrameFormat(); SfxItemSet aTmp( pDoc->GetAttrPool(), - svl::Items<RES_BOXATR_BEGIN,RES_BOXATR_END-1>{} ); + svl::Items<RES_BOXATR_BEGIN,RES_BOXATR_END-1> ); aTmp.Put( SwTableBoxValue( nRet ) ); if( SfxItemState::SET != pFormat->GetItemState( RES_BOXATR_FORMAT )) aTmp.Put( SwTableBoxNumFormat( 0 )); diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 1f6b21645bcc..44c589060feb 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -992,7 +992,7 @@ sal_Int32 SwGetExpField::GetReferenceTextPos( const SwFormatField& rFormat, SwDo RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_LANGUAGE - >::value); + >); SwAttrSet aSet(rDoc.GetAttrPool(), nIds); rTextNode.GetParaAttr(aSet, nRet, nRet+1); diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index bb6aa4a12654..1394c7b7469b 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -1417,7 +1417,7 @@ void SwFEShell::Paste( SvStream& rStrm, SwPasteSdr nAction, const Point* pPt ) { // store attributes, then set SdrObject SfxItemSet aFrameSet( mxDoc->GetAttrPool(), - svl::Items<RES_SURROUND, RES_ANCHOR>{} ); + svl::Items<RES_SURROUND, RES_ANCHOR> ); aFrameSet.Set( pFormat->GetAttrSet() ); Point aNullPt; @@ -1594,7 +1594,7 @@ bool SwFEShell::Paste(const Graphic &rGrf, const OUString& rURL) { pView->AddUndo(std::make_unique<SdrUndoAttrObj>(*pObj)); - SfxItemSet aSet(pView->GetModel()->GetItemPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLBITMAP>{}); + SfxItemSet aSet(pView->GetModel()->GetItemPool(), svl::Items<XATTR_FILLSTYLE, XATTR_FILLBITMAP>); aSet.Put(XFillStyleItem(drawing::FillStyle_BITMAP)); aSet.Put(XFillBitmapItem(OUString(), rGrf)); diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 18e46f9bce47..c8fdf46bb185 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -1129,7 +1129,7 @@ SfxItemSet SwFEShell::makeItemSetFromFormatAnchor(SfxItemPool& rPool, const SwFo // The set also includes VERT/HORI_ORIENT, because the align // shall be changed in FEShell::SetFlyFrameAttr/SetFlyFrameAnchor, // possibly as a result of the anchor change. - SfxItemSet aSet(rPool, svl::Items<RES_VERT_ORIENT, RES_ANCHOR>{}); + SfxItemSet aSet(rPool, svl::Items<RES_VERT_ORIENT, RES_ANCHOR>); aSet.Put(rAnchor); return aSet; } diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 9bdd23b856cf..ab185b70d893 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -2023,7 +2023,7 @@ bool SwFEShell::ImpEndCreate() } SfxItemSet aSet( GetDoc()->GetAttrPool(), svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, - RES_SURROUND, RES_ANCHOR>{} ); + RES_SURROUND, RES_ANCHOR> ); aSet.Put( aAnch ); // OD 2004-03-30 #i26791# - determine relative object position @@ -2097,7 +2097,7 @@ bool SwFEShell::ImpEndCreate() ::GetHtmlMode( GetDoc()->GetDocShell() ) && nullptr != ( pFlyFrame = GetSelectedFlyFrame() )) { - SfxItemSet aHtmlSet( GetDoc()->GetAttrPool(), svl::Items<RES_VERT_ORIENT, RES_HORI_ORIENT>{} ); + SfxItemSet aHtmlSet( GetDoc()->GetAttrPool(), svl::Items<RES_VERT_ORIENT, RES_HORI_ORIENT> ); // horizontal orientation: const bool bLeftFrame = aFlyRect.Left() < pAnch->getFrameArea().Left() + pAnch->getFramePrintArea().Left(), @@ -2835,7 +2835,7 @@ void SwFEShell::CheckUnboundObjects() StartAllAction(); SfxItemSet aSet( GetAttrPool(), svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, - RES_SURROUND, RES_ANCHOR>{} ); + RES_SURROUND, RES_ANCHOR> ); aSet.Put( aAnch ); aSet.Put( SwFormatSurround( css::text::WrapTextMode_THROUGH ) ); SwFrameFormat* pFormat = getIDocumentLayoutAccess().MakeLayoutFormat( RndStdIds::DRAW_OBJECT, &aSet ); @@ -3196,7 +3196,7 @@ void SwFEShell::CreateDefaultShape( SdrObjKind eSdrObjectKind, const tools::Rect if(bMarquee) { - SfxItemSet aSet(pDrawModel->GetItemPool(), svl::Items<SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST>{}); + SfxItemSet aSet(pDrawModel->GetItemPool(), svl::Items<SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST>); aSet.Put( makeSdrTextAutoGrowWidthItem( false ) ); aSet.Put( makeSdrTextAutoGrowHeightItem( false ) ); aSet.Put( SdrTextAniKindItem( SdrTextAniKind::Slide ) ); diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index 8110b5120c74..4a7baf446cfd 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -796,7 +796,7 @@ void SwAnchoredDrawObject::AdjustPositioningAttr( const SwFrame* _pNewAnchorFram SwFormatHoriOrient hori(nHoriRelPos, text::HoriOrientation::NONE, text::RelOrientation::FRAME); SwFormatVertOrient vert(nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME); - SfxItemSet items(GetFrameFormat().GetDoc()->GetAttrPool(), svl::Items<RES_VERT_ORIENT, RES_HORI_ORIENT>()); + SfxItemSet items(GetFrameFormat().GetDoc()->GetAttrPool(), svl::Items<RES_VERT_ORIENT, RES_HORI_ORIENT>); items.Put(hori); items.Put(vert); GetFrameFormat().GetDoc()->SetAttr(items, GetFrameFormat()); diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 1ae5bae8496e..15b50ed3ce7b 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -1129,7 +1129,7 @@ void SwFlyFrame::ChgRelPos( const Point &rNewPos ) if( bVert ) nTmpY = -nTmpY; SfxItemSet aSet( pFormat->GetDoc()->GetAttrPool(), - svl::Items<RES_VERT_ORIENT, RES_HORI_ORIENT>{}); + svl::Items<RES_VERT_ORIENT, RES_HORI_ORIENT>); SwFormatVertOrient aVert( pFormat->GetVertOrient() ); const SwTextFrame *pAutoFrame = nullptr; diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index d4ced03f1c8c..ccb520abb82a 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -721,7 +721,7 @@ short SwRedlineItr::Seek(SwFont& rFnt, { SwAttrPool& rPool = const_cast<SwDoc&>(m_rDoc).GetAttrPool(); - m_pSet = std::make_unique<SfxItemSet>(rPool, svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END-1>{}); + m_pSet = std::make_unique<SfxItemSet>(rPool, svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END-1>); } if( 1 < pRed->GetStackCount() ) diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx index 81db29607371..fe292e368cb5 100644 --- a/sw/source/core/text/txtfld.cxx +++ b/sw/source/core/text/txtfld.cxx @@ -568,7 +568,7 @@ static void lcl_setRedlineAttr( SwTextFormatInfo &rInf, const SwTextNode& rTextN return; SwAttrPool& rPool = rInf.GetVsh()->GetDoc()->GetAttrPool(); - SfxItemSet aSet(rPool, svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END-1>{}); + SfxItemSet aSet(rPool, svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END-1>); std::size_t aAuthor = (1 < pRedlineNum->GetStackCount()) ? pRedlineNum->GetAuthor( 1 ) diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 1fd412c2e811..c7ff1de7cd7e 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -384,7 +384,7 @@ namespace sw { static_assert(RES_PAGEDESC + 1 == sal_uInt16(RES_BREAK), "first-node items must be adjacent"); SfxItemSet firstSet(*rFormatSet.GetPool(), - svl::Items<RES_PAGEDESC, RES_BREAK>{}); + svl::Items<RES_PAGEDESC, RES_BREAK>); pMerged->pFirstNode->SwContentNode::GetAttr(firstSet); rFormatSet.Put(firstSet); @@ -405,7 +405,7 @@ namespace sw { SfxItemSet propsSet(*rFormatSet.GetPool(), svl::Items<RES_PARATR_BEGIN, RES_PAGEDESC, RES_BREAK+1, RES_FRMATR_END, - XATTR_FILL_FIRST, XATTR_FILL_LAST+1>{}); + XATTR_FILL_FIRST, XATTR_FILL_LAST+1>); pMerged->pParaPropsNode->SwContentNode::GetAttr(propsSet); rFormatSet.Put(propsSet); return *pMerged->pParaPropsNode; diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 3d7e081f1e4c..bb43cfab5af4 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -2024,7 +2024,7 @@ void SwTextNode::CopyText( SwTextNode *const pDest, svl::Items< RES_CHRATR_BEGIN, RES_CHRATR_END - 1, RES_TXTATR_INETFMT, RES_TXTATR_CHARFMT, - RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END - 1>{} ); + RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END - 1> ); aCharSet.Put( *GetpSwAttrSet() ); if( aCharSet.Count() ) { @@ -2067,7 +2067,7 @@ void SwTextNode::CopyText( SwTextNode *const pDest, svl::Items< RES_CHRATR_BEGIN, RES_CHRATR_END - 1, RES_TXTATR_INETFMT, RES_TXTATR_CHARFMT, - RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END - 1>{}); + RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END - 1>); aCharSet.Put( *GetpSwAttrSet() ); if( aCharSet.Count() ) { @@ -2490,7 +2490,7 @@ void SwTextNode::CutImpl( SwTextNode * const pDest, const SwIndex & rDestStart, svl::Items< RES_CHRATR_BEGIN, RES_CHRATR_END - 1, RES_TXTATR_INETFMT, RES_TXTATR_CHARFMT, - RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END - 1>{}); + RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END - 1>); aCharSet.Put( *GetpSwAttrSet() ); if( aCharSet.Count() ) pDest->SetAttr( aCharSet, nDestStart, nDestStart + nLen ); @@ -5198,7 +5198,7 @@ void SwTextNode::dumpAsXml(xmlTextWriterPtr pWriter) const sal_uInt32 SwTextNode::GetRsid( sal_Int32 nStt, sal_Int32 nEnd ) const { - SfxItemSet aSet( const_cast<SfxItemPool&>(static_cast<SfxItemPool const &>(GetDoc().GetAttrPool())), svl::Items<RES_CHRATR_RSID, RES_CHRATR_RSID>{} ); + SfxItemSet aSet( const_cast<SfxItemPool&>(static_cast<SfxItemPool const &>(GetDoc().GetAttrPool())), svl::Items<RES_CHRATR_RSID, RES_CHRATR_RSID> ); if (GetParaAttr(aSet, nStt, nEnd)) { const SvxRsidItem* pRsid = aSet.GetItem<SvxRsidItem>(RES_CHRATR_RSID); diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 052b56813823..1b88a49b498d 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -1027,7 +1027,7 @@ SwTextAttr* MakeTextAttr( // Sorry, this is not allowed any longer. // You'll get a brand new autostyle attribute: SfxItemSet aItemSet( rDoc.GetAttrPool(), - svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END>{} ); + svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END> ); aItemSet.Put( rAttr ); return MakeTextAttr( rDoc, aItemSet, nStt, nEnd ); } @@ -1835,7 +1835,7 @@ bool SwTextNode::SetAttr( // split sets (for selection in nodes) const SfxItemSet* pSet = &rSet; - SfxItemSet aTextSet( *rSet.GetPool(), svl::Items<RES_TXTATR_BEGIN, RES_TXTATR_END-1>{} ); + SfxItemSet aTextSet( *rSet.GetPool(), svl::Items<RES_TXTATR_BEGIN, RES_TXTATR_END-1> ); // entire paragraph if ( !nStt && (nEnd == m_Text.getLength()) && diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 121d9f712bc7..7d26e27ee56d 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -227,7 +227,7 @@ WhichRangesContainer const aSave_BoxContentSet(svl::Items< RES_CHRATR_FONT, RES_CHRATR_FONTSIZE, RES_CHRATR_POSTURE, RES_CHRATR_POSTURE, RES_CHRATR_SHADOWED, RES_CHRATR_WEIGHT, - RES_PARATR_ADJUST, RES_PARATR_ADJUST>::value); + RES_PARATR_ADJUST, RES_PARATR_ADJUST>); SwUndoInsTable::SwUndoInsTable( const SwPosition& rPos, sal_uInt16 nCl, sal_uInt16 nRw, sal_uInt16 nAdj, const SwInsertTableOptions& rInsTableOpts, @@ -2218,7 +2218,7 @@ void SwUndoTableNumFormat::RedoImpl(::sw::UndoRedoContext & rContext) if( m_bNewFormat || m_bNewFormula || m_bNewValue ) { SfxItemSet aBoxSet( rDoc.GetAttrPool(), - svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_VALUE>{} ); + svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_VALUE> ); // Resetting attributes is not enough. In addition, take care that the // text will be also formatted correctly. @@ -2247,7 +2247,7 @@ void SwUndoTableNumFormat::RedoImpl(::sw::UndoRedoContext & rContext) else if( getSwDefaultTextFormat() != m_nFormatIdx ) { SfxItemSet aBoxSet( rDoc.GetAttrPool(), - svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_VALUE>{} ); + svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_VALUE> ); aBoxSet.Put( SwTableBoxNumFormat( m_nFormatIdx )); aBoxSet.Put( SwTableBoxValue( m_fNum )); @@ -2467,7 +2467,7 @@ void SwUndoTableCpyTable::UndoImpl(::sw::UndoRedoContext & rContext) rDoc.GetAttrPool(), svl::Items< RES_VERT_ORIENT, RES_VERT_ORIENT, - RES_BOXATR_FORMAT, RES_BOXATR_VALUE>{}); + RES_BOXATR_FORMAT, RES_BOXATR_VALUE>); aTmpSet.Put( rBox.GetFrameFormat()->GetAttrSet() ); if( aTmpSet.Count() ) { @@ -2488,7 +2488,7 @@ void SwUndoTableCpyTable::UndoImpl(::sw::UndoRedoContext & rContext) rDoc.GetAttrPool(), svl::Items< RES_VERT_ORIENT, RES_VERT_ORIENT, - RES_BOXATR_FORMAT, RES_BOXATR_VALUE>{}); + RES_BOXATR_FORMAT, RES_BOXATR_VALUE>); pEntry->pBoxNumAttr->Put( aTmpSet ); } @@ -2563,7 +2563,7 @@ void SwUndoTableCpyTable::RedoImpl(::sw::UndoRedoContext & rContext) rDoc.GetAttrPool(), svl::Items< RES_VERT_ORIENT, RES_VERT_ORIENT, - RES_BOXATR_FORMAT, RES_BOXATR_VALUE>{}); + RES_BOXATR_FORMAT, RES_BOXATR_VALUE>); aTmpSet.Put( rBox.GetFrameFormat()->GetAttrSet() ); if( aTmpSet.Count() ) { @@ -2583,7 +2583,7 @@ void SwUndoTableCpyTable::RedoImpl(::sw::UndoRedoContext & rContext) rDoc.GetAttrPool(), svl::Items< RES_VERT_ORIENT, RES_VERT_ORIENT, - RES_BOXATR_FORMAT, RES_BOXATR_VALUE>{}); + RES_BOXATR_FORMAT, RES_BOXATR_VALUE>); pEntry->pBoxNumAttr->Put( aTmpSet ); } @@ -2616,7 +2616,7 @@ void SwUndoTableCpyTable::AddBoxBefore( const SwTableBox& rBox, bool bDelContent pDoc->GetAttrPool(), svl::Items< RES_VERT_ORIENT, RES_VERT_ORIENT, - RES_BOXATR_FORMAT, RES_BOXATR_VALUE>{}); + RES_BOXATR_FORMAT, RES_BOXATR_VALUE>); pEntry->pBoxNumAttr->Put( rBox.GetFrameFormat()->GetAttrSet() ); if( !pEntry->pBoxNumAttr->Count() ) { diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx index 9961effe2b05..603999eaee9b 100644 --- a/sw/source/core/unocore/SwXTextDefaults.cxx +++ b/sw/source/core/unocore/SwXTextDefaults.cxx @@ -73,7 +73,7 @@ void SAL_CALL SwXTextDefaults::setPropertyValue( const OUString& rPropertyName, const SfxPoolItem& rItem = m_pDoc->GetDefault(pMap->nWID); if (RES_PAGEDESC == pMap->nWID && MID_PAGEDESC_PAGEDESCNAME == pMap->nMemberId) { - SfxItemSet aSet( m_pDoc->GetAttrPool(), svl::Items<RES_PAGEDESC, RES_PAGEDESC>{} ); + SfxItemSet aSet( m_pDoc->GetAttrPool(), svl::Items<RES_PAGEDESC, RES_PAGEDESC> ); aSet.Put(rItem); SwUnoCursorHelper::SetPageDesc( aValue, *m_pDoc, aSet ); m_pDoc->SetDefault(aSet.Get(RES_PAGEDESC)); diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 8a961b11affa..c47887f8350d 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -596,7 +596,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape) SwShapeDescriptor_Impl* pDesc = pShape->GetDescImpl(); SfxItemSet aSet( m_pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, - RES_FRMATR_END-1>{} ); + RES_FRMATR_END-1> ); SwFormatAnchor aAnchor( RndStdIds::FLY_AS_CHAR ); bool bOpaque = false; if( pDesc ) @@ -1067,7 +1067,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a { UnoActionContext aCtx(pDoc); SfxItemSet aItemSet( pDoc->GetAttrPool(), - svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1>{} ); + svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1> ); aItemSet.SetParent(&pFormat->GetAttrSet()); SwFormatAnchor aAnchor = static_cast<const SwFormatAnchor&>(aItemSet.Get(pEntry->nWID)); SwPosition aPos(*pFrame->GetFrameFormat()->GetContent().GetContentIdx()); diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 6c685a16de9e..69c726721745 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1731,7 +1731,7 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& if(pFrame && this != pFrame && pFrame->GetFrameFormat() && pFrame->GetFrameFormat()->GetDoc() == pDoc) { SfxItemSet aSet( pDoc->GetAttrPool(), - svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1>{} ); + svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1> ); aSet.SetParent(&pFormat->GetAttrSet()); SwFormatAnchor aAnchor = static_cast<const SwFormatAnchor&>(aSet.Get(pEntry->nWID)); @@ -1755,7 +1755,7 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER, // FillAttribute support - XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + XATTR_FILL_FIRST, XATTR_FILL_LAST>); bool bDone(false); aSet.SetParent(&pFormat->GetAttrSet()); @@ -2478,7 +2478,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName ) if(OWN_ATTR_FILLBMP_MODE == pEntry->nWID) { SwDoc* pDoc = pFormat->GetDoc(); - SfxItemSet aSet(pDoc->GetAttrPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + SfxItemSet aSet(pDoc->GetAttrPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); aSet.SetParent(&pFormat->GetAttrSet()); aSet.ClearItem(XATTR_FILLBMP_STRETCH); @@ -2524,7 +2524,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName ) { SwDoc* pDoc = pFormat->GetDoc(); SfxItemSet aSet( pDoc->GetAttrPool(), - svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1>{} ); + svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1> ); aSet.SetParent(&pFormat->GetAttrSet()); aSet.ClearItem(pEntry->nWID); if(rPropertyName != UNO_NAME_ANCHOR_TYPE) @@ -2714,9 +2714,9 @@ void SwXFrame::attachToRange(uno::Reference<text::XTextRange> const& xTextRange, // FillAttribute support XATTR_FILL_FIRST, XATTR_FILL_LAST, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>::value); + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>); static WhichRangesContainer const aGrAttrRange(svl::Items< - RES_GRFATR_BEGIN, RES_GRFATR_END-1>::value); + RES_GRFATR_BEGIN, RES_GRFATR_END-1>); SfxItemSet aGrSet(pDoc->GetAttrPool(), aGrAttrRange ); SfxItemSet aFrameSet(pDoc->GetAttrPool(), aFrameAttrRange ); @@ -2799,7 +2799,7 @@ void SwXFrame::attachToRange(uno::Reference<text::XTextRange> const& xTextRange, { pFormat->DelFrames(); pAnchorItem->SetAnchor( pCopySource->Start() ); - SfxItemSet aAnchorSet( pDoc->GetAttrPool(), svl::Items<RES_ANCHOR, RES_ANCHOR>{} ); + SfxItemSet aAnchorSet( pDoc->GetAttrPool(), svl::Items<RES_ANCHOR, RES_ANCHOR> ); aAnchorSet.Put( *pAnchorItem ); pDoc->SetFlyFrameAttr( *pFormat, aAnchorSet ); } @@ -3113,7 +3113,7 @@ void SwXFrame::attach(const uno::Reference< text::XTextRange > & xTextRange) if (!::sw::XTextRangeToSwPaM(aIntPam, xTextRange)) throw lang::IllegalArgumentException(); - SfxItemSet aSet( pDoc->GetAttrPool(), svl::Items<RES_ANCHOR, RES_ANCHOR>{} ); + SfxItemSet aSet( pDoc->GetAttrPool(), svl::Items<RES_ANCHOR, RES_ANCHOR> ); aSet.SetParent(&pFormat->GetAttrSet()); SwFormatAnchor aAnchor = aSet.Get(RES_ANCHOR); diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index c6a7da8ea41a..c841e05021a5 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -350,7 +350,7 @@ lcl_setCharFormatSequence(SwPaM & rPam, uno::Any const& rValue) aStyle <<= aCharStyles.getConstArray()[nStyle]; // create a local set and apply each format directly SfxItemSet aSet(rPam.GetDoc().GetAttrPool(), - svl::Items<RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT>{}); + svl::Items<RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT>); lcl_setCharStyle(rPam.GetDoc(), aStyle, aSet); // the first style should replace the current attributes, // all other have to be added @@ -522,7 +522,7 @@ SwUnoCursorHelper::SetCursorPropertyValue( SfxItemSet items( rPam.GetDoc().GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END-1, RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT, - RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1>{} ); + RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1> ); for (beans::NamedValue const & prop : std::as_const(props)) { @@ -1726,7 +1726,7 @@ uno::Any SwUnoCursorHelper::GetPropertyValue( rPaM.GetDoc().GetAttrPool(), svl::Items< RES_CHRATR_BEGIN, RES_FRMATR_END - 1, - RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER>{}); + RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER>); SwUnoCursorHelper::GetCursorAttr(rPaM, aSet); rPropSet.getPropertyValue(*pEntry, aSet, aAny); @@ -1904,7 +1904,7 @@ SwUnoCursorHelper::GetPropertyStates( case SW_PROPERTY_STATE_CALLER_SWX_TEXT_PORTION: pSet.reset( new SfxItemSet( rPaM.GetDoc().GetAttrPool(), - svl::Items<RES_CHRATR_BEGIN, RES_TXTATR_END>{} )); + svl::Items<RES_CHRATR_BEGIN, RES_TXTATR_END> )); break; case SW_PROPERTY_STATE_CALLER_SINGLE_VALUE_ONLY: pSet.reset( @@ -1917,7 +1917,7 @@ SwUnoCursorHelper::GetPropertyStates( svl::Items< RES_CHRATR_BEGIN, RES_FRMATR_END - 1, RES_UNKNOWNATR_CONTAINER, - RES_UNKNOWNATR_CONTAINER>{})); + RES_UNKNOWNATR_CONTAINER>)); } // #i63870# SwUnoCursorHelper::GetCursorAttr( rPaM, *pSet ); diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index d559cee1a133..243d4fff1d79 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -361,7 +361,7 @@ void SwXTextPortion::GetPropertyValue( svl::Items< RES_CHRATR_BEGIN, RES_FRMATR_END - 1, RES_UNKNOWNATR_CONTAINER, - RES_UNKNOWNATR_CONTAINER>{}); + RES_UNKNOWNATR_CONTAINER>); SwUnoCursorHelper::GetCursorAttr(*pUnoCursor, *pSet); } m_pPropSet->getPropertyValue(rEntry, *pSet, rVal); diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 0fa7e6fb7966..c50315cf2494 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -364,7 +364,7 @@ SwXTextSection::attach(const uno::Reference< text::XTextRange > & xTextRange) RES_BACKGROUND, RES_BACKGROUND, RES_COL, RES_COL, RES_FTN_AT_TXTEND, RES_FRAMEDIR, - RES_UNKNOWNATR_CONTAINER,RES_UNKNOWNATR_CONTAINER>{}); + RES_UNKNOWNATR_CONTAINER,RES_UNKNOWNATR_CONTAINER>); if (m_pImpl->m_pProps->m_pBrushItem) { aSet.Put(*m_pImpl->m_pProps->m_pBrushItem); diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 1729a86c56e9..63d490480559 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -2646,7 +2646,7 @@ void SAL_CALL SwXStyle::setPropertiesToDefault(const uno::Sequence<OUString>& aP { // SwDoc* pDoc = pTargetFormat->GetDoc(); - SfxItemSet aSet(pDoc->GetAttrPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + SfxItemSet aSet(pDoc->GetAttrPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); aSet.SetParent(&pTargetFormat->GetAttrSet()); aSet.ClearItem(XATTR_FILLBMP_STRETCH); @@ -2917,7 +2917,7 @@ void SwXPageStyle::SetPropertyValues_Impl(const uno::Sequence<OUString>& rProper 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 aTempSet.SetParent(&GetDoc()->GetDfltFrameFormat()->GetAttrSet()); @@ -3788,7 +3788,7 @@ SwAutoStylesEnumImpl::SwAutoStylesEnumImpl( SwDoc& rInitDoc, IStyleAccess::SwAut std::pair< sal_uInt16, text::RubyAdjust > aPair( pRubyItem->GetPosition(), pRubyItem->GetAdjustment() ); if ( aRubyMap.insert( aPair ).second ) { - auto pItemSet = std::make_shared<SfxItemSet>( rAttrPool, svl::Items<RES_TXTATR_CJK_RUBY, RES_TXTATR_CJK_RUBY>{} ); + auto pItemSet = std::make_shared<SfxItemSet>( rAttrPool, svl::Items<RES_TXTATR_CJK_RUBY, RES_TXTATR_CJK_RUBY> ); pItemSet->Put( *pRubyItem ); mAutoStyles.push_back( pItemSet ); } diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 2b9ae958bee4..8931bc098044 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -703,7 +703,7 @@ void sw_setValue( SwXCell &rCell, double nVal ) SwDoc* pDoc = rCell.GetDoc(); UnoActionContext aAction(pDoc); SwFrameFormat* pBoxFormat = rCell.m_pBox->ClaimFrameFormat(); - SfxItemSet aSet(pDoc->GetAttrPool(), svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_VALUE>{}); + SfxItemSet aSet(pDoc->GetAttrPool(), svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_VALUE>); const SfxPoolItem* pItem; //!! do we need to set a new number format? Yes, if @@ -866,7 +866,7 @@ void SwXCell::setFormula(const OUString& rFormula) SwTableBoxFormula aFormula( sFormula ); SwDoc* pMyDoc = GetDoc(); UnoActionContext aAction(pMyDoc); - SfxItemSet aSet(pMyDoc->GetAttrPool(), svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_FORMULA>{}); + SfxItemSet aSet(pMyDoc->GetAttrPool(), svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_FORMULA>); const SfxPoolItem* pItem; SwFrameFormat* pBoxFormat = m_pBox->GetFrameFormat(); if(SfxItemState::SET != pBoxFormat->GetAttrSet().GetItemState(RES_BOXATR_FORMAT, true, &pItem) @@ -1725,7 +1725,7 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName) { SfxItemSet aSet(rTableCursor.GetDoc().GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_FRMATR_END-1, - RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER>{}); + RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER>); SwUnoCursorHelper::GetCursorAttr(rTableCursor.GetSelRing(), aSet); m_pPropSet->getPropertyValue(*pEntry, aSet, aResult); } @@ -1815,7 +1815,7 @@ void SwTableProperties_Impl::ApplyTableAttr(const SwTable& rTable, SwDoc& rDoc) RES_BACKGROUND, RES_BACKGROUND, RES_SHADOW, RES_SHADOW, RES_KEEP, RES_KEEP, - RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT>{}); + RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT>); const uno::Any* pRepHead; const SwFrameFormat &rFrameFormat = *rTable.GetFrameFormat(); if(GetProperty(FN_TABLE_HEADLINE_REPEAT, 0xff, pRepHead )) @@ -2610,7 +2610,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An SfxItemSet aSet(pDoc->GetAttrPool(), svl::Items<RES_BOX, RES_BOX, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{}); + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>); SvxBoxItem aBox( RES_BOX ); SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER ); @@ -2809,7 +2809,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) SfxItemSet aSet(pDoc->GetAttrPool(), svl::Items<RES_BOX, RES_BOX, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{}); + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>); aSet.Put(SvxBoxInfoItem( SID_ATTR_BORDER_INNER )); SwDoc::GetTabBorders(rCursor, aSet); const SvxBoxInfoItem& rBoxInfoItem = aSet.Get(SID_ATTR_BORDER_INNER); @@ -3394,7 +3394,7 @@ SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV { SfxItemSet aSet(rDoc.GetAttrPool(), 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.SetValid(SvxBoxInfoItemValidFlags::ALL, false); SvxBoxInfoItemValidFlags nValid = SvxBoxInfoItemValidFlags::NONE; @@ -3502,7 +3502,7 @@ uno::Any SAL_CALL SwXCellRange::getPropertyValue(const OUString& rPropertyName) SwDoc& rDoc = m_pImpl->m_pTableCursor->GetDoc(); SfxItemSet aSet(rDoc.GetAttrPool(), svl::Items<RES_BOX, RES_BOX, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>{}); + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER>); aSet.Put(SvxBoxInfoItem( SID_ATTR_BORDER_INNER )); SwDoc::GetTabBorders(*m_pImpl->m_pTableCursor, aSet); const SvxBoxItem& rBoxItem = aSet.Get(RES_BOX); @@ -3545,7 +3545,7 @@ uno::Any SAL_CALL SwXCellRange::getPropertyValue(const OUString& rPropertyName) svl::Items< RES_CHRATR_BEGIN, RES_FRMATR_END - 1, RES_UNKNOWNATR_CONTAINER, - RES_UNKNOWNATR_CONTAINER>{}); + RES_UNKNOWNATR_CONTAINER>); // first look at the attributes of the cursor SwUnoTableCursor *const pCursor = dynamic_cast<SwUnoTableCursor*>(&(*m_pImpl->m_pTableCursor)); diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index 871c8315a575..60e1f230a7ac 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -118,7 +118,7 @@ SwASCIIParser::SwASCIIParser(SwDoc& rD, const SwPaM& rCursor, SvStream& rIn, boo m_pItemSet = std::make_unique<SfxItemSet>( m_rDoc.GetAttrPool(), svl::Items<RES_CHRATR_FONT, RES_CHRATR_LANGUAGE, RES_CHRATR_CJK_FONT, - RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_LANGUAGE>{}); + RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_LANGUAGE>); // set defaults from the options if (m_rOpt.GetLanguage()) diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index 18b140e745e9..dd8d439d076d 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -660,7 +660,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, // test if on this node there had been a pagebreak BEFORE the // tox attribute was put on the stack - SfxItemSet aBkSet( m_rDoc.GetAttrPool(), svl::Items<RES_PAGEDESC, RES_BREAK>{} ); + SfxItemSet aBkSet( m_rDoc.GetAttrPool(), svl::Items<RES_PAGEDESC, RES_BREAK> ); SwContentNode* pNd = nullptr; if( !pTOXAttr->HadBreakItem() || !pTOXAttr->HadPageDescItem() ) { diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx index ce26f96687c0..d03f2fbd8092 100644 --- a/sw/source/filter/html/SwAppletImpl.cxx +++ b/sw/source/filter/html/SwAppletImpl.cxx @@ -109,7 +109,7 @@ SwHtmlOptType SwApplet_Impl::GetOptionType( const OUString& rName, bool bApplet return nType; } SwApplet_Impl::SwApplet_Impl( SfxItemPool& rPool ) : - m_aItemSet( rPool, svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} ) + m_aItemSet( rPool, svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1> ) { } diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index f8fd83cf47aa..e5d4f83c7bf4 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -1211,7 +1211,7 @@ bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet, RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT, RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_POSTURE, RES_CHRATR_CTL_FONT, - RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT>{}); + RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT>); aTstItemSet.Set( pDCCharFormat->GetAttrSet() ); return HasScriptDependentItems( aTstItemSet, false ); } @@ -1258,7 +1258,7 @@ static bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, const OUString& rSelector, svl::Items<RES_CHRATR_FONT, RES_CHRATR_FONTSIZE, RES_CHRATR_LANGUAGE, RES_CHRATR_POSTURE, RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT, - RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT>{} ); + RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT> ); aScriptItemSet.Put( rItemSet ); OUString aNewSelector = aSelector + ".western" + aPseudo; @@ -1358,7 +1358,7 @@ static void OutCSS1DropCapRule( svl::Items<RES_CHRATR_FONT, RES_CHRATR_FONTSIZE, RES_CHRATR_LANGUAGE, RES_CHRATR_POSTURE, RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT, - RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT>{} ); + RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT> ); if( pDCCharFormat ) aScriptItemSet.Set( pDCCharFormat->GetAttrSet() ); @@ -1668,7 +1668,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc, // Export the distance-Attributes as normally const SwFrameFormat &rMaster = rPageDesc.GetMaster(); SfxItemSet aItemSet( *rMaster.GetAttrSet().GetPool(), - svl::Items<RES_LR_SPACE, RES_UL_SPACE>{} ); + svl::Items<RES_LR_SPACE, RES_UL_SPACE> ); aItemSet.Set( rMaster.GetAttrSet() ); if( pRefPageDesc ) diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 935c1db9e92e..43edfe64ce0b 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -597,7 +597,7 @@ static void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat, if (!rInfo.pItemSet) { - rInfo.pItemSet.reset(new SfxItemSet(*rFormat.GetAttrSet().GetPool(), svl::Items<RES_UL_SPACE, RES_UL_SPACE>{})); + rInfo.pItemSet.reset(new SfxItemSet(*rFormat.GetAttrSet().GetPool(), svl::Items<RES_UL_SPACE, RES_UL_SPACE>)); } rInfo.pItemSet->Put( aULSpaceItem ); } @@ -1848,7 +1848,7 @@ void HTMLEndPosLst::Insert( const SwDrawFrameFormat& rFormat, sal_Int32 nPos, // are not considered! const SfxItemSet& rFormatItemSet = rFormat.GetAttrSet(); SfxItemSet aItemSet( *rFormatItemSet.GetPool(), svl::Items<RES_CHRATR_BEGIN, - RES_CHRATR_END>{} ); + RES_CHRATR_END> ); SwHTMLWriter::GetEEAttrsFromDrwObj( aItemSet, pTextObj ); bool bOutStylesOld = m_bOutStyles; m_bOutStyles = false; diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx index 194458da78fa..4d4f23ad3085 100644 --- a/sw/source/filter/html/htmlctxt.cxx +++ b/sw/source/filter/html/htmlctxt.cxx @@ -477,7 +477,7 @@ bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet, if( SwCSS1Parser::MayBePositioned( rPropInfo ) ) { SfxItemSet aFrameItemSet( m_xDoc->GetAttrPool(), - svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} ); + svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1> ); if( !IsNewDoc() ) Reader::ResetFrameFormatAttrs(aFrameItemSet ); @@ -768,7 +768,7 @@ SfxItemSet *HTMLAttrContext::GetFrameItemSet( SwDoc *pCreateDoc ) { if( !m_pFrameItemSet && pCreateDoc ) m_pFrameItemSet = std::make_unique<SfxItemSet>( pCreateDoc->GetAttrPool(), - svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} ); + svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1> ); return m_pFrameItemSet.get(); } diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index cbf09d6ccccd..23f422844168 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -83,7 +83,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj, pNewDrawObj->SetLayer( m_xDoc->getIDocumentDrawModelAccess().GetInvisibleHeavenId() ); SfxItemSet aFrameSet( m_xDoc->GetAttrPool(), - svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} ); + svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1> ); if( !IsNewDoc() ) Reader::ResetFrameFormatAttrs( aFrameSet ); @@ -371,7 +371,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) static WhichRangesContainer const aWhichMap(svl::Items< XATTR_FILL_FIRST, XATTR_FILL_LAST, SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, - EE_CHAR_START, EE_CHAR_END>::value); + EE_CHAR_START, EE_CHAR_END>); SfxItemSet aItemSet( pModel->GetItemPool(), aWhichMap ); aItemSet.Put( makeSdrTextAutoGrowWidthItem( false ) ); aItemSet.Put( makeSdrTextAutoGrowHeightItem( true ) ); diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index a8c15702686c..c1aa24372213 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -337,7 +337,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField, svl::Items<RES_CHRATR_FONT, RES_CHRATR_FONTSIZE, RES_CHRATR_POSTURE, RES_CHRATR_POSTURE, RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT, - RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT>{} ); + RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT> ); rTextNd.GetParaAttr(aScriptItemSet, nFieldPos, nFieldPos+1); sal_uInt16 aWesternWhichIds[4] = diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index e02d73b07016..593a8689a83a 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -2015,7 +2015,7 @@ static Writer& OutHTML_FrameFormatAsMarquee( Writer& rWrt, const SwFrameFormat& // sort them as Hints const SfxItemSet& rFormatItemSet = rFrameFormat.GetAttrSet(); SfxItemSet aItemSet( *rFormatItemSet.GetPool(), svl::Items<RES_CHRATR_BEGIN, - RES_CHRATR_END>{} ); + RES_CHRATR_END> ); SwHTMLWriter::GetEEAttrsFromDrwObj( aItemSet, &rSdrObj ); bool bCfgOutStylesOld = rHTMLWrt.m_bCfgOutStyles; rHTMLWrt.m_bCfgOutStyles = false; diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 64d1beb7de46..cc1a796ee416 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -1044,7 +1044,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, TYPE_TEXT == eType; SfxItemSet aItemSet( rHTMLWrt.m_pDoc->GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, - RES_CHRATR_END>{} ); + RES_CHRATR_END> ); if( xPropSetInfo->hasPropertyByName( "BackgroundColor" ) ) { aTmp = xPropSet->getPropertyValue( "BackgroundColor" ); diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 2cdaceda437b..97bbfbb96642 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -532,7 +532,7 @@ IMAGE_SETEVENT: ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo ); SfxItemSet aFrameSet( m_xDoc->GetAttrPool(), - svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} ); + svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1> ); if( !IsNewDoc() ) Reader::ResetFrameFormatAttrs( aFrameSet ); diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 166c91931731..96ec2efad939 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -613,7 +613,7 @@ bool SwHTMLParser::InsertEmbed() } SfxItemSet aFrameSet( m_xDoc->GetAttrPool(), - svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} ); + svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1> ); if( !IsNewDoc() ) Reader::ResetFrameFormatAttrs( aFrameSet ); @@ -1123,7 +1123,7 @@ void SwHTMLParser::InsertFloatingFrame() // fetch the ItemSet SfxItemSet aFrameSet( m_xDoc->GetAttrPool(), - svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} ); + svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1> ); if( !IsNewDoc() ) Reader::ResetFrameFormatAttrs( aFrameSet ); diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 9d71125cc6f1..cafd7718cdb6 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -325,7 +325,7 @@ void SwHTMLParser::NewDivision( HtmlTokenId nToken ) } SfxItemSet aFrameItemSet( m_xDoc->GetAttrPool(), - svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} ); + svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1> ); if( !IsNewDoc() ) Reader::ResetFrameFormatAttrs(aFrameItemSet ); @@ -629,7 +629,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) if( bInCntnr || SwCSS1Parser::MayBePositioned( aPropInfo, true ) ) { SfxItemSet aFrameItemSet( m_xDoc->GetAttrPool(), - svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} ); + svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1> ); if( !IsNewDoc() ) Reader::ResetFrameFormatAttrs(aFrameItemSet ); @@ -701,7 +701,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss ) SwSectionData aSection( SectionType::Content, aName ); SfxItemSet aFrameItemSet( m_xDoc->GetAttrPool(), - svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} ); + svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1> ); if( !IsNewDoc() ) Reader::ResetFrameFormatAttrs(aFrameItemSet ); diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index c234c58fa5b9..e1cc324d73c2 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -1403,7 +1403,7 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox, bool bLock = pFrameFormat->GetDoc()->GetNumberFormatter() ->IsTextFormat( nNumFormat ); SfxItemSet aItemSet( *pFrameFormat->GetAttrSet().GetPool(), - svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_VALUE>{} ); + svl::Items<RES_BOXATR_FORMAT, RES_BOXATR_VALUE> ); SvxAdjust eAdjust = SvxAdjust::End; SwContentNode *pCNd = nullptr; if( !bLock ) @@ -2691,7 +2691,7 @@ SvxBrushItem* SwHTMLParser::CreateBrushItem( const Color *pColor, if( !rStyle.isEmpty() || !rId.isEmpty() || !rClass.isEmpty() ) { SfxItemSet aItemSet( m_xDoc->GetAttrPool(), svl::Items<RES_BACKGROUND, - RES_BACKGROUND>{} ); + RES_BACKGROUND> ); SvxCSS1PropertyInfo aPropInfo; if( !rClass.isEmpty() ) @@ -3219,7 +3219,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, RES_KEEP, RES_KEEP, RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT, RES_FRAMEDIR, RES_FRAMEDIR - >::value); + >); SfxItemSet aItemSet( m_xDoc->GetAttrPool(), aWhichIds ); SvxCSS1PropertyInfo aPropInfo; @@ -3394,7 +3394,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions, // the table should be put in a text frame SfxItemSet aFrameSet( m_xDoc->GetAttrPool(), - svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} ); + svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1> ); if( !pCurTable->IsNewDoc() ) Reader::ResetFrameFormatAttrs( aFrameSet ); diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index beedbf13bbb7..f12fba16bb54 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -2937,7 +2937,7 @@ void SwHTMLParser::SetAttr_( bool bChkEnd, bool bBeforeTable, case RES_BACKGROUND: { const SvxBrushItem& rBrush = static_cast< SvxBrushItem& >(*pAttr->m_pItem); - SfxItemSet aNewSet(m_xDoc->GetAttrPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + SfxItemSet aNewSet(m_xDoc->GetAttrPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>); setSvxBrushItemAsFillAttributesToTargetSet(rBrush, aNewSet); m_xDoc->getIDocumentContentOperations().InsertItemSet(aAttrPam, aNewSet, SetAttrMode::DONTREPLACE); @@ -4909,7 +4909,7 @@ void SwHTMLParser::InsertSpacer() // fetch the ItemSet SfxItemSet aFrameSet( m_xDoc->GetAttrPool(), - svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} ); + svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1> ); if( !IsNewDoc() ) Reader::ResetFrameFormatAttrs( aFrameSet ); diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index e40c7eeb5138..f28221e3912c 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -412,7 +412,7 @@ void SwWW8AttrIter::OutAttr(sal_Int32 nSwPos, bool bWriteCombChars, bool bPostpo const SfxPoolItem *pGrabBag = nullptr; SfxItemSet aExportSet(*rNd.GetSwAttrSet().GetPool(), - svl::Items<RES_CHRATR_BEGIN, RES_TXTATR_END - 1>{}); + svl::Items<RES_CHRATR_BEGIN, RES_TXTATR_END - 1>); //The hard formatting properties that affect the entire paragraph if (rNd.HasSwAttrSet()) @@ -2592,7 +2592,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode ) { // Allow MSO to emulate LO footnote text starting at left margin - only meaningful with hanging indent sal_Int32 nFirstLineIndent=0; - SfxItemSet aSet( m_rDoc.GetAttrPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE>{} ); + SfxItemSet aSet( m_rDoc.GetAttrPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE> ); const SwTextNode* pTextNode( rNode.GetTextNode() ); if ( pTextNode && pTextNode->GetAttr(aSet) ) { @@ -3136,7 +3136,7 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode ) // Exception: if there is a character style hint at the end of the // paragraph only, then still go with 2), as RES_TXTATR_CHARFMT is always // set as a hint. - SfxItemSet aParagraphMarkerProperties(m_rDoc.GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_TXTATR_END>{}); + SfxItemSet aParagraphMarkerProperties(m_rDoc.GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_TXTATR_END>); bool bCharFormatOnly = true; SwFormatAutoFormat const& rListAutoFormat(static_cast<SwFormatAutoFormat const&>(rNode.GetAttr(RES_PARATR_LIST_AUTOFMT))); diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 1313c79c031f..f1f7654cb124 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -536,7 +536,7 @@ void MSWordExportBase::NumberingLevel( // cbGrpprlChpx SfxItemSet aSet( m_rDoc.GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, - RES_CHRATR_END>{} ); + RES_CHRATR_END> ); if (rFormat.GetCharFormat() || bWriteBullet) { if (bWriteBullet) diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index d6a09917715c..7ebb20c0f3ca 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -1073,7 +1073,7 @@ sal_uInt16 MSWordSections::NumberOfColumns( const SwDoc &rDoc, const WW8_SepInfo pPd = &rDoc.GetPageDesc( 0 ); const SfxItemSet &rSet = pPd->GetMaster().GetAttrSet(); - SfxItemSet aSet( *rSet.GetPool(), svl::Items<RES_COL, RES_COL>{} ); + SfxItemSet aSet( *rSet.GetPool(), svl::Items<RES_COL, RES_COL> ); aSet.SetParent( &rSet ); //0xffffffff, what the hell is going on with that!, fixme most terribly diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index cbb32e7e2e82..3114bf29c532 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2074,7 +2074,7 @@ static sal_uInt16 lcl_TCFlags(SwDoc &rDoc, const SwTableBox * pBox, sal_Int32 nR const SwContentNode * pCNd = pSttNd->GetNodes().GoNext( &aIdx ); if( pCNd && pCNd->IsTextNode()) { - SfxItemSet aCoreSet(rDoc.GetAttrPool(), svl::Items<RES_CHRATR_ROTATE, RES_CHRATR_ROTATE>{}); + SfxItemSet aCoreSet(rDoc.GetAttrPool(), svl::Items<RES_CHRATR_ROTATE, RES_CHRATR_ROTATE>); static_cast<const SwTextNode*>(pCNd)->GetParaAttr(aCoreSet, 0, static_cast<const SwTextNode*>(pCNd)->GetText().getLength()); const SfxPoolItem * pRotItem; diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 437c1d058080..2d90488fb328 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -893,7 +893,7 @@ void MSWordExportBase::OutputFormat( const SwFormat& rFormat, bool bPapFormat, b SfxItemSet aSet(m_rDoc.GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1, - XATTR_FILL_FIRST, XATTR_FILL_LAST>{}); + XATTR_FILL_FIRST, XATTR_FILL_LAST>); aSet.Set(rFrameFormat.GetAttrSet()); // Fly as character becomes a paragraph bound @@ -3487,7 +3487,7 @@ void WW8Export::WriteFootnoteBegin( const SwFormatFootnote& rFootnote, ww::bytes std::unique_ptr<ww::bytes> pOld = std::move(pO); pO = std::move(pOwnOutArr); SfxItemSet aSet( m_rDoc.GetAttrPool(), svl::Items<RES_CHRATR_FONT, - RES_CHRATR_FONT>{} ); + RES_CHRATR_FONT> ); pCFormat = pInfo->GetCharFormat( m_rDoc ); diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index fe283e7972dd..53b83df43f07 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -1157,7 +1157,7 @@ void SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj, if( pFlyFormat && pRecord ) { SfxItemSet aFlySet( m_rDoc.GetAttrPool(), - svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1, XATTR_START, XATTR_END>{} ); + svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1, XATTR_START, XATTR_END> ); tools::Rectangle aInnerDist( pRecord->nDxTextLeft, pRecord->nDyTextTop, @@ -2608,7 +2608,7 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( tools::Long nGrafAnchorCp ) // when in a header or footer word appears to treat all elements as wrap through // determine wrapping mode - SfxItemSet aFlySet(m_rDoc.GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1, XATTR_START, XATTR_END>{}); + SfxItemSet aFlySet(m_rDoc.GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1, XATTR_START, XATTR_END>); Reader::ResetFrameFormatAttrs(aFlySet); // tdf#122425: Explicitly remove borders and spacing css::text::WrapTextMode eSurround = css::text::WrapTextMode_PARALLEL; bool bContour = false; @@ -2944,7 +2944,7 @@ SwFrameFormat* SwWW8ImplReader::MungeTextIntoDrawBox(SvxMSDffImportRec& rRecord, { // use ww8-default border distance SfxItemSet aItemSet(m_pDrawModel->GetItemPool(), - svl::Items<SDRATTR_TEXT_LEFTDIST, SDRATTR_TEXT_LOWERDIST>{}); + svl::Items<SDRATTR_TEXT_LEFTDIST, SDRATTR_TEXT_LOWERDIST>); aItemSet.Put(makeSdrTextLeftDistItem(rRecord.nDxTextLeft)); aItemSet.Put(makeSdrTextRightDistItem(rRecord.nDxTextRight)); aItemSet.Put(makeSdrTextUpperDistItem(rRecord.nDyTextTop)); @@ -3096,7 +3096,7 @@ SwFlyFrameFormat* SwWW8ImplReader::ImportReplaceableDrawables(SdrObject* &rpObje rFlySet.Put(SwFormatFrameSize(SwFrameSize::Fixed, nWidthTw, nHeightTw)); - SfxItemSet aGrSet(m_rDoc.GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END-1>{}); + SfxItemSet aGrSet(m_rDoc.GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, RES_GRFATR_END-1>); // Note that the escher inner distance only seems to be honoured in // word for textboxes, not for graphics and ole objects. diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index 599abce76fc3..2f40435c285d 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -556,7 +556,7 @@ SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj const * pTextObj, { // for the frame SfxItemSet aAttrSet( m_rDoc.GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, - RES_FRMATR_END-1>{} ); + RES_FRMATR_END-1> ); SvxMSDffImportRec const*const pRecord = (1 == aData.size()) ? aData.begin()->get() : nullptr; @@ -622,7 +622,7 @@ SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj const * pTextObj, // for the graphic SfxItemSet aGrSet( m_rDoc.GetAttrPool(), svl::Items<RES_GRFATR_BEGIN, - RES_GRFATR_END-1>{} ); + RES_GRFATR_END-1> ); if( aPD.nCL || aPD.nCR || aPD.nCT || aPD.nCB ) { diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 6b8024892753..851656dc8216 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -2191,7 +2191,7 @@ void SwWW8ImplReader::Read_HdFtTextAsHackedFrame(WW8_CP nStart, WW8_CP nLen, m_pPaM->GetPoint()->nContent.Assign(m_pPaM->GetContentNode(), 0); // tdf#122425: Explicitly remove borders and spacing - SfxItemSet aFlySet(m_rDoc.GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1>{}); + SfxItemSet aFlySet(m_rDoc.GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END - 1>); Reader::ResetFrameFormatAttrs(aFlySet); SwFlyFrameFormat* pFrame @@ -4360,7 +4360,7 @@ void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection, if (aData.begin()->get()->nFlags & ShapeFlag::Background) { SfxItemSet aSet(rFormat.GetDoc()->GetAttrPool(), - svl::Items<RES_BACKGROUND, RES_BACKGROUND,XATTR_START, XATTR_END>{}); + svl::Items<RES_BACKGROUND, RES_BACKGROUND,XATTR_START, XATTR_END>); mrReader.MatchSdrItemsIntoFlySet(pObject, aSet, mso_lineSimple, mso_lineSolid, mso_sptRectangle, aRect); if ( aSet.HasItem(RES_BACKGROUND) ) diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 2c3a8b3483d9..163e9103a0b4 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -253,7 +253,7 @@ sal_uInt16 SwWW8ImplReader::End_Footnote() { // Allow MSO to emulate LO footnote text starting at left margin - only meaningful with hanging indent sal_Int32 nFirstLineIndent=0; - SfxItemSet aSet( m_rDoc.GetAttrPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE>{} ); + SfxItemSet aSet( m_rDoc.GetAttrPool(), svl::Items<RES_LR_SPACE, RES_LR_SPACE> ); if ( pTNd->GetAttr(aSet) ) { const SvxLRSpaceItem* pLRSpace = aSet.GetItem<SvxLRSpaceItem>(RES_LR_SPACE); @@ -1792,7 +1792,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP nStartCp) : m_pTable(nullptr), m_pParentPos(nullptr), m_pFlyFormat(nullptr), - m_aItemSet(m_pIo->m_rDoc.GetAttrPool(),svl::Items<RES_FRMATR_BEGIN,RES_FRMATR_END-1>{}) + m_aItemSet(m_pIo->m_rDoc.GetAttrPool(),svl::Items<RES_FRMATR_BEGIN,RES_FRMATR_END-1>) { m_pIo->m_bCurrentAND_fNumberAcross = false; @@ -3437,7 +3437,7 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp) { m_xTableDesc->m_pParentPos = new SwPosition(*m_pPaM->GetPoint()); SfxItemSet aItemSet(m_rDoc.GetAttrPool(), - svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{}); + svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>); // #i33818# - anchor the Writer fly frame for the nested table at-character. // #i45301# SwFormatAnchor aAnchor( eAnchor ); diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 79c64955ab89..d8d061bd7a1a 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -837,7 +837,7 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, std::unique_ptr<SfxItemSet } // create new Itemset for character attributes - rpItemSet.reset(new SfxItemSet( rDoc.GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>{})); + rpItemSet.reset(new SfxItemSet( rDoc.GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>)); // Set Reader-ItemSet-Pointer to the newly created set rReader.SetCurrentItemSet(std::move(rpItemSet)); @@ -1866,7 +1866,7 @@ void SwWW8ImplReader::RegisterNumFormatOnTextNode(sal_uInt16 nCurrentLFO, return; std::unique_ptr<SfxItemSet> xListIndent(new SfxItemSet(m_rDoc.GetAttrPool(), svl::Items<RES_LR_SPACE, - RES_LR_SPACE>{})); + RES_LR_SPACE>)); const SvxLRSpaceItem *pItem = static_cast<const SvxLRSpaceItem*>( GetFormatAttr(RES_LR_SPACE)); OSL_ENSURE(pItem, "impossible"); diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index f999ea840ce9..e9d33456dd94 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -253,7 +253,7 @@ SwFrameFormat* SwWW8ImplReader::ImportOle(const Graphic* pGrf, if( !pFlySet ) { pTempSet.emplace( m_rDoc.GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, - RES_FRMATR_END-1>{} ); + RES_FRMATR_END-1> ); pFlySet = &*pTempSet; diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 9096889a9c60..1431a3becf87 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2366,7 +2366,7 @@ WW8PostProcessAttrsInfo::WW8PostProcessAttrsInfo(WW8_CP nCpStart, WW8_CP nCpEnd, , mnCpStart(nCpStart) , mnCpEnd(nCpEnd) , mPaM(*rPaM.GetMark(), *rPaM.GetPoint()) - , mItemSet(rPaM.GetDoc().GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_PARATR_END - 1>{}) + , mItemSet(rPaM.GetDoc().GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_PARATR_END - 1>) { } @@ -2456,7 +2456,7 @@ eF_ResT SwWW8ImplReader::Read_F_IncludePicture( WW8FieldDesc*, OUString& rStr ) inserted into the frame format. */ SfxItemSet aFlySet( m_rDoc.GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, - RES_FRMATR_END-1>{} ); + RES_FRMATR_END-1> ); aFlySet.Put( SwFormatAnchor( RndStdIds::FLY_AS_CHAR ) ); aFlySet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME )); m_pFlyFormatOfJustInsertedGraphic = @@ -3448,7 +3448,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr ) if ( nIndexCols > 1 ) { // Set the column number for index - SfxItemSet aSet( m_rDoc.GetAttrPool(), svl::Items<RES_COL, RES_COL>{} ); + SfxItemSet aSet( m_rDoc.GetAttrPool(), svl::Items<RES_COL, RES_COL> ); SwFormatCol aCol; aCol.Init( nIndexCols, 708, USHRT_MAX ); aSet.Put( aCol ); diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index b391f6ca1cc4..572a33823713 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2142,7 +2142,7 @@ void WW8SwFlyPara::BoxUpWidth( tools::Long nInWidth ) // WW8FlySet-ctor for Apos and graphics Apos WW8FlySet::WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW, const WW8SwFlyPara* pFS, bool bGraf) - : SfxItemSet(rReader.m_rDoc.GetAttrPool(),svl::Items<RES_FRMATR_BEGIN,RES_FRMATR_END-1>{}) + : SfxItemSet(rReader.m_rDoc.GetAttrPool(),svl::Items<RES_FRMATR_BEGIN,RES_FRMATR_END-1>) { Reader::ResetFrameFormatAttrs(*this); // remove distance/border // position @@ -2197,7 +2197,7 @@ WW8FlySet::WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW, // WW8FlySet-ctor for character bound graphics WW8FlySet::WW8FlySet( SwWW8ImplReader& rReader, const SwPaM* pPaM, const WW8_PIC& rPic, tools::Long nWidth, tools::Long nHeight ) - : SfxItemSet(rReader.m_rDoc.GetAttrPool(),svl::Items<RES_FRMATR_BEGIN,RES_FRMATR_END-1>{}) + : SfxItemSet(rReader.m_rDoc.GetAttrPool(),svl::Items<RES_FRMATR_BEGIN,RES_FRMATR_END-1>) { Init(rReader, pPaM); @@ -2249,8 +2249,8 @@ void WW8FlySet::Init(const SwWW8ImplReader& rReader, const SwPaM* pPaM) WW8DupProperties::WW8DupProperties(SwDoc &rDoc, SwWW8FltControlStack *pStack) : pCtrlStck(pStack), - aChrSet(rDoc.GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1>{} ), - aParSet(rDoc.GetAttrPool(), svl::Items<RES_PARATR_BEGIN, RES_PARATR_END - 1>{} ) + aChrSet(rDoc.GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_END - 1> ), + aParSet(rDoc.GetAttrPool(), svl::Items<RES_PARATR_BEGIN, RES_PARATR_END - 1> ) { //Close any open character properties and duplicate them inside the //first table cell @@ -2449,7 +2449,7 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo, const WW8_TablePos *p if (IsDropCap()) { m_bDropCap = true; - m_xCurrentItemSet.reset(new SfxItemSet(m_rDoc.GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_PARATR_END - 1>{})); + m_xCurrentItemSet.reset(new SfxItemSet(m_rDoc.GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_PARATR_END - 1>)); return false; } diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index b24748a82873..9dffac99c8c2 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -533,7 +533,7 @@ SvXMLImportContext *SwXMLItemSetStyleContext_Impl::CreateItemSetContext( m_pItemSet.reset( new SfxItemSet( rItemPool, aTableSetRange ) ); break; case XmlStyleFamily::TABLE_COLUMN: - m_pItemSet.reset( new SfxItemSet( rItemPool, svl::Items<RES_FRM_SIZE, RES_FRM_SIZE>{} ) ); + m_pItemSet.reset( new SfxItemSet( rItemPool, svl::Items<RES_FRM_SIZE, RES_FRM_SIZE> ) ); break; case XmlStyleFamily::TABLE_ROW: m_pItemSet.reset( new SfxItemSet( rItemPool, aTableLineSetRange ) ); diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index be863f65bfa3..97b1fbd9e1f2 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -241,7 +241,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( SwDoc *pDoc = SwImport::GetDocFromXMLImport( rImport ); SfxItemSet aItemSet( pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, - RES_FRMATR_END>{} ); + RES_FRMATR_END> ); Size aTwipSize( 0, 0 ); tools::Rectangle aVisArea( 0, 0, nWidth, nHeight ); lcl_putHeightAndWidth( aItemSet, nHeight, nWidth, @@ -553,7 +553,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink( SwDoc *pDoc = SwImport::GetDocFromXMLImport( rImport ); SfxItemSet aItemSet( pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, - RES_FRMATR_END>{} ); + RES_FRMATR_END> ); Size aTwipSize( 0, 0 ); lcl_putHeightAndWidth( aItemSet, nHeight, nWidth, &aTwipSize ); @@ -645,7 +645,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet( SwDoc *pDoc = pTextCursor->GetDoc(); SfxItemSet aItemSet( pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, - RES_FRMATR_END>{} ); + RES_FRMATR_END> ); lcl_putHeightAndWidth( aItemSet, nHeight, nWidth); SwApplet_Impl aAppletImpl ( aItemSet ); @@ -691,7 +691,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin( SwDoc *pDoc = pTextCursor->GetDoc(); SfxItemSet aItemSet( pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, - RES_FRMATR_END>{} ); + RES_FRMATR_END> ); lcl_putHeightAndWidth( aItemSet, nHeight, nWidth); // We'll need a (valid) URL, or we need a MIME type. If we don't have @@ -772,7 +772,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra SwDoc *pDoc = pTextCursor->GetDoc(); SfxItemSet aItemSet( pDoc->GetAttrPool(), svl::Items<RES_FRMATR_BEGIN, - RES_FRMATR_END>{} ); + RES_FRMATR_END> ); lcl_putHeightAndWidth( aItemSet, nHeight, nWidth); ScrollingMode eScrollMode = ScrollingMode::Auto; diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index f3ca8162ee15..4a251c8eb98e 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -55,7 +55,7 @@ using namespace css; using namespace css::uno; using namespace css::lang; -const WhichRangesContainer SwDropCapsPage::aPageRg(svl::Items<RES_PARATR_DROP, RES_PARATR_DROP>::value); +const WhichRangesContainer SwDropCapsPage::aPageRg(svl::Items<RES_PARATR_DROP, RES_PARATR_DROP>); void SwDropCapsPict::SetText( const OUString& rT ) { diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index a40521c817bc..e57009b3b1fb 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -32,7 +32,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/viewsh.hxx> -const WhichRangesContainer SwParagraphNumTabPage::aPageRg(svl::Items<FN_NUMBER_NEWSTART, FN_NUMBER_NEWSTART_AT>::value); +const WhichRangesContainer SwParagraphNumTabPage::aPageRg(svl::Items<FN_NUMBER_NEWSTART, FN_NUMBER_NEWSTART_AT>); SwParagraphNumTabPage::SwParagraphNumTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr) : SfxTabPage(pPage, pController, "modules/swriter/ui/numparapage.ui", "NumParaPage", &rAttr) diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 44b57bd86231..ad6670d14d87 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -230,7 +230,7 @@ void SwParaDlg::PageCreated(const OString& rId, SfxTabPage& rPage) { SfxItemSet aNew(*aSet.GetPool(), svl::Items<SID_COLOR_TABLE, SID_PATTERN_LIST, - SID_OFFER_IMPORT, SID_OFFER_IMPORT>{}); + SID_OFFER_IMPORT, SID_OFFER_IMPORT>); aNew.Put(*GetInputSetImpl()); diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 8f831b24b84f..f94db2ebaee0 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -32,7 +32,7 @@ #include <swuiccoll.hxx> -const WhichRangesContainer SwCondCollPage::m_aPageRg(svl::Items<FN_COND_COLL, FN_COND_COLL>::value); +const WhichRangesContainer SwCondCollPage::m_aPageRg(svl::Items<FN_COND_COLL, FN_COND_COLL>); SwCondCollPage::SwCondCollPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet) : SfxTabPage(pPage, pController, "modules/swriter/ui/conditionpage.ui", "ConditionPage", &rSet) diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 3868c8b76246..dabbf26d13d6 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -757,7 +757,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) { auto pPrinterSet = std::make_unique<SfxItemSet>( *rSet->GetPool(), svl::Items<SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, - SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC>{} ); + SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC> ); m_pPrt = VclPtr<SfxPrinter>::Create(std::move(pPrinterSet)); m_bDisposePrinter = true; } diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index c057865aa1d2..52eae95f3b85 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -997,7 +997,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, SetTabSet(); SfxItemSet aTableSet( rSh.GetAttrPool(), svl::Items<RES_BOXATR_FORMAT, - RES_BOXATR_VALUE>{} ); + RES_BOXATR_VALUE> ); bool bIsAutoUpdateCells = rSh.IsAutoUpdateCells(); rSh.SetAutoUpdateCells( false ); diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 7d12b35e5e68..a6a32ddd76cb 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -260,7 +260,7 @@ SwFrameFormat* SwMailMergeLayoutPage::InsertAddressFrame( svl::Items< RES_FRM_SIZE, RES_FRM_SIZE, RES_SURROUND, RES_ANCHOR, - RES_BOX, RES_BOX>{} ); + RES_BOX, RES_BOX> ); aSet.Put(SwFormatAnchor(RndStdIds::FLY_AT_PAGE, 1)); if(bAlignLeft) aSet.Put(SwFormatHoriOrient( 0, text::HoriOrientation::NONE, text::RelOrientation::PAGE_PRINT_AREA )); @@ -659,7 +659,7 @@ IMPL_LINK_NOARG(SwMailMergeLayoutPage, ChangeAddressHdl_Impl, weld::MetricSpinBu SfxItemSet aSet( m_pExampleWrtShell->GetAttrPool(), - svl::Items<RES_VERT_ORIENT, RES_ANCHOR>{}); + svl::Items<RES_VERT_ORIENT, RES_ANCHOR>); if (m_xAlignToBodyCB->get_active()) aSet.Put(SwFormatHoriOrient( 0, text::HoriOrientation::NONE, text::RelOrientation::PAGE_PRINT_AREA )); else diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index c46faff19fde..5ed597d7fc83 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -197,7 +197,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent, SwDocShell& rDocSh, { auto pSet = std::make_unique<SfxItemSet>( rDocSh.GetPool(), svl::Items<SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, - SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC>{} ); + SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC> ); pPrt = VclPtr<SfxPrinter>::Create( std::move(pSet) ); bDelPrinter = true; } diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx index 3edef40ea524..0b1f89a8320d 100644 --- a/sw/source/ui/dialog/macassgn.cxx +++ b/sw/source/ui/dialog/macassgn.cxx @@ -104,7 +104,7 @@ bool SwMacroAssignDlg::INetFormatDlg(weld::Window* pParent, SwWrtShell& rSh, std::unique_ptr<SvxMacroItem>& rpINetItem ) { bool bRet = false; - SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_FRMMACRO, RES_FRMMACRO, SID_EVENTCONFIG, SID_EVENTCONFIG>{} ); + SfxItemSet aSet( rSh.GetAttrPool(), svl::Items<RES_FRMMACRO, RES_FRMMACRO, SID_EVENTCONFIG, SID_EVENTCONFIG> ); SvxMacroItem aItem( RES_FRMMACRO ); if( !rpINetItem ) rpINetItem.reset(new SvxMacroItem( RES_FRMMACRO )); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index fd0d32801caa..edc96fa6ba13 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1001,7 +1001,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl, weld::Button&, void) 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>); aSet.Put( pSectRepr->GetCol() ); aSet.Put( *pSectRepr->GetBackground() ); diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index ae653bfa30af..5df8d7d5abd2 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -265,7 +265,7 @@ SfxItemSet *SwEnvFormatPage::GetCollItemSet(SwTextFormatColl const * pColl, bool SID_ATTR_TABSTOP_POS, SID_ATTR_TABSTOP_POS, SID_ATTR_TABSTOP_OFFSET, SID_ATTR_TABSTOP_OFFSET, SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER - >::value); + >); pAddrSet.reset(new SfxItemSet(GetParentSwEnvDlg()->pSh->GetView().GetCurShell()->GetPool(), pRanges)); diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 9f89d61d3514..74d14dbdb296 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -188,7 +188,7 @@ SfxTabPage* SwFieldEditDlg::CreatePage(sal_uInt16 nGroup) case GRP_REG: { SfxObjectShell* pDocSh = SfxObjectShell::Current(); - SfxItemSet* pSet = new SfxItemSet( pDocSh->GetPool(), svl::Items<SID_DOCINFO, SID_DOCINFO>{} ); + SfxItemSet* pSet = new SfxItemSet( pDocSh->GetPool(), svl::Items<SID_DOCINFO, SID_DOCINFO> ); using namespace ::com::sun::star; uno::Reference<document::XDocumentPropertiesSupplier> xDPS( pDocSh->GetModel(), uno::UNO_QUERY_THROW); @@ -298,7 +298,7 @@ IMPL_LINK_NOARG(SwFieldEditDlg, AddressHdl, weld::Button&, void) SwField *pCurField = rMgr.GetCurField(); SfxItemSet aSet( pSh->GetAttrPool(), - svl::Items<SID_FIELD_GRABFOCUS, SID_FIELD_GRABFOCUS>{} ); + svl::Items<SID_FIELD_GRABFOCUS, SID_FIELD_GRABFOCUS> ); EditPosition nEditPos = EditPosition::UNKNOWN; diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 70d69203af14..150304bd508c 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -126,7 +126,7 @@ SfxItemSet* SwFieldDlg::CreateInputItemSet(const OString& rID) SwDocShell *const pDocSh(static_cast<SwDocShell*>(SfxObjectShell::Current())); if (rID == "docinfo" && pDocSh) // might not have a shell if the dialog is restored on startup { - mxInputItemSet = std::make_unique<SfxItemSet>( pDocSh->GetPool(), svl::Items<SID_DOCINFO, SID_DOCINFO>{} ); + mxInputItemSet = std::make_unique<SfxItemSet>( pDocSh->GetPool(), svl::Items<SID_DOCINFO, SID_DOCINFO> ); using namespace ::com::sun::star; uno::Reference<document::XDocumentPropertiesSupplier> xDPS( pDocSh->GetModel(), uno::UNO_QUERY_THROW); diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index bce89696efce..467964929539 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -98,9 +98,9 @@ SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell& rSh) m_nSelectionWidth = aRect.Width(); SfxItemSet* pColPgSet = nullptr; - static svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, + static const auto aSectIds = svl::Items<RES_FRM_SIZE, RES_FRM_SIZE, RES_COL, RES_COL, - RES_COLUMNBALANCE, RES_FRAMEDIR> const aSectIds; + RES_COLUMNBALANCE, RES_FRAMEDIR>; const SwSection* pCurrSection = m_rWrtShell.GetCurrSection(); const sal_uInt16 nFullSectCnt = m_rWrtShell.GetFullSelectedSectionCount(); @@ -139,7 +139,7 @@ SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell& rSh) svl::Items< RES_FRM_SIZE, RES_FRM_SIZE, RES_LR_SPACE, RES_LR_SPACE, - RES_COL, RES_COL>{}) ); + RES_COL, RES_COL>) ); const SwFrameFormat &rFormat = pPageDesc->GetMaster(); m_nPageWidth = rFormat.GetFrameSize().GetSize().Width(); @@ -295,7 +295,7 @@ IMPL_LINK_NOARG(SwColumnDlg, OkHdl, weld::Button&, void) } if(m_pFrameSet && SfxItemState::SET == m_pFrameSet->GetItemState(RES_COL) && m_bFrameChanged) { - SfxItemSet aTmp(*m_pFrameSet->GetPool(), svl::Items<RES_COL, RES_COL>{}); + SfxItemSet aTmp(*m_pFrameSet->GetPool(), svl::Items<RES_COL, RES_COL>); aTmp.Put(*m_pFrameSet); m_rWrtShell.StartAction(); m_rWrtShell.Push(); @@ -351,7 +351,7 @@ sal_uInt16 GetMaxWidth( SwColMgr const * pColMgr, sal_uInt16 nCols ) return nMax; } -const WhichRangesContainer SwColumnPage::aPageRg(svl::Items<RES_COL, RES_COL>::value); +const WhichRangesContainer SwColumnPage::aPageRg(svl::Items<RES_COL, RES_COL>); void SwColumnPage::ResetColWidth() { diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index f2f13a682166..bb3f07287e6b 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -176,7 +176,7 @@ void SwFrameDlg::PageCreated(const OString& rId, SfxTabPage &rPage) { SfxItemSet aNew(*GetInputSetImpl()->GetPool(), svl::Items<SID_COLOR_TABLE, SID_PATTERN_LIST, - SID_OFFER_IMPORT, SID_OFFER_IMPORT>{}); + SID_OFFER_IMPORT, SID_OFFER_IMPORT>); aNew.Put(m_rSet); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 8569230bd78b..5e5629495687 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -392,14 +392,14 @@ const WhichRangesContainer SwFramePage::aPageRg(svl::Items< RES_VERT_ORIENT, RES_ANCHOR, RES_COL, RES_COL, RES_FOLLOW_TEXT_FLOW, RES_FOLLOW_TEXT_FLOW ->::value); +>); const WhichRangesContainer SwFrameAddPage::aAddPgRg(svl::Items< RES_PRINT, RES_PRINT, RES_PROTECT, RES_PROTECT, FN_SET_FRM_NAME, FN_SET_FRM_NAME, FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME, FN_UNO_DESCRIPTION, FN_UNO_DESCRIPTION ->::value); +>); static size_t lcl_GetFrameMapCount( const FrameMap* pMap) { diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index cbd87585f19a..e9e8a28f3c33 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -48,7 +48,7 @@ const WhichRangesContainer SwWrapTabPage::m_aWrapPageRg(svl::Items< RES_LR_SPACE, RES_UL_SPACE, RES_PRINT, RES_PRINT, RES_PROTECT, RES_SURROUND ->::value); +>); SwWrapDlg::SwWrapDlg(weld::Window* pParent, SfxItemSet& rSet, SwWrtShell* pWrtShell, bool bDrawMode) : SfxSingleTabDialogController(pParent, &rSet, "modules/swriter/ui/wrapdialog.ui", "WrapDialog") diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index dbc733d87d1e..242539430c1b 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -54,7 +54,7 @@ void SwFootNoteOptionDlg::PageCreated(const OString& /*rId*/, SfxTabPage &rPage) IMPL_LINK(SwFootNoteOptionDlg, OkHdl, weld::Button&, rBtn, void) { - SfxItemSet aDummySet(rSh.GetAttrPool(), svl::Items<1, 1>{} ); + SfxItemSet aDummySet(rSh.GetAttrPool(), svl::Items<1, 1> ); SfxTabPage *pPage = GetTabPage("footnotes"); if ( pPage ) pPage->FillItemSet( &aDummySet ); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index e16564a24b59..e958762f975a 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -530,7 +530,7 @@ IMPL_LINK(SwGlossaryDlg, MenuHdl, const OString&, rItemIdent, void) } else if (rItemIdent == "macro") { - SfxItemSet aSet( m_pShell->GetAttrPool(), svl::Items<RES_FRMMACRO, RES_FRMMACRO, SID_EVENTCONFIG, SID_EVENTCONFIG>{} ); + SfxItemSet aSet( m_pShell->GetAttrPool(), svl::Items<RES_FRMMACRO, RES_FRMMACRO, SID_EVENTCONFIG, SID_EVENTCONFIG> ); SvxMacro aStart(OUString(), OUString(), STARBASIC); SvxMacro aEnd(OUString(), OUString(), STARBASIC); diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index a7b16b1e1868..4052882a65a1 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -50,7 +50,7 @@ void SwInsFootNoteDlg::Apply() if (m_rSh.SetCurFootnote( aNote ) && m_bExtCharAvailable) { m_rSh.Right(CRSR_SKIP_CHARS, true, 1, false ); - SfxItemSet aSet(m_rSh.GetAttrPool(), svl::Items<RES_CHRATR_FONT, RES_CHRATR_FONT>{}); + SfxItemSet aSet(m_rSh.GetAttrPool(), svl::Items<RES_CHRATR_FONT, RES_CHRATR_FONT>); m_rSh.GetCurAttr(aSet); const SvxFontItem &rFont = aSet.Get( RES_CHRATR_FONT ); SvxFontItem aFont( rFont.GetFamily(), m_aFontName, @@ -92,7 +92,7 @@ IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl, weld::Button&, void) { m_xNumberCharBtn->set_active(true); - SfxItemSet aSet(m_rSh.GetAttrPool(), svl::Items<RES_CHRATR_FONT, RES_CHRATR_FONT>{}); + SfxItemSet aSet(m_rSh.GetAttrPool(), svl::Items<RES_CHRATR_FONT, RES_CHRATR_FONT>); m_rSh.GetCurAttr( aSet ); const SvxFontItem &rFont = aSet.Get( RES_CHRATR_FONT ); @@ -200,7 +200,7 @@ void SwInsFootNoteDlg::Init() sNumStr = aFootnoteNote.GetNumStr(); m_rSh.Right(CRSR_SKIP_CHARS, true, 1, false ); - SfxItemSet aSet(m_rSh.GetAttrPool(), svl::Items<RES_CHRATR_FONT, RES_CHRATR_FONT>{}); + SfxItemSet aSet(m_rSh.GetAttrPool(), svl::Items<RES_CHRATR_FONT, RES_CHRATR_FONT>); m_rSh.GetCurAttr(aSet); const SvxFontItem &rFont = aSet.Get( RES_CHRATR_FONT ); aFont = m_xNumberCharEdit->get_font(); diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index e644feffd109..741cd51802d4 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; -const WhichRangesContainer SwFootNotePage::aPageRg(svl::Items<FN_PARAM_FTN_INFO, FN_PARAM_FTN_INFO>::value); +const WhichRangesContainer SwFootNotePage::aPageRg(svl::Items<FN_PARAM_FTN_INFO, FN_PARAM_FTN_INFO>); // handler to switch between the different possibilities how the footnote // region's height can be set. diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 34771ba1313f..32186b8a8895 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -325,7 +325,7 @@ void SwTextGridPage::SetLinesOrCharsRanges(weld::Label& rField, const sal_Int32 WhichRangesContainer SwTextGridPage::GetRanges() { - return WhichRangesContainer(svl::Items<RES_TEXTGRID, RES_TEXTGRID>::value); + return WhichRangesContainer(svl::Items<RES_TEXTGRID, RES_TEXTGRID>); } IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, weld::SpinButton&, rField, void) diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 03a630a13a28..b5fce662d5cc 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -22,7 +22,7 @@ namespace bool lcl_GetPageDesc(SwWrtShell& rSh, sal_uInt16 &rPageNo, std::unique_ptr<const SwFormatPageDesc>* ppPageFormatDesc) { bool bRet = false; - SfxItemSet aSet(rSh.GetAttrPool(), svl::Items<RES_PAGEDESC, RES_PAGEDESC>{}); + SfxItemSet aSet(rSh.GetAttrPool(), svl::Items<RES_PAGEDESC, RES_PAGEDESC>); if (rSh.GetCurAttr(aSet)) { const SfxPoolItem* pItem(nullptr); 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 ); |