diff options
| -rw-r--r-- | editeng/source/uno/unoipset.cxx | 16 | ||||
| -rw-r--r-- | include/editeng/unoipset.hxx | 2 |
2 files changed, 9 insertions, 9 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) ); } diff --git a/include/editeng/unoipset.hxx b/include/editeng/unoipset.hxx index 10a0030aa75b..2c079a06b37f 100644 --- a/include/editeng/unoipset.hxx +++ b/include/editeng/unoipset.hxx @@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxItemPropertySet { SfxItemPropertyMap m_aPropertyMap; mutable css::uno::Reference<css::beans::XPropertySetInfo> m_xInfo; - ::std::vector< std::unique_ptr<SvxIDPropertyCombine> > aCombineList; + ::std::vector< SvxIDPropertyCombine > aCombineList; SfxItemPool& mrItemPool; public: |