ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Related tdf#164685: Cleanup class SfxItemSetFixed (remaining cases in sc)

Browse Source 
Change-Id: I7c7bfcf0b348ebe885a4c68fbc7a37652ccfac8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/203888
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Jenkins
This commit is contained in:
Julien Nabet
2026-04-18 17:40:34 +02:00
parent a22ace7174
commit 44ff26976a
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc/source/ui/drawfunc/drtxtob.cxx
+2 -3
View File
@@ -823,9 +823,8 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
pOutView->DrawText_ToEditView( tools::Rectangle() );
SfxItemSet aEmptyAttr(SfxItemSet::makeFixedSfxItemSet<EE_ITEMS_START, EE_ITEMS_END>( *aEditAttr.GetPool() ));
SfxItemSetFixed<SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_MINFRAMEHEIGHT,
SDRATTR_TEXT_MAXFRAMEHEIGHT, SDRATTR_TEXT_MAXFRAMEWIDTH> aSizeAttr(*aEditAttr.GetPool());
SfxItemSet aSizeAttr(SfxItemSet::makeFixedSfxItemSet<SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_MINFRAMEHEIGHT,
SDRATTR_TEXT_MAXFRAMEHEIGHT, SDRATTR_TEXT_MAXFRAMEWIDTH>( *aEditAttr.GetPool() ));
aSizeAttr.Put(pView->GetAttrFromMarked(true));
pView->SetAttributes( aEmptyAttr, true );
sc/source/ui/drawfunc/drtxtob2.cxx
+2 -2
View File
@@ -153,8 +153,8 @@ void ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq )
case SID_ATTR_PARA_LEFT_TO_RIGHT:
case SID_ATTR_PARA_RIGHT_TO_LEFT:
{
SfxItemSetFixed<EE_PARA_WRITINGDIR, EE_PARA_WRITINGDIR,
EE_PARA_JUST, EE_PARA_JUST> 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,
sc/source/ui/drawfunc/fuconcustomshape.cxx
+3 -3
View File
@@ -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();
sc/source/ui/unoobj/confuno.cxx
+2 -2
View File
@@ -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<SfxItemSetFixed
auto pSet = std::make_unique<SfxItemSet>(SfxItemSet::makeFixedSfxItemSet
<SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN,
SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC,
SID_PRINT_SELECTEDSHEET, SID_PRINT_SELECTEDSHEET,
SID_SCPRINTOPTIONS, SID_SCPRINTOPTIONS>>( *rDoc.GetPool());
SID_SCPRINTOPTIONS, SID_SCPRINTOPTIONS>( *rDoc.GetPool()));
SfxPrinter* pPrinter = pDocShell->GetPrinter();
bool bPreferPrinterPapersize = false;
sc/source/ui/view/tabvwshc.cxx
+4 -4
View File
@@ -298,8 +298,8 @@ std::shared_ptr<SfxModelessDialogController> ScTabViewShell::CreateRefDialogCont
}
case SID_OPENDLG_CONSOLIDATE:
{
SfxItemSetFixed<SCITEM_CONSOLIDATEDATA,
SCITEM_CONSOLIDATEDATA> aArgSet( GetPool() );
SfxItemSet aArgSet(SfxItemSet::makeFixedSfxItemSet<SCITEM_CONSOLIDATEDATA,
SCITEM_CONSOLIDATEDATA> ( GetPool() ));
const ScConsolidateParam* pDlgData =
rDoc.GetConsolidateDlgData();
@@ -366,8 +366,8 @@ std::shared_ptr<SfxModelessDialogController> ScTabViewShell::CreateRefDialogCont
if (ScDBData* pDBData = GetDBData(false, SC_DB_MAKE, ScGetDBSelection::RowDown))
{
ScQueryParam aQueryParam;
SfxItemSetFixed<SCITEM_QUERYDATA,
SCITEM_QUERYDATA> aArgSet( GetPool() );
SfxItemSet aArgSet(SfxItemSet::makeFixedSfxItemSet<SCITEM_QUERYDATA,
SCITEM_QUERYDATA> ( GetPool() ));
pDBData->ExtendDataArea(rDoc);
pDBData->GetQueryParam( aQueryParam );