svx/source/dialog/hdft.cxx | 13 ++++++-------
svx/source/engine3d/float3d.cxx | 6 +++---
svx/source/svdraw/svdfmtf.cxx | 6 +++---
svx/source/svdraw/svdoashp.cxx | 7 +++----
svx/source/svdraw/svdotext.cxx | 7 +++----
svx/source/svdraw/svdpdf.cxx | 13 +++++++------
svx/source/tbxctrls/grafctrl.cxx | 7 +++----
svx/source/unodraw/unomtabl.cxx | 2 +-
svx/source/xoutdev/xattr.cxx | 4 ++--
svx/source/xoutdev/xpool.cxx | 6 ++----
10 files changed, 33 insertions(+), 38 deletions(-)
New commits:
commit 7c1742761317a4b074a0fba6e9d7720aba5b838b
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Wed Oct 6 16:20:54 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Oct 6 19:38:06 2021 +0200
use SfxItemSetFixed in svx
Change-Id: I2b31d586ace6720b9bfc223f78874bf347d64521
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123143
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index d687d0ba6fa0..b20d60aacc35 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -529,10 +529,10 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, weld::Button&,
void)
if(mbEnableDrawingLayerFillStyles)
{
- 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
+ pBBSet.reset(new SfxItemSetFixed
+ <XATTR_FILL_FIRST, XATTR_FILL_LAST, //
DrawingLayer FillStyle definitions
+ SID_COLOR_TABLE, SID_PATTERN_LIST> //
XPropertyLists for Color, Gradient, Hatch and Graphic fills
+ (*GetItemSet().GetPool()));
// Keep it valid
pBBSet->MergeRange(nOuter, nOuter);
pBBSet->MergeRange(nInner, nInner);
@@ -567,9 +567,8 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, weld::Button&,
void)
{
const sal_uInt16 nBrush(GetWhich(SID_ATTR_BRUSH));
- pBBSet.reset( new SfxItemSet(
- *GetItemSet().GetPool(),
- svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>) );
+ pBBSet.reset( new SfxItemSetFixed<XATTR_FILL_FIRST,
XATTR_FILL_LAST>
+ (*GetItemSet().GetPool()) );
// Keep it valid
pBBSet->MergeRange(nBrush, nBrush);
pBBSet->MergeRange(nOuter, nOuter);
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 9cd402fc5c95..266b1e135db1 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -464,9 +464,9 @@ void Svx3DWin::Update( SfxItemSet const & rAttrs )
if(mpRemember2DAttributes)
mpRemember2DAttributes->ClearItem();
else
- mpRemember2DAttributes =
std::make_unique<SfxItemSet>(*rAttrs.GetPool(),
- svl::Items<SDRATTR_START, SDRATTR_SHADOW_LAST,
- SDRATTR_3D_FIRST, SDRATTR_3D_LAST>);
+ mpRemember2DAttributes = std::make_unique<SfxItemSetFixed
+ <SDRATTR_START, SDRATTR_SHADOW_LAST,
+ SDRATTR_3D_FIRST, SDRATTR_3D_LAST>>(*rAttrs.GetPool());
SfxWhichIter aIter(*mpRemember2DAttributes);
sal_uInt16 nWhich(aIter.FirstWhich());
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index e62186225370..93c5da9278e1 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -107,9 +107,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<SfxItemSetFixed<XATTR_LINE_FIRST,
XATTR_LINE_LAST>>(rModel.GetItemPool());
+ mpFillAttr = std::make_unique<SfxItemSetFixed<XATTR_FILL_FIRST,
XATTR_FILL_LAST>>(rModel.GetItemPool());
+ mpTextAttr = std::make_unique<SfxItemSetFixed<EE_ITEMS_START,
EE_ITEMS_END>>(rModel.GetItemPool());
checkClip();
}
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 20a072b912ab..169f1782dd98 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1387,10 +1387,9 @@ void SdrObjCustomShape::AdaptTextMinSize()
if (!bChanged)
return;
- SfxItemSet aSet(
- *GetObjectItemSet().GetPool(),
- svl::Items<SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT,
- SDRATTR_TEXT_MINFRAMEWIDTH, SDRATTR_TEXT_AUTOGROWWIDTH>); // contains
SDRATTR_TEXT_MAXFRAMEWIDTH
+ SfxItemSetFixed<SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT,
+ SDRATTR_TEXT_MINFRAMEWIDTH, SDRATTR_TEXT_AUTOGROWWIDTH> // contains
SDRATTR_TEXT_MAXFRAMEWIDTH
+ aSet(*GetObjectItemSet().GetPool());
if(bResizeShapeToFitText)
{
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index c21a19db27b5..be570fff6089 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -530,10 +530,9 @@ void SdrTextObj::AdaptTextMinSize()
// No auto grow requested. Bail out.
return;
- SfxItemSet aSet(
- *GetObjectItemSet().GetPool(),
- svl::Items<SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT,
- SDRATTR_TEXT_MINFRAMEWIDTH, SDRATTR_TEXT_AUTOGROWWIDTH>); // contains
SDRATTR_TEXT_MAXFRAMEWIDTH
+ SfxItemSetFixed<SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT,
+ SDRATTR_TEXT_MINFRAMEWIDTH, SDRATTR_TEXT_AUTOGROWWIDTH> // contains
SDRATTR_TEXT_MAXFRAMEWIDTH
+ aSet(*GetObjectItemSet().GetPool());
if(bW)
{
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index ee6a59102c5d..789e5d360477 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -107,12 +107,13 @@ ImpSdrPdfImport::ImpSdrPdfImport(SdrModel& rModel,
SdrLayerID nLay, const tools:
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<SfxItemSetFixed<XATTR_LINE_FIRST,
XATTR_LINE_LAST>>(
+ rModel.GetItemPool());
+ mpFillAttr = std::make_unique<SfxItemSetFixed<XATTR_FILL_FIRST,
XATTR_FILL_LAST>>(
+ rModel.GetItemPool());
+ mpTextAttr
+ = std::make_unique<SfxItemSetFixed<EE_ITEMS_START,
EE_ITEMS_END>>(rModel.GetItemPool());
+
checkClip();
// Load the buffer using pdfium.
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 0faca2b75891..3d2cd7218fd3 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -625,13 +625,12 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest&
rReq, SdrView& rView )
aGrfAttr.Put(pObj->GetMergedItemSet());
rPool.SetDefaultMetric( MapUnit::MapTwip );
- SfxItemSet aCropDlgAttr(
- rPool,
- svl::Items<
+ SfxItemSetFixed<
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(rPool);
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 0fdf63b49f77..60b858f38a6f 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<SfxItemSetFixed<XATTR_LINESTART, XATTR_LINEEND>>(
*mpModelPool ));
auto pInSet = maItemSetVector.back().get();
XLineEndItem aEndMarker(XATTR_LINEEND);
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 149dd14a1e9e..ca019097696e 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>))
+ SfxItemSetFixed<XATTR_LINE_FIRST, XATTR_LINE_LAST>( *pItemPool ))
{
}
@@ -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>))
+ SfxItemSetFixed<XATTR_FILL_FIRST, XATTR_FILL_LAST>( *pItemPool ))
{
}
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 594573a879ac..804aed87ca5e 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -141,11 +141,9 @@ XOutdevItemPool::XOutdevItemPool(SfxItemPool* _pMaster)
// create SetItems
rPoolDefaults[XATTRSET_LINE - XATTR_START] = new XLineAttrSetItem(
- SfxItemSet(
- *_pMaster, svl::Items<XATTR_LINE_FIRST, XATTR_LINE_LAST>));
+ SfxItemSetFixed<XATTR_LINE_FIRST, XATTR_LINE_LAST>( *_pMaster ) );
rPoolDefaults[XATTRSET_FILL - XATTR_START] = new XFillAttrSetItem(
- SfxItemSet(
- *_pMaster, svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>));
+ SfxItemSetFixed<XATTR_FILL_FIRST, XATTR_FILL_LAST>( *_pMaster ) );
// create ItemInfos
for(sal_uInt16 i(GetFirstWhich()); i <= GetLastWhich(); i++)
