[PUSHED][PATCH] Convert tools/table.hxx usage in toolkit/source/controls/unocontrolmodel.cxx to std::map

Ivan Timofeev timofeev.i.s at gmail.com
Mon Mar 5 05:11:29 PST 2012


Hi Noel,

On 29.02.2012 13:19, Noel Grandin wrote:
> Convert tools/table.hxx usage in
> toolkit/source/controls/unocontrolmodel.cxx to std::map

Pushed with some corrections, thanks, nice cleanup!

I only replaced
> @@ -1252,26 +1205,29 @@ void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const
>  {
>      // Fehlt: Die gefakten Einzelproperties des FontDescriptors...
>
> -    ImplControlProperty* pProp = mpData->Get( nPropId );
> +    ::com::sun::star::uno::Any* pProp = &maData[ nPropId ];
> +    if ( maData.find(nPropId) != maData.end() )
> +        pProp = &maData[ nPropId ];

with
     ImplPropertyTable::const_iterator it = maData.find( nPropId );
     const ::com::sun::star::uno::Any* pProp = it == maData.end() ? NULL 
: &(it->second);

(I simply copied your code a few lines below.)

Hopefully I did not miss something else.

Regards,
Ivan


More information about the LibreOffice mailing list