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 /cui | |
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>
Diffstat (limited to 'cui')
27 files changed, 49 insertions, 49 deletions
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); +>); /************************************************************************* |* |