diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 92fb58399cd1..c346c4f96011 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -823,9 +823,8 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) pOutView->DrawText_ToEditView( tools::Rectangle() ); SfxItemSet aEmptyAttr(SfxItemSet::makeFixedSfxItemSet( *aEditAttr.GetPool() )); - SfxItemSetFixed aSizeAttr(*aEditAttr.GetPool()); - + SfxItemSet aSizeAttr(SfxItemSet::makeFixedSfxItemSet( *aEditAttr.GetPool() )); aSizeAttr.Put(pView->GetAttrFromMarked(true)); pView->SetAttributes( aEmptyAttr, true ); diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index 86da858b6c38..3df3921a0cb7 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -153,8 +153,8 @@ void ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq ) case SID_ATTR_PARA_LEFT_TO_RIGHT: case SID_ATTR_PARA_RIGHT_TO_LEFT: { - SfxItemSetFixed aAttr(pView->GetModel().GetItemPool()); + SfxItemSet aAttr(SfxItemSet::makeFixedSfxItemSet< EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR, + EE_PARA_JUST, EE_PARA_JUST>(pView->GetModel().GetItemPool())); 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 19fb390f4710..c72accf9429d 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -152,7 +152,7 @@ void FuConstCustomShape::SetAttributes( SdrObject* pObj ) if( pSourceObj ) { const SfxItemSet& rSource = pSourceObj->GetMergedItemSet(); - SfxItemSetFixed< + SfxItemSet aDest(SfxItemSet::makeFixedSfxItemSet< // Ranges from SdrAttrObj: SDRATTR_START, SDRATTR_SHADOW_LAST, SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, @@ -163,8 +163,8 @@ void FuConstCustomShape::SetAttributes( SdrObject* pObj ) SDRATTR_GRAF_FIRST, SDRATTR_CUSTOMSHAPE_LAST, // Range from SdrTextObj: - EE_ITEMS_START, EE_ITEMS_END> aDest( - pObj->getSdrModelFromSdrObject().GetItemPool()); + EE_ITEMS_START, EE_ITEMS_END> ( + pObj->getSdrModelFromSdrObject().GetItemPool())); aDest.Set( rSource ); pObj->SetMergedItemSet( aDest ); Degree100 nAngle = pSourceObj->GetRotateAngle(); diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 284ed81208d1..6a0178d46307 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -245,11 +245,11 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( { SvMemoryStream aStream (aSequence.getArray(), nSize, StreamMode::READ ); aStream.Seek ( STREAM_SEEK_TO_BEGIN ); - auto pSet = std::make_unique(SfxItemSet::makeFixedSfxItemSet >( *rDoc.GetPool()); + SID_SCPRINTOPTIONS, SID_SCPRINTOPTIONS>( *rDoc.GetPool())); SfxPrinter* pPrinter = pDocShell->GetPrinter(); bool bPreferPrinterPapersize = false; diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index f03596daa3e2..006d751cad93 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -298,8 +298,8 @@ std::shared_ptr ScTabViewShell::CreateRefDialogCont } case SID_OPENDLG_CONSOLIDATE: { - SfxItemSetFixed aArgSet( GetPool() ); + SfxItemSet aArgSet(SfxItemSet::makeFixedSfxItemSet ( GetPool() )); const ScConsolidateParam* pDlgData = rDoc.GetConsolidateDlgData(); @@ -366,8 +366,8 @@ std::shared_ptr ScTabViewShell::CreateRefDialogCont if (ScDBData* pDBData = GetDBData(false, SC_DB_MAKE, ScGetDBSelection::RowDown)) { ScQueryParam aQueryParam; - SfxItemSetFixed aArgSet( GetPool() ); + SfxItemSet aArgSet(SfxItemSet::makeFixedSfxItemSet ( GetPool() )); pDBData->ExtendDataArea(rDoc); pDBData->GetQueryParam( aQueryParam );