[Libreoffice] [PUSHED][PATCH 1/4] fdo38832 Replace ImplAccelTable with std::map

Caolán McNamara caolanm at redhat.com
Mon Dec 12 08:14:29 PST 2011


On Mon, 2011-12-12 at 16:05 +0000, Caolán McNamara wrote:
> On Sat, 2011-12-10 at 19:23 +0100, Marcel Metz wrote:
> > Hello lo-devs,
> > 
> > This patch series replaces some DECLARE_TABLE macros with
> > the std::map equivalent.
> 
> Looks good to me. Thanks for this, pushed now.

oh wait...

- else if ( !mpData->maKeyTable.Insert( nCode, pEntry ) )
+ else if ( mpData->maKeyMap.insert( std::make_pair( nCode, pEntry )
).second )
         OSL_TRACE( "Accelerator::InsertItem(): KeyCode (Key: %lx)
already exists", nCode );

this should be
 
+ else if ( !mpData->maKeyMap.insert( std::make_pair( nCode, pEntry )
).second )
         OSL_TRACE( "Accelerator::InsertItem(): KeyCode (Key: %lx)
already exists", nCode );

right ?

I mean, the returned .second is false if it already existed and insert
didn't do anything, and true if it the entry was actually inserted

C.



More information about the LibreOffice mailing list