From 90b755b2838a49d80e83bd2642bc8ff5c399396b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 25 Jan 2011 10:23:14 +0000 Subject: WaE: gcc 4.6.0 various warnings --- toolkit/source/controls/unocontrolmodel.cxx | 1 + toolkit/source/helper/unopropertyarrayhelper.cxx | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'toolkit/source') diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 2f46f97827a2..9c0e273cc550 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -438,6 +438,7 @@ sal_Bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const break; } DBG_ASSERT( bLegacy || pAllCurrencies != pAllCurrenciesEnd, "UnoControlModel::ImplGetDefaultValue: did not find the given bank symbol!" ); + (void)bLegacy; } aDefault <<= sCurrencySymbol; diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx index c21cf581464d..8d7e9a8ae024 100644 --- a/toolkit/source/helper/unopropertyarrayhelper.cxx +++ b/toolkit/source/helper/unopropertyarrayhelper.cxx @@ -84,13 +84,13 @@ sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle( ::rtl::OUString * { sal_uInt16 nId = sal::static_int_cast< sal_uInt16 >( maIDs.GetObjectKey( s )); - aSortedPropsIds.Insert( 1+GetPropertyOrderNr( nId ), (void*)(sal_uInt32)nId ); + aSortedPropsIds.Insert( 1+GetPropertyOrderNr( nId ), (void*)(sal_uIntPtr)nId ); if ( nId == BASEPROPERTY_FONTDESCRIPTOR ) { // Einzelproperties... for ( sal_uInt16 i = BASEPROPERTY_FONTDESCRIPTORPART_START; i <= BASEPROPERTY_FONTDESCRIPTORPART_END; i++ ) - aSortedPropsIds.Insert( 1+GetPropertyOrderNr( i ), (void*)(sal_uInt32)i ); + aSortedPropsIds.Insert( 1+GetPropertyOrderNr( i ), (void*)(sal_uIntPtr)i ); } } -- cgit