From 95c28f1faab14a7caf3ce8d90d9df0c5ec373ffd Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sun, 19 Apr 2026 23:16:25 +0200 Subject: [PATCH] Related tdf#164685: Cleanup class SfxItemSetFixed (sw remnants) Change-Id: Ideb392dadad9dabc08d978bdc23ecc4cc671c7c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/203940 Reviewed-by: Julien Nabet Tested-by: Jenkins --- sw/source/core/docnode/node.cxx | 8 ++++---- sw/source/core/text/redlnitr.cxx | 2 +- sw/source/core/unocore/unoframe.cxx | 4 ++-- sw/source/core/unocore/unoobj.cxx | 4 ++-- sw/source/core/unocore/unoport.cxx | 4 ++-- sw/source/core/unocore/unostyle.cxx | 6 +++--- sw/source/core/unocore/unotbl.cxx | 4 ++-- sw/source/filter/ww8/ww8par3.cxx | 2 +- sw/source/ui/chrdlg/pardlg.cxx | 4 ++-- sw/source/ui/config/optpage.cxx | 4 ++-- sw/source/ui/dialog/ascfldlg.cxx | 4 ++-- sw/source/ui/fldui/fldedt.cxx | 2 +- sw/source/ui/fldui/fldtdlg.cxx | 2 +- sw/source/ui/frmdlg/column.cxx | 4 ++-- sw/source/ui/misc/glossary.cxx | 2 +- sw/source/uibase/docvw/PostItMgr.cxx | 2 +- sw/source/uibase/misc/glshell.cxx | 6 +++--- sw/source/uibase/shells/tabsh.cxx | 2 +- sw/source/uibase/shells/textsh1.cxx | 4 ++-- sw/source/uibase/uiview/formatclipboard.cxx | 20 ++++++++++---------- sw/source/uibase/uno/SwXDocumentSettings.cxx | 4 ++-- 21 files changed, 47 insertions(+), 47 deletions(-) diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index e846b56b87a9..2c2f42b8ff6d 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -163,10 +163,10 @@ static bool Put( std::shared_ptr& rpAttrSet, const SwContentNod SwAttrSet aNewSet( *rpAttrSet ); // #i76273# Robust - std::optional> pStyleNames; + std::optional pStyleNames; if ( SfxItemState::SET == rSet.GetItemState( RES_FRMATR_STYLE_NAME, false ) ) { - pStyleNames.emplace( *aNewSet.GetPool() ); + pStyleNames.emplace( *aNewSet.GetPool(), WhichRangesContainer(svl::Items)); pStyleNames->Put( aNewSet ); } @@ -210,10 +210,10 @@ static bool Put_BC( std::shared_ptr& rpAttrSet, SwAttrSet aNewSet( *rpAttrSet ); // #i76273# Robust - std::optional> pStyleNames; + std::optional pStyleNames; if ( SfxItemState::SET == rSet.GetItemState( RES_FRMATR_STYLE_NAME, false ) ) { - pStyleNames.emplace( *aNewSet.GetPool() ); + pStyleNames.emplace( *aNewSet.GetPool(), WhichRangesContainer(svl::Items)); pStyleNames->Put( aNewSet ); } diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index 90e05b183ca9..34a178c235a1 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -935,7 +935,7 @@ short SwRedlineItr::Seek(SwFont& rFnt, { SwAttrPool& rPool = const_cast(m_rDoc).GetAttrPool(); - m_pSet = std::make_unique>(rPool); + m_pSet = std::make_unique(SfxItemSet::makeFixedSfxItemSet(rPool)); } if( 1 < pRed->GetStackCount() ) diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 25c04f2b3c3b..f96fd6d82223 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1703,13 +1703,13 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& { // standard UNO API write attributes // adapt former attr from SvxBrushItem::PutValue to new items XATTR_FILL_FIRST, XATTR_FILL_LAST - SfxItemSetFixed + SfxItemSet aSet(SfxItemSet::makeFixedSfxItemSet - aSet( rDoc.GetAttrPool()); + ( rDoc.GetAttrPool())); bool bDone(false); aSet.SetParent(&pFormat->GetAttrSet()); diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 3cb461002f4b..a7729fc0f05b 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -519,11 +519,11 @@ SwUnoCursorHelper::SetCursorPropertyValue( // TODO create own map for this, it contains UNO_NAME_DISPLAY_NAME? or make property readable so ODF export can map it to a automatic style? SfxItemPropertySet const& rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_CHAR_AUTO_STYLE)); SfxItemPropertyMap const& rMap(rPropSet.getPropertyMap()); - SfxItemSetFixed + SfxItemSet items(SfxItemSet::makeFixedSfxItemSet - items( rPam.GetDoc().GetAttrPool() ); + ( rPam.GetDoc().GetAttrPool() )); for (beans::NamedValue const& prop : props) { diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index 86ba75fc7280..c9c2fdbf25a6 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -395,10 +395,10 @@ void SwXTextPortion::GetPropertyValue( { if(!pSet) { - pSet = std::make_unique(SfxItemSet::makeFixedSfxItemSet< RES_CHRATR_BEGIN, RES_FRMATR_END - 1, RES_UNKNOWNATR_CONTAINER, - RES_UNKNOWNATR_CONTAINER>>(pUnoCursor->GetDoc().GetAttrPool()); + RES_UNKNOWNATR_CONTAINER>(pUnoCursor->GetDoc().GetAttrPool())); SwUnoCursorHelper::GetCursorAttr(*pUnoCursor, *pSet); } SfxItemPropertySet::getPropertyValue(rEntry, *pSet, rVal); diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 9dafb1f1501e..727623419cf6 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -3048,7 +3048,7 @@ void SwXPageStyle::SetPropertyValues_Impl(const uno::Sequence& rProper else if(pEntry->nWID == SID_ATTR_PAGE_ON && rValues[nProp].get()) { // Header/footer gets switched on, create defaults and the needed SfxSetItem - SfxItemSetFixed + SfxItemSet aTempSet(SfxItemSet::makeFixedSfxItemSet & rProper 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> - aTempSet(*aBaseImpl.GetItemSet().GetPool()); + (*aBaseImpl.GetItemSet().GetPool())); // set correct parent to get the XFILL_NONE FillStyle as needed aTempSet.SetParent(&GetDoc()->GetDfltFrameFormat()->GetAttrSet()); @@ -3934,7 +3934,7 @@ SwAutoStylesEnumImpl::SwAutoStylesEnumImpl( SwDoc& rInitDoc, IStyleAccess::SwAut std::pair< sal_uInt16, text::RubyAdjust > aPair( rRubyItem.GetPosition(), rRubyItem.GetAdjustment() ); if ( aRubyMap.insert( aPair ).second ) { - auto pItemSet = std::make_shared>( rAttrPool ); + auto pItemSet = std::make_shared(SfxItemSet::makeFixedSfxItemSet( rAttrPool )); pItemSet->Put( rRubyItem ); mAutoStyles.push_back( pItemSet ); } diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index d8c75dee51ae..5a682213ab02 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -1718,10 +1718,10 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName) break; default: { - SfxItemSetFixed + SfxItemSet aSet(SfxItemSet::makeFixedSfxItemSet - aSet(rTableCursor.GetDoc().GetAttrPool()); + (rTableCursor.GetDoc().GetAttrPool())); SwUnoCursorHelper::GetCursorAttr(rTableCursor.GetSelRing(), aSet); SfxItemPropertySet::getPropertyValue(*pEntry, aSet, aResult); } diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 229eb80582db..ca530d1584ab 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -818,7 +818,7 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, std::unique_ptr( m_rDoc.GetAttrPool() )); + rpItemSet.reset(new SfxItemSet(SfxItemSet::makeFixedSfxItemSet( m_rDoc.GetAttrPool() ))); // Set Reader-ItemSet-Pointer to the newly created set m_rReader.SetCurrentItemSet(std::move(rpItemSet)); diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 57d901fabc85..a37d58dbd674 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -231,9 +231,9 @@ void SwParaDlg::PageCreated(const OUString& rId, SfxTabPage& rPage) // demand, but could also be directly added from the DrawModel. else if (rId == "area") { - SfxItemSetFixed + SfxItemSet aNew(SfxItemSet::makeFixedSfxItemSet aNew(*aSet.GetPool()); + SID_OFFER_IMPORT, SID_OFFER_IMPORT> (*aSet.GetPool())); aNew.Put(*GetInputSetImpl()); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 6dfa07f7248e..2472ce797da0 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1108,9 +1108,9 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) } else { - auto pPrinterSet = std::make_unique(SfxItemSet::makeFixedSfxItemSet >( *rSet->GetPool() ); + SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC>( *rSet->GetPool() )); m_pPrt = VclPtr::Create(std::move(pPrinterSet)); m_bDisposePrinter = true; } diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 9f9d4665c1c4..f2436e95fe3e 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -198,9 +198,9 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent, SwDocShell& rDocSh, VclPtr pPrt = pDoc ? pDoc->getIDocumentDeviceAccess().getPrinter(false) : nullptr; if( !pPrt ) { - auto pSet = std::make_unique(SfxItemSet::makeFixedSfxItemSet >( rDocSh.GetPool() ); + SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC>( rDocSh.GetPool() )); pPrt = VclPtr::Create( std::move(pSet) ); bDelPrinter = true; } diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 2d64544f511c..25285893d6e0 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -196,7 +196,7 @@ SfxTabPage* SwFieldEditDlg::CreatePage(SwFieldGroup nGroup) case SwFieldGroup::DocInfos: if (SfxObjectShell* pDocSh = SfxObjectShell::Current()) { - auto pSet = new SfxItemSetFixed( pDocSh->GetPool() ); + auto pSet = new SfxItemSet(SfxItemSet::makeFixedSfxItemSet( pDocSh->GetPool() )); using namespace ::com::sun::star; uno::Reference xDPS( pDocSh->GetModel(), uno::UNO_QUERY_THROW); diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 3188a6e8494a..960f6f2303e0 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -137,7 +137,7 @@ SfxItemSet* SwFieldDlg::CreateInputItemSet(const OUString& rID) SwDocShell *const pDocSh(static_cast(SfxObjectShell::Current())); if (rID == "docinfo" && pDocSh) // might not have a shell if the dialog is restored on startup { - mxInputItemSet = std::make_unique>( pDocSh->GetPool() ); + mxInputItemSet = std::make_unique(SfxItemSet::makeFixedSfxItemSet( pDocSh->GetPool() )); using namespace ::com::sun::star; uno::Reference xDPS( pDocSh->GetModel(), uno::UNO_QUERY_THROW); diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 29e6918b8c52..2850073956bc 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -138,10 +138,10 @@ SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell& rSh) const SwPageDesc* pPageDesc = m_rWrtShell.GetSelectedPageDescs(); if( pPageDesc ) { - m_pPageSet = std::make_unique(SfxItemSet::makeFixedSfxItemSet< RES_FRM_SIZE, RES_FRM_SIZE, RES_LR_SPACE, RES_LR_SPACE, - RES_COL, RES_COL>>(m_rWrtShell.GetAttrPool()); + RES_COL, RES_COL>(m_rWrtShell.GetAttrPool())); const SwFrameFormat &rFormat = pPageDesc->GetMaster(); m_nPageWidth = rFormat.GetFrameSize().GetSize().Width(); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 39ea38fe11b8..a4bd4a4497ca 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -645,7 +645,7 @@ IMPL_LINK(SwGlossaryDlg, MenuHdl, const OUString&, rItemIdent, void) } else if (rItemIdent == "macro") { - auto xSet = std::make_unique>( m_pShell->GetAttrPool() ); + auto xSet = std::make_unique(SfxItemSet::makeFixedSfxItemSet( m_pShell->GetAttrPool() )); SvxMacro aStart(OUString(), OUString(), STARBASIC); SvxMacro aEnd(OUString(), OUString(), STARBASIC); diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 91729bc48205..1b67592fc290 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -1968,7 +1968,7 @@ void SwPostItMgr::ExecuteFormatAllDialog(SwView& rView) OutlinerView* pOLV = pWin->GetOutlinerView(); SfxItemSet aEditAttr(pOLV->GetAttribs()); SfxItemPool* pPool(SwAnnotationShell::GetAnnotationPool(rView)); - auto xDlgAttr = std::make_shared>(*pPool); + auto xDlgAttr = std::make_shared(SfxItemSet::makeFixedSfxItemSet(*pPool)); xDlgAttr->Put(aEditAttr); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); VclPtr pDlg(pFact->CreateSwCharDlg(rView.GetFrameWeld(), rView, *xDlgAttr, SwCharDlgMode::Ann)); diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx index 453f84246253..b3465085aa4e 100644 --- a/sw/source/uibase/misc/glshell.cxx +++ b/sw/source/uibase/misc/glshell.cxx @@ -238,11 +238,11 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const OUString& rGroup, const OUString { // we create a default SfxPrinter. // ItemSet is deleted by Sfx! - auto pSet = std::make_unique(SfxItemSet::makeFixedSfxItemSet< SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, - FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER>> - ( xDocSh->GetDoc()->GetAttrPool() ); + FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER> + ( xDocSh->GetDoc()->GetAttrPool() )); VclPtr pPrinter = VclPtr::Create( std::move(pSet) ); // and append it to the document. diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index dc14e3232f59..3b2ba15fda60 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -702,7 +702,7 @@ void SwTableShell::Execute(SfxRequest &rReq) FieldUnit eMetric = ::GetDfltMetric(dynamic_cast( pView) != nullptr ); SwModule::get()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric))); SvNumberFormatter* pFormatter = rSh.GetNumberFormatter(); - auto pCoreSet = std::make_shared>( GetPool() ); + auto pCoreSet = std::make_shared(SfxItemSet::makeFixedSfxItemSet( GetPool() )); SfxItemSet aBoxSet(SfxItemSet::makeFixedSfxItemSet( *pCoreSet->GetPool() )); diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 1e39c0398015..87a8a6ff70bc 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -178,14 +178,14 @@ static void sw_CharDialog(SwWrtShell& rWrtSh, bool bUseDialog, bool bApplyToPara { FieldUnit eMetric = ::GetDfltMetric(dynamic_cast( &rWrtSh.GetView()) != nullptr ); SwModule::get()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast(eMetric))); - auto pCoreSet = std::make_shared(SfxItemSet::makeFixedSfxItemSet< RES_CHRATR_BEGIN, RES_CHRATR_END - 1, RES_TXTATR_INETFMT, RES_TXTATR_INETFMT, RES_BACKGROUND, RES_SHADOW, 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>> ( rWrtSh.GetView().GetPool() ); + FN_PARAM_SELECTION, FN_PARAM_SELECTION> ( rWrtSh.GetView().GetPool() )); rWrtSh.GetCurAttr(*pCoreSet); bool bSel = rWrtSh.HasSelection(); diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx index e43a7a7bd768..1b1b69e9d8ce 100644 --- a/sw/source/uibase/uiview/formatclipboard.cxx +++ b/sw/source/uibase/uiview/formatclipboard.cxx @@ -48,7 +48,7 @@ std::unique_ptr lcl_CreateEmptyItemSet( SelectionType nSelectionType std::unique_ptr pItemSet; if( nSelectionType & (SelectionType::Frame | SelectionType::Ole | SelectionType::Graphic) ) { - pItemSet = std::make_unique(SfxItemSet::makeFixedSfxItemSet< RES_FRMATR_BEGIN, RES_FILL_ORDER, // no RES_FRM_SIZE RES_PAPER_BIN, RES_SURROUND, @@ -61,7 +61,7 @@ std::unique_ptr lcl_CreateEmptyItemSet( SelectionType nSelectionType // no RES_URL RES_EDIT_IN_READONLY, RES_LAYOUT_SPLIT, // no RES_CHAIN - RES_TEXTGRID, RES_FRMATR_END - 1>>(rPool); + RES_TEXTGRID, RES_FRMATR_END - 1>(rPool)); } else if( nSelectionType & SelectionType::DrawObject ) { @@ -70,10 +70,10 @@ std::unique_ptr lcl_CreateEmptyItemSet( SelectionType nSelectionType else if( nSelectionType & SelectionType::Text ) { if( bNoParagraphFormats ) - pItemSet = std::make_unique>(rPool); + pItemSet = std::make_unique(SfxItemSet::makeFixedSfxItemSet + (rPool)); else - pItemSet = std::make_unique(SfxItemSet::makeFixedSfxItemSet< RES_CHRATR_BEGIN, RES_CHRATR_END - 1, RES_PARATR_BEGIN, RES_FILL_ORDER, // no RES_FRM_SIZE @@ -87,7 +87,7 @@ std::unique_ptr lcl_CreateEmptyItemSet( SelectionType nSelectionType // no RES_URL RES_EDIT_IN_READONLY, RES_LAYOUT_SPLIT, // no RES_CHAIN - RES_TEXTGRID, RES_FRMATR_END - 1>>(rPool); + RES_TEXTGRID, RES_FRMATR_END - 1>(rPool)); } return pItemSet; } @@ -381,7 +381,7 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP if (nSelectionType & SelectionType::TableCell) { //only copy all table attributes if really cells are selected (not only text in tables) - m_pTableItemSet = std::make_unique(SfxItemSet::makeFixedSfxItemSet< RES_PAGEDESC, RES_BREAK, RES_BACKGROUND, RES_SHADOW, // RES_BOX is inbetween RES_KEEP, RES_KEEP, @@ -394,13 +394,13 @@ 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>>(rPool); + FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE>(rPool)); } else { //selection in table should copy number format - m_pTableItemSet = std::make_unique>(rPool); + m_pTableItemSet = std::make_unique(SfxItemSet::makeFixedSfxItemSet< + RES_BOXATR_FORMAT, RES_BOXATR_FORMAT>(rPool)); } lcl_getTableAttributes( *m_pTableItemSet, rWrtShell, nSelectionType & SelectionType::TableCell ? true : false); diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx index 7f157afc4a14..8e8e6e628fbb 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.cxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx @@ -500,11 +500,11 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf SvMemoryStream aStream (aSequence.getArray(), nSize, StreamMode::READ ); aStream.Seek ( STREAM_SEEK_TO_BEGIN ); - auto pItemSet = std::make_unique(SfxItemSet::makeFixedSfxItemSet< 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>>( mpDoc->GetAttrPool() ); + FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER>( mpDoc->GetAttrPool() )); VclPtr pPrinter = SfxPrinter::Create ( aStream, std::move(pItemSet) ); assert (! pPrinter->isDisposed() ); // set printer only once; in _postSetValues