diff options
Diffstat (limited to 'extensions/source/propctrlr/eformspropertyhandler.cxx')
| -rw-r--r-- | extensions/source/propctrlr/eformspropertyhandler.cxx | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 60ae7318cf09..b099b3250822 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -99,8 +99,10 @@ namespace pcr ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); - OSL_ENSURE( m_pHelper.get(), "EFormsPropertyHandler::getPropertyValue: we don't have any SupportedProperties!" ); - // if we survived impl_getPropertyId_throwUnknownProperty, we should have a helper, since no helper implies no properties + OSL_ENSURE( + m_pHelper, + "EFormsPropertyHandler::getPropertyValue: we don't have any SupportedProperties!"); + // if we survived impl_getPropertyId_throwUnknownProperty, we should have a helper, since no helper implies no properties Any aReturn; try @@ -157,8 +159,10 @@ namespace pcr ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); - OSL_ENSURE( m_pHelper.get(), "EFormsPropertyHandler::setPropertyValue: we don't have any SupportedProperties!" ); - // if we survived impl_getPropertyId_throwUnknownProperty, we should have a helper, since no helper implies no properties + OSL_ENSURE( + m_pHelper, + "EFormsPropertyHandler::setPropertyValue: we don't have any SupportedProperties!"); + // if we survived impl_getPropertyId_throwUnknownProperty, we should have a helper, since no helper implies no properties try { @@ -283,7 +287,7 @@ namespace pcr { std::vector< Property > aProperties; - if ( m_pHelper.get() ) + if (m_pHelper) { if ( m_pHelper->canBindToAnyDataType() ) { @@ -315,8 +319,10 @@ namespace pcr ::osl::MutexGuard aGuard( m_aMutex ); Any aReturn; - OSL_ENSURE( m_pHelper.get(), "EFormsPropertyHandler::convertToPropertyValue: we have no SupportedProperties!" ); - if ( !m_pHelper.get() ) + OSL_ENSURE( + m_pHelper, + "EFormsPropertyHandler::convertToPropertyValue: we have no SupportedProperties!"); + if (!m_pHelper) return aReturn; PropertyId nPropId( m_pInfoService->getPropertyId( _rPropertyName ) ); @@ -348,8 +354,9 @@ namespace pcr ::osl::MutexGuard aGuard( m_aMutex ); Any aReturn; - OSL_ENSURE( m_pHelper.get(), "EFormsPropertyHandler::convertToControlValue: we have no SupportedProperties!" ); - if ( !m_pHelper.get() ) + OSL_ENSURE(m_pHelper, + "EFormsPropertyHandler::convertToControlValue: we have no SupportedProperties!"); + if (!m_pHelper) return aReturn; PropertyId nPropId( m_pInfoService->getPropertyId( _rPropertyName ) ); @@ -379,7 +386,7 @@ namespace pcr Sequence< OUString > SAL_CALL EFormsPropertyHandler::getActuatingProperties( ) { ::osl::MutexGuard aGuard( m_aMutex ); - if ( !m_pHelper.get() ) + if (!m_pHelper) return Sequence< OUString >(); std::vector< OUString > aInterestedInActuations( 2 ); @@ -392,7 +399,7 @@ namespace pcr Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupersededProperties( ) { ::osl::MutexGuard aGuard( m_aMutex ); - if ( !m_pHelper.get() ) + if (!m_pHelper) return Sequence< OUString >(); Sequence<OUString> aReturn { PROPERTY_INPUT_REQUIRED }; @@ -406,7 +413,7 @@ namespace pcr ::osl::MutexGuard aGuard( m_aMutex ); if ( !_rxControlFactory.is() ) throw NullPointerException(); - if ( !m_pHelper.get() ) + if (!m_pHelper) throw RuntimeException(); LineDescriptor aDescriptor; @@ -417,7 +424,7 @@ namespace pcr { case PROPERTY_ID_LIST_BINDING: nControlType = PropertyControlType::ListBox; - m_pHelper.get()->getAllElementUINames( EFormsHelper::Binding, aListEntries, true ); + m_pHelper->getAllElementUINames(EFormsHelper::Binding, aListEntries, true); break; case PROPERTY_ID_XML_DATA_MODEL: @@ -472,8 +479,9 @@ namespace pcr throw NullPointerException(); ::osl::MutexGuard aGuard( m_aMutex ); - OSL_ENSURE( m_pHelper.get(), "EFormsPropertyHandler::onInteractivePropertySelection: we do not have any SupportedProperties!" ); - if ( !m_pHelper.get() ) + OSL_ENSURE(m_pHelper, "EFormsPropertyHandler::onInteractivePropertySelection: we do not " + "have any SupportedProperties!"); + if (!m_pHelper) return InteractiveSelectionResult_Cancelled; PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) ); @@ -528,7 +536,7 @@ namespace pcr { ::osl::MutexGuard aGuard( m_aMutex ); EFormsPropertyHandler_Base::addPropertyChangeListener( _rxListener ); - if ( m_pHelper.get() ) + if (m_pHelper) m_pHelper->registerBindingListener( _rxListener ); } @@ -536,7 +544,7 @@ namespace pcr void SAL_CALL EFormsPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); - if ( m_pHelper.get() ) + if (m_pHelper) m_pHelper->revokeBindingListener( _rxListener ); EFormsPropertyHandler_Base::removePropertyChangeListener( _rxListener ); } @@ -549,8 +557,8 @@ namespace pcr ::osl::MutexGuard aGuard( m_aMutex ); PropertyId nActuatingPropId( impl_getPropertyId_throwRuntime( _rActuatingPropertyName ) ); - OSL_PRECOND( m_pHelper.get(), "EFormsPropertyHandler::actuatingPropertyChanged: inconsistentcy!" ); - // if we survived impl_getPropertyId_throwRuntime, we should have a helper, since no helper implies no properties + OSL_PRECOND(m_pHelper, "EFormsPropertyHandler::actuatingPropertyChanged: inconsistentcy!"); + // if we survived impl_getPropertyId_throwRuntime, we should have a helper, since no helper implies no properties DBG_ASSERT( _rxInspectorUI.is(), "EFormsPropertyHandler::actuatingPropertyChanged: invalid callback!" ); if ( !_rxInspectorUI.is() ) |