From 97eb00c75e173d4c8d0b483a7941ad3d2f23783e Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Sun, 7 May 2017 17:03:35 +1000 Subject: revert OSL_ASSERT changes Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380 --- basic/source/classes/sbunoobj.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'basic/source/classes') diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 5ebf732eabe9..fdfcb75ccf5c 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -754,7 +754,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue ) typelib_TypeDescription * pTD = nullptr; aType.getDescription( &pTD ); - assert( pTD && pTD->eTypeClass == typelib_TypeClass_SEQUENCE ); + OSL_ASSERT( pTD && pTD->eTypeClass == typelib_TypeClass_SEQUENCE ); Type aElementType( reinterpret_cast(pTD)->pType ); ::typelib_typedescription_release( pTD ); @@ -1321,7 +1321,7 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property* pUnoProper OUString aClassName = xIdlTargetClass->getName(); typelib_TypeDescription * pSeqTD = nullptr; typelib_typedescription_getByName( &pSeqTD, aClassName.pData ); - assert( pSeqTD ); + OSL_ASSERT( pSeqTD ); Type aElemType( reinterpret_cast(pSeqTD)->pType ); // convert all array member and register them @@ -1362,7 +1362,7 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property* pUnoProper { OUString aTypeName = aCurType.getTypeName(); typelib_typedescription_getByName( &pSeqTD, aTypeName.pData ); - assert( pSeqTD ); + OSL_ASSERT( pSeqTD ); if( pSeqTD->eTypeClass == typelib_TypeClass_SEQUENCE ) { aCurType = Type( reinterpret_cast(pSeqTD)->pType ); @@ -4605,7 +4605,7 @@ bool SbModule::createCOMWrapperForIface( Any& o_rRetAny, SbClassModuleObject* pP } while( pParentBasic == nullptr && pCurObject != nullptr ); - assert( pParentBasic != nullptr ); + OSL_ASSERT( pParentBasic != nullptr ); registerComponentToBeDisposedForBasic( xComponent, pParentBasic ); } -- cgit