diff options
| author | Noel Grandin <noel@peralex.com> | 2012-03-08 15:53:57 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-03-08 16:07:22 +0200 |
| commit | 4b4fb33c606fd068e024669efcbd7ad2aefdaacd (patch) | |
| tree | 2cea747768a081773303ba0844c0ea0f558530f9 /svtools/inc | |
| parent | convert to OUString to I can use SAL_WARN (diff) | |
| download | core-4b4fb33c606fd068e024669efcbd7ad2aefdaacd.tar.gz core-4b4fb33c606fd068e024669efcbd7ad2aefdaacd.zip | |
Convert from tools/table.hxx to std::map in SvxMacroTableDtor
In this case, we also convert from storing pointers to storing
the items directly because SvxMacroTableDtor completely controls
the lifecycle of the SvxMacro objects it contains.
Also add an operator== to SvxMacroTableDtor and remove the out-of-line
implementations of equals from two other places.
Diffstat (limited to 'svtools/inc')
| -rw-r--r-- | svtools/inc/svtools/imapobj.hxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/svtools/inc/svtools/imapobj.hxx b/svtools/inc/svtools/imapobj.hxx index f97850c061de..ee523c596390 100644 --- a/svtools/inc/svtools/imapobj.hxx +++ b/svtools/inc/svtools/imapobj.hxx @@ -152,9 +152,7 @@ inline const SvxMacro& IMapObject::GetEvent( sal_uInt16 nEvent ) const } inline sal_Bool IMapObject::DelEvent( sal_uInt16 nEvent ) { - SvxMacro *pMacro = aEventList.Remove( nEvent ); - delete pMacro; - return ( pMacro != 0 ); + return aEventList.Erase( nEvent ); } #endif |