diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-05 12:24:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-05 12:45:26 +0100 |
| commit | 00da9792c51e2dd36c81e66493b8cafc1588104b (patch) | |
| tree | 8ed3c914fda0f9afce659a1d3684bcda06a4d9ef /sfx2 | |
| parent | 3be2a53ee1a34fd4bc96e7817191fc3e0eb3c917 (diff) | |
simplify SfxEventNamesList
no need to store elements of vector on the heap
Change-Id: I314372b8f81b117c07676263c0c3481b51374f33
Reviewed-on: https://gerrit.libreoffice.org/67397
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/config/evntconf.cxx | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index a6710302e09a..af680f3ff7ec 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -49,17 +49,7 @@ using namespace com::sun::star; -SfxEventNamesList& SfxEventNamesList::operator=( const SfxEventNamesList& rTbl ) -{ - aEventNamesList.clear(); - for ( size_t i = 0, n = rTbl.size(); i < n; ++i ) - { - SfxEventName* pTmp = rTbl.at( i ); - std::unique_ptr<SfxEventName> pNew(new SfxEventName( *pTmp )); - aEventNamesList.push_back( std::move(pNew) ); - } - return *this; -} +SfxEventNamesList& SfxEventNamesList::operator=( const SfxEventNamesList& ) = default; SfxEventNamesList::~SfxEventNamesList() { @@ -77,11 +67,11 @@ bool SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const for ( size_t nNo = 0, nCnt = rOwn.size(); nNo < nCnt; ++nNo ) { - const SfxEventName *pOwn = rOwn.at( nNo ); - const SfxEventName *pOther = rOther.at( nNo ); - if ( pOwn->mnId != pOther->mnId || - pOwn->maEventName != pOther->maEventName || - pOwn->maUIName != pOther->maUIName ) + const SfxEventName &rOwnEvent = rOwn.at( nNo ); + const SfxEventName &rOtherEvent = rOther.at( nNo ); + if ( rOwnEvent.mnId != rOtherEvent.mnId || + rOwnEvent.maEventName != rOtherEvent.maEventName || + rOwnEvent.maUIName != rOtherEvent.maUIName ) return false; } @@ -112,7 +102,7 @@ sal_uInt16 SfxEventNamesItem::GetVersion( sal_uInt16 ) const void SfxEventNamesItem::AddEvent( const OUString& rName, const OUString& rUIName, SvMacroItemId nID ) { - aEventsList.push_back( std::unique_ptr<SfxEventName>(new SfxEventName( nID, rName, !rUIName.isEmpty() ? rUIName : rName )) ); + aEventsList.push_back( SfxEventName( nID, rName, !rUIName.isEmpty() ? rUIName : rName ) ); } |