From b627a4d98f66e1c7b36d12bc4683c7970c89d69f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 26 Mar 2015 15:32:04 +0100 Subject: [PATCH] const_cast: convert some C-style casts and remove some redundant ones Change-Id: I17a03b41555a6c9fd7fab90c2c47ac910219f3a6 --- toolkit/source/awt/vclxprinter.cxx | 2 +- toolkit/source/controls/unocontrolmodel.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 3080148f78a5..24ea0591443d 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -180,7 +180,7 @@ void VCLXPrinterPropertySet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle void VCLXPrinterPropertySet::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const { - ::osl::MutexGuard aGuard( ((VCLXPrinterPropertySet*)this)->Mutex ); + ::osl::MutexGuard aGuard( const_cast(this)->Mutex ); switch( nHandle ) { diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 911b2a6ddfcf..54246cc290de 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -252,7 +252,7 @@ bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const case BASEPROPERTY_SPINVALUE_MIN: aDefault <<= (sal_Int32) 0; break; case BASEPROPERTY_SPINVALUE_MAX: aDefault <<= (sal_Int32) 100; break; case BASEPROPERTY_REPEAT_DELAY: aDefault <<= (sal_Int32) 50; break; // 50 milliseconds - case BASEPROPERTY_DEFAULTCONTROL: aDefault <<= ((UnoControlModel*)this)->getServiceName(); break; + case BASEPROPERTY_DEFAULTCONTROL: aDefault <<= const_cast(this)->getServiceName(); break; case BASEPROPERTY_AUTOHSCROLL: case BASEPROPERTY_AUTOVSCROLL: @@ -1180,7 +1180,7 @@ void UnoControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nPropId, const void UnoControlModel::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nPropId ) const { - ::osl::Guard< ::osl::Mutex > aGuard( ((UnoControlModel*)this)->GetMutex() ); + ::osl::Guard< ::osl::Mutex > aGuard( const_cast(this)->GetMutex() ); ImplPropertyTable::const_iterator it = maData.find( nPropId ); const ::com::sun::star::uno::Any* pProp = it == maData.end() ? NULL : &(it->second);