diff options
Diffstat (limited to 'toolkit/source/controls/unocontrolbase.cxx')
| -rw-r--r-- | toolkit/source/controls/unocontrolbase.cxx | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx index 86a5a65686f6..8b9732bb1425 100644 --- a/toolkit/source/controls/unocontrolbase.cxx +++ b/toolkit/source/controls/unocontrolbase.cxx @@ -57,47 +57,47 @@ void UnoControlBase::ImplSetPropertyValues( const css::uno::Sequence< OUString > return; DBG_ASSERT( xMPS.is(), "UnoControlBase::ImplSetPropertyValues: no multi property set interface!" ); - if ( xMPS.is() ) + if ( !xMPS.is() ) + return; + + if ( !bUpdateThis ) + ImplLockPropertyChangeNotifications( aPropertyNames, true ); + + try + { + xMPS->setPropertyValues( aPropertyNames, aValues ); + } + catch( const css::uno::Exception& ) { - if ( !bUpdateThis ) - ImplLockPropertyChangeNotifications( aPropertyNames, true ); - - try - { - xMPS->setPropertyValues( aPropertyNames, aValues ); - } - catch( const css::uno::Exception& ) - { - if ( !bUpdateThis ) - ImplLockPropertyChangeNotifications( aPropertyNames, false ); - } if ( !bUpdateThis ) ImplLockPropertyChangeNotifications( aPropertyNames, false ); } + if ( !bUpdateThis ) + ImplLockPropertyChangeNotifications( aPropertyNames, false ); } void UnoControlBase::ImplSetPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue, bool bUpdateThis ) { // Model might be logged off already but an event still fires - if ( mxModel.is() ) + if ( !mxModel.is() ) + return; + + css::uno::Reference< css::beans::XPropertySet > xPSet( mxModel, css::uno::UNO_QUERY ); + if ( !bUpdateThis ) + ImplLockPropertyChangeNotification( aPropertyName, true ); + + try + { + xPSet->setPropertyValue( aPropertyName, aValue ); + } + catch( const css::uno::Exception& ) { - css::uno::Reference< css::beans::XPropertySet > xPSet( mxModel, css::uno::UNO_QUERY ); - if ( !bUpdateThis ) - ImplLockPropertyChangeNotification( aPropertyName, true ); - - try - { - xPSet->setPropertyValue( aPropertyName, aValue ); - } - catch( const css::uno::Exception& ) - { - if ( !bUpdateThis ) - ImplLockPropertyChangeNotification( aPropertyName, false ); - throw; - } if ( !bUpdateThis ) ImplLockPropertyChangeNotification( aPropertyName, false ); + throw; } + if ( !bUpdateThis ) + ImplLockPropertyChangeNotification( aPropertyName, false ); } css::uno::Any UnoControlBase::ImplGetPropertyValue( const OUString& aPropertyName ) |