diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-10-08 06:39:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-10-08 17:10:46 +0200 |
| commit | be5858089f5003db1316175941370b913d01e635 (patch) | |
| tree | df2aca891c388de55921aaae09b18b589d989823 /reportdesign | |
| parent | 5cd87f195624e2381489084a37dcd43fea24c7b0 (diff) | |
use more SfxItemSetFixed
Change-Id: I18784bac5f7ad1d109f8a81e96084cd6e9548231
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123240
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 5 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportSection.cxx | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 04d331aae68e..0adc915ea055 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -4212,15 +4212,12 @@ void OReportController::openZoomDialog() { new SvxZoomItem() }; - static const WhichRangesContainer pRanges(svl::Items< - SID_ATTR_ZOOM,SID_ATTR_ZOOM - >); rtl::Reference<SfxItemPool> pPool( new SfxItemPool("ZoomProperties", SID_ATTR_ZOOM,SID_ATTR_ZOOM, aItemInfos, &pDefaults) ); pPool->SetDefaultMetric( MapUnit::Map100thMM ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same try { - SfxItemSet aDescriptor(*pPool, pRanges); + SfxItemSetFixed<SID_ATTR_ZOOM,SID_ATTR_ZOOM> aDescriptor(*pPool); // fill it SvxZoomItem aZoomItem( m_eZoomType, m_nZoomValue, SID_ATTR_ZOOM ); aZoomItem.SetValueSet(SvxZoomEnableFlags::N100|SvxZoomEnableFlags::WHOLEPAGE|SvxZoomEnableFlags::PAGEWIDTH); diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index ecc35e0bcbb1..056951c82216 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -596,9 +596,7 @@ void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj) if( pSourceObj ) { const SfxItemSet& rSource = pSourceObj->GetMergedItemSet(); - SfxItemSet aDest( - _pObj->getSdrModelFromSdrObject().GetItemPool(), - svl::Items< + SfxItemSetFixed< // Ranges from SdrAttrObj: SDRATTR_START, SDRATTR_SHADOW_LAST, SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, @@ -609,7 +607,8 @@ void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj) SDRATTR_GRAF_FIRST, SDRATTR_CUSTOMSHAPE_LAST, // Range from SdrTextObj: - EE_ITEMS_START, EE_ITEMS_END>); + EE_ITEMS_START, EE_ITEMS_END> + aDest( _pObj->getSdrModelFromSdrObject().GetItemPool() ); aDest.Set( rSource ); _pObj->SetMergedItemSet( aDest ); Degree100 nAngle = pSourceObj->GetRotateAngle(); |