diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-30 13:03:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-31 11:20:55 +0200 |
| commit | 7d34a7777cfeec112ab5cdabba059d01d8876be4 (patch) | |
| tree | c4665122aa803e3480c0da3cc926c75663270855 /editeng | |
| parent | 33bf4f0bcf941ee4609f558442035514f54cbc8a (diff) | |
flatten SvxItemPropertySet a little
Change-Id: Icb76ae5d0ebb0397bc1a2ea3c7d713a56d5ae477
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116422
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/uno/unoipset.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 8a4ad0c29bac..cdc1bac825df 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -54,10 +54,10 @@ SvxItemPropertySet::~SvxItemPropertySet() uno::Any* SvxItemPropertySet::GetUsrAnyForID(SfxItemPropertyMapEntry const & entry) const { - for (auto const & pActual : aCombineList) + for (auto const & rActual : aCombineList) { - if( pActual->nWID == entry.nWID && pActual->memberId == entry.nMemberId ) - return &pActual->aAny; + if( rActual.nWID == entry.nWID && rActual.memberId == entry.nMemberId ) + return const_cast<uno::Any*>(&rActual.aAny); } return nullptr; } @@ -66,11 +66,11 @@ uno::Any* SvxItemPropertySet::GetUsrAnyForID(SfxItemPropertyMapEntry const & ent void SvxItemPropertySet::AddUsrAnyForID( const uno::Any& rAny, SfxItemPropertyMapEntry const & entry) { - std::unique_ptr<SvxIDPropertyCombine> pNew(new SvxIDPropertyCombine); - pNew->nWID = entry.nWID; - pNew->memberId = entry.nMemberId; - pNew->aAny = rAny; - aCombineList.push_back( std::move(pNew) ); + SvxIDPropertyCombine aNew; + aNew.nWID = entry.nWID; + aNew.memberId = entry.nMemberId; + aNew.aAny = rAny; + aCombineList.push_back( std::move(aNew) ); } |