diff options
| author | David Tardon <dtardon@redhat.com> | 2011-03-30 06:17:50 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-04-01 06:24:45 +0200 |
| commit | 3d07d32ed4a1a8eee4d3eb13a78d902b5ca33943 (patch) | |
| tree | 06cbf792ff1dda3ea3b1f18a422c689bc8c0b03f /forms | |
| parent | e76e239b237486061cab42889019cd13d98e5b63 (diff) | |
convert DBG_ assertions to OSL_
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/xforms/propertysetbase.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/forms/source/xforms/propertysetbase.cxx b/forms/source/xforms/propertysetbase.cxx index 438212d55dbd..e12571a4f2fb 100644 --- a/forms/source/xforms/propertysetbase.cxx +++ b/forms/source/xforms/propertysetbase.cxx @@ -80,7 +80,7 @@ cppu::IPropertyArrayHelper& SAL_CALL PropertySetBase::getInfoHelper() { if ( !m_pProperties ) { - DBG_ASSERT( !m_aProperties.empty(), "PropertySetBase::getInfoHelper: no registered properties!" ); + OSL_ENSURE( !m_aProperties.empty(), "PropertySetBase::getInfoHelper: no registered properties!" ); m_pProperties = new cppu::OPropertyArrayHelper( &m_aProperties[0], m_aProperties.size(), sal_False ); } return *m_pProperties; @@ -94,10 +94,10 @@ Reference< XPropertySetInfo > SAL_CALL PropertySetBase::getPropertySetInfo( ) t void PropertySetBase::registerProperty( const Property& rProperty, const ::rtl::Reference< PropertyAccessorBase >& rAccessor ) { - DBG_ASSERT( rAccessor.get(), "PropertySetBase::registerProperty: invalid property accessor, this will crash!" ); + OSL_ENSURE( rAccessor.get(), "PropertySetBase::registerProperty: invalid property accessor, this will crash!" ); m_aAccessors.insert( PropertyAccessors::value_type( rProperty.Handle, rAccessor ) ); - DBG_ASSERT( ( rAccessor->isWriteable() == true ) + OSL_ENSURE( ( rAccessor->isWriteable() == true ) == ( ( rProperty.Attributes & com::sun::star::beans::PropertyAttribute::READONLY ) == 0 ), "PropertySetBase::registerProperty: inconsistence!" ); @@ -149,13 +149,13 @@ void PropertySetBase::initializePropertyValueCache( sal_Int32 nHandle ) ::std::pair< PropertyValueCache::iterator, bool > aInsertResult = #endif m_aCache.insert( PropertyValueCache::value_type( nHandle, aCurrentValue ) ); - DBG_ASSERT( aInsertResult.second, "PropertySetBase::initializePropertyValueCache: already cached a value for this property!" ); + OSL_ENSURE( aInsertResult.second, "PropertySetBase::initializePropertyValueCache: already cached a value for this property!" ); } PropertyAccessorBase& PropertySetBase::locatePropertyHandler( sal_Int32 nHandle ) const { PropertyAccessors::const_iterator aPropertyPos = m_aAccessors.find( nHandle ); - DBG_ASSERT( aPropertyPos != m_aAccessors.end() && aPropertyPos->second.get(), + OSL_ENSURE( aPropertyPos != m_aAccessors.end() && aPropertyPos->second.get(), "PropertySetBase::locatePropertyHandler: accessor map is corrupted!" ); // neither should this be called for handles where there is no accessor, nor should a // NULL accssor be in the map |