revert OSL_ASSERT changes

Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380

20 files changed, 117 insertions, 121 deletions

diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index 203128099d2c..434776be2abf 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -242,7 +242,7 @@ Any IdlReflectionServiceImpl::getByHierarchicalName( const OUString & rName )
         if (aRet.getValueTypeClass() == TypeClass_INTERFACE)
         {
             // type retrieved from tdmgr
-            assert( (*o3tl::forceAccess<Reference<XInterface>>(aRet))->queryInterface(
+            OSL_ASSERT( (*o3tl::forceAccess<Reference<XInterface>>(aRet))->queryInterface(
                 cppu::UnoType<XTypeDescription>::get()).hasValue() );
 
             css::uno::Reference< css::reflection::XConstantTypeDescription >
diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx
index 7428221c97cb..d5a3a2192d60 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -139,7 +139,7 @@ Reference< XIdlClass > IdlAttributeFieldImpl::getDeclaringClass()
         {
             OUString aName(getAttributeTypeDescr()->aBase.aBase.pTypeName);
             sal_Int32 i = aName.indexOf(':');
-            assert(i >= 0);
+            OSL_ASSERT(i >= 0);
             _xDeclClass = getReflection()->forName(aName.copy(0, i));
         }
     }
@@ -412,7 +412,7 @@ Reference< XIdlClass > IdlInterfaceMethodImpl::getDeclaringClass()
         {
             OUString aName(getMethodTypeDescr()->aBase.aBase.pTypeName);
             sal_Int32 i = aName.indexOf(':');
-            assert(i >= 0);
+            OSL_ASSERT(i >= 0);
             _xDeclClass = getReflection()->forName(aName.copy(0, i));
         }
     }
@@ -755,7 +755,7 @@ Sequence< Reference< XIdlClass > > InterfaceIdlClassImpl::getSuperclasses()
         for (sal_Int32 i = 0; i < pType->nBaseTypes; ++i) {
             _xSuperClasses[i] = getReflection()->forType(
                 &pType->ppBaseTypes[i]->aBase);
-            assert(_xSuperClasses[i].is());
+            OSL_ASSERT(_xSuperClasses[i].is());
         }
     }
     return Sequence< Reference< XIdlClass > >(_xSuperClasses);
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 2ecd6743ae74..d32de8ff99d6 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -1721,7 +1721,7 @@ Reference< XSimpleRegistry > ImplementationRegistration::createTemporarySimpleRe
         rSMgr->createInstanceWithContext(
             spool().com_sun_star_registry_SimpleRegistry,   xCtx ),
         UNO_QUERY);
-    assert( xReg.is() );
+    OSL_ASSERT( xReg.is() );
     return xReg;
 }
 
diff --git a/stoc/source/implementationregistration/mergekeys.cxx b/stoc/source/implementationregistration/mergekeys.cxx
index cffd43171bc7..df24ca697ec2 100644
--- a/stoc/source/implementationregistration/mergekeys.cxx
+++ b/stoc/source/implementationregistration/mergekeys.cxx
@@ -89,7 +89,7 @@ static void mergeKeys(
         xDest->setStringListValue( xSource->getStringListValue() );
         break;
     default:
-        assert(false);
+        OSL_ASSERT(false);
         break;
     }
 
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index d15e2951cf7c..b7b3620a5d61 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -191,10 +191,10 @@ inline void AdapterImpl::release()
     {
         t_ptr_map::iterator iFind(
             m_pFactory->m_receiver2adapters.find( m_key ) );
-        assert( m_pFactory->m_receiver2adapters.end() != iFind );
+        OSL_ASSERT( m_pFactory->m_receiver2adapters.end() != iFind );
         t_ptr_set & adapter_set = iFind->second;
         if (adapter_set.erase( this ) != 1) {
-            assert( false );
+            OSL_ASSERT( false );
         }
         if (adapter_set.empty())
         {
@@ -260,7 +260,7 @@ bool AdapterImpl::coerce_assign(
 
         if (p_exc) // exception occurred
         {
-            assert(
+            OSL_ASSERT(
                 p_exc->pType->eTypeClass == typelib_TypeClass_EXCEPTION );
             if (typelib_typedescriptionreference_isAssignableFrom( cppu::UnoType<RuntimeException>::get().getTypeLibType(),
                     p_exc->pType ))
@@ -648,7 +648,7 @@ AdapterImpl::AdapterImpl(
         pInterface->m_pTypeDescr = nullptr;
         pTypes[nPos].getDescription(
             reinterpret_cast<typelib_TypeDescription **>(&pInterface->m_pTypeDescr) );
-        assert( pInterface->m_pTypeDescr );
+        OSL_ASSERT( pInterface->m_pTypeDescr );
         if (! pInterface->m_pTypeDescr)
         {
             for ( sal_Int32 n = 0; n < nPos; ++n )
@@ -665,7 +665,7 @@ AdapterImpl::AdapterImpl(
     // map receiver
     m_pReceiver = static_cast<uno_Interface *>(m_pFactory->m_aCpp2Uno.mapInterface(
         xReceiver.get(), cppu::UnoType<decltype(xReceiver)>::get() ));
-    assert( nullptr != m_pReceiver );
+    OSL_ASSERT( nullptr != m_pReceiver );
     if (! m_pReceiver)
     {
         throw RuntimeException( "cannot map receiver!" );
@@ -699,7 +699,7 @@ FactoryImpl::FactoryImpl( Reference< XComponentContext > const & xContext )
         UNO_QUERY_THROW );
     m_pConverter = static_cast<uno_Interface *>(m_aCpp2Uno.mapInterface(
         xConverter.get(), cppu::UnoType<decltype(xConverter)>::get() ));
-    assert( nullptr != m_pConverter );
+    OSL_ASSERT( nullptr != m_pConverter );
 
     // some type info:
     // sequence< any >
@@ -851,7 +851,7 @@ Reference< XInterface > FactoryImpl::createAdapter(
         m_aUno2Cpp.mapInterface(
             reinterpret_cast<void **>(&xRet), pUnoI, cppu::UnoType<decltype(xRet)>::get() );
         that->release();
-        assert( xRet.is() );
+        OSL_ASSERT( xRet.is() );
         if (! xRet.is())
         {
             throw RuntimeException( "mapping UNO to C++ failed!" );
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index a46e9c858ac4..a4e9efe66e59 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -573,7 +573,7 @@ public:
 
     ~DetachCurrentThread() {
         if (m_jvm->DetachCurrentThread() != 0) {
-            assert(false);
+            OSL_ASSERT(false);
         }
     }
 
@@ -823,7 +823,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
         case JFW_E_RUNNING_JVM:
         {
             //This service should make sure that we do not start java twice.
-            assert(false);
+            OSL_ASSERT(false);
             break;
         }
         case JFW_E_NEED_RESTART:
@@ -884,12 +884,12 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
         }
         return css::uno::makeAny(reinterpret_cast< sal_IntPtr >(m_pJavaVm));
     case RETURN_VIRTUALMACHINE:
-        assert(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *));
+        OSL_ASSERT(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *));
         return css::uno::makeAny(
             reinterpret_cast< sal_Int64 >(
                 m_xUnoVirtualMachine->getVirtualMachine().get()));
     case RETURN_UNOVIRTUALMACHINE:
-        assert(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *));
+        OSL_ASSERT(sizeof (sal_Int64) >= sizeof (jvmaccess::VirtualMachine *));
         return css::uno::makeAny(
             reinterpret_cast< sal_Int64 >(m_xUnoVirtualMachine.get()));
     }
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index da3eb0b65c67..ea3c7479c21d 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -152,7 +152,7 @@ UnoInterfaceReference FactoryImpl::binuno_queryInterface(
             m_uno2cpp.get() );
         uno_any_destruct( exc, nullptr );
         ::cppu::throwException( cpp_exc );
-        assert( false ); // way of no return
+        OSL_ASSERT( false ); // way of no return
         return UnoInterfaceReference(); // for dummy
     }
 }
@@ -197,7 +197,7 @@ static void SAL_CALL binuno_proxy_free(
     (void) pEnv; // avoid warning about unused parameter
     binuno_Proxy * proxy = static_cast< binuno_Proxy * >(
         static_cast< uno_Interface * >( pProxy ) );
-    assert( proxy->m_root->m_factory->m_uno_env.get()->pExtEnv == pEnv );
+    OSL_ASSERT( proxy->m_root->m_factory->m_uno_env.get()->pExtEnv == pEnv );
     delete proxy;
 }
 
@@ -210,13 +210,13 @@ static void SAL_CALL binuno_proxy_acquire( uno_Interface * pUnoI )
         // rebirth of zombie
         uno_ExtEnvironment * uno_env =
             that->m_root->m_factory->m_uno_env.get()->pExtEnv;
-        assert( uno_env != nullptr );
+        OSL_ASSERT( uno_env != nullptr );
         (*uno_env->registerProxyInterface)(
             uno_env, reinterpret_cast< void ** >( &pUnoI ), binuno_proxy_free,
             that->m_oid.pData,
             reinterpret_cast< typelib_InterfaceTypeDescription * >(
                 that->m_typeDescr.get() ) );
-        assert( that == static_cast< binuno_Proxy * >( pUnoI ) );
+        OSL_ASSERT( that == static_cast< binuno_Proxy * >( pUnoI ) );
     }
 }
 
@@ -228,7 +228,7 @@ static void SAL_CALL binuno_proxy_release( uno_Interface * pUnoI )
     {
         uno_ExtEnvironment * uno_env =
             that->m_root->m_factory->m_uno_env.get()->pExtEnv;
-        assert( uno_env != nullptr );
+        OSL_ASSERT( uno_env != nullptr );
         (*uno_env->revokeInterface)( uno_env, pUnoI );
     }
 }
@@ -319,14 +319,14 @@ Any ProxyRoot::queryAggregation( Type const & rType )
         {
             Reference< XInterface > xProxy;
             uno_ExtEnvironment * cpp_env = m_factory->m_cpp_env.get()->pExtEnv;
-            assert( cpp_env != nullptr );
+            OSL_ASSERT( cpp_env != nullptr );
 
             // mind a new delegator, calculate current root:
             Reference< XInterface > xRoot(
                 static_cast< OWeakObject * >(this), UNO_QUERY_THROW );
             OUString oid;
             (*cpp_env->getObjectIdentifier)( cpp_env, &oid.pData, xRoot.get() );
-            assert( !oid.isEmpty() );
+            OSL_ASSERT( !oid.isEmpty() );
 
             (*cpp_env->getRegisteredInterface)(
                 cpp_env, reinterpret_cast< void ** >( &xProxy ),
@@ -353,7 +353,7 @@ Any ProxyRoot::queryAggregation( Type const & rType )
                         SAL_NO_ACQUIRE );
                     uno_ExtEnvironment * uno_env =
                         m_factory->m_uno_env.get()->pExtEnv;
-                    assert( uno_env != nullptr );
+                    OSL_ASSERT( uno_env != nullptr );
                     (*uno_env->registerProxyInterface)(
                         uno_env, reinterpret_cast< void ** >( &proxy.m_pUnoI ),
                         binuno_proxy_free, oid.pData,
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 4d173df5df02..6772d2ba2a8a 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -494,7 +494,7 @@ void AccessController::checkAndClearPostPoned()
     // check postponed permissions
     std::unique_ptr< t_rec_vec > rec( static_cast< t_rec_vec * >( m_rec.getData() ) );
     m_rec.setData( nullptr ); // takeover ownership
-    assert( rec.get() );
+    OSL_ASSERT( rec.get() );
     if (rec.get())
     {
         t_rec_vec const & vec = *rec.get();
@@ -502,20 +502,20 @@ void AccessController::checkAndClearPostPoned()
         {
         case SINGLE_USER:
         {
-            assert( m_singleUser_init );
+            OSL_ASSERT( m_singleUser_init );
             for (const auto & p : vec)
             {
-                assert( m_singleUserId.equals( p.first ) );
+                OSL_ASSERT( m_singleUserId.equals( p.first ) );
                 m_singleUserPermissions.checkPermission( p.second );
             }
             break;
         }
         case SINGLE_DEFAULT_USER:
         {
-            assert( m_defaultPerm_init );
+            OSL_ASSERT( m_defaultPerm_init );
             for (const auto & p : vec)
             {
-                assert( p.first.isEmpty() ); // default-user
+                OSL_ASSERT( p.first.isEmpty() ); // default-user
                 m_defaultPermissions.checkPermission( p.second );
             }
             break;
@@ -530,7 +530,7 @@ void AccessController::checkAndClearPostPoned()
                     MutexGuard guard( m_mutex );
                     pPermissions = m_user2permissions.lookup( p.first );
                 }
-                assert( pPermissions );
+                OSL_ASSERT( pPermissions );
                 if (pPermissions)
                 {
                     pPermissions->checkPermission( p.second );
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 948260fb119f..31bdcdbcc7c1 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -351,7 +351,7 @@ PolicyReader::PolicyReader( OUString const & fileName, AccessControl & ac )
 PolicyReader::~PolicyReader()
 {
     if ( ::osl_closeFile( m_file ) != osl_File_E_None ) {
-        assert(false);
+        OSL_ASSERT( false );
     }
 }
 
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index d580e1461052..eb5685a29b76 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -671,7 +671,7 @@ void OServiceManager::disposing()
     m_xContext.clear();
 
     // not only the Event should hold the object
-    assert( m_refCount != 1 );
+    OSL_ASSERT( m_refCount != 1 );
 }
 
 // XPropertySet
@@ -806,7 +806,7 @@ Reference< XInterface > OServiceManager::createInstanceWithContext(
     check_undisposed();
 #if OSL_DEBUG_LEVEL > 0
     Reference< beans::XPropertySet > xProps( xContext->getServiceManager(), UNO_QUERY );
-    assert( xProps.is() );
+    OSL_ASSERT( xProps.is() );
     if (xProps.is())
     {
         Reference< XComponentContext > xDefContext;
@@ -860,7 +860,7 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext(
     check_undisposed();
 #if OSL_DEBUG_LEVEL > 0
     Reference< beans::XPropertySet > xProps( xContext->getServiceManager(), UNO_QUERY );
-    assert( xProps.is() );
+    OSL_ASSERT( xProps.is() );
     if (xProps.is())
     {
         Reference< XComponentContext > xDefContext;
diff --git a/stoc/source/uriproc/UriReference.cxx b/stoc/source/uriproc/UriReference.cxx
index 20f4c4ffb6b9..2baa1f3b9b20 100644
--- a/stoc/source/uriproc/UriReference.cxx
+++ b/stoc/source/uriproc/UriReference.cxx
@@ -42,11 +42,11 @@ UriReference::UriReference(
     m_hasQuery(bHasQuery),
     m_hasFragment(false)
 {
-    assert(!scheme.isEmpty() || bIsHierarchical);
-    assert(!bHasAuthority || bIsHierarchical);
-    assert(authority.isEmpty() || bHasAuthority);
-    assert(!bHasQuery || bIsHierarchical);
-    assert(query.isEmpty() || bHasQuery);
+    OSL_ASSERT(!scheme.isEmpty() || bIsHierarchical);
+    OSL_ASSERT(!bHasAuthority || bIsHierarchical);
+    OSL_ASSERT(authority.isEmpty() || bHasAuthority);
+    OSL_ASSERT(!bHasQuery || bIsHierarchical);
+    OSL_ASSERT(query.isEmpty() || bHasQuery);
 }
 
 UriReference::~UriReference() {}
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index 231c31816df1..d246f07c9221 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -130,7 +130,7 @@ private:
 OUString UrlReference::expand(
     css::uno::Reference< css::util::XMacroExpander > const & expander)
 {
-    assert(expander.is());
+    OSL_ASSERT(expander.is());
     return expander->expandMacros(
         ::rtl::Uri::decode(
             getPath(), ::rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8));
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 757bbf719533..dc7fbf0015ff 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -91,7 +91,7 @@ css::uno::Reference< css::uri::XUriReference >
 Factory::createVndSunStarPkgUrlReference(
     css::uno::Reference< css::uri::XUriReference > const & authority)
 {
-    assert(authority.is());
+    OSL_ASSERT(authority.is());
     if (authority->isAbsolute() && !authority->hasFragment()) {
         OUStringBuffer buf;
         buf.append("vnd.sun.star.pkg://");
@@ -102,7 +102,7 @@ Factory::createVndSunStarPkgUrlReference(
         css::uno::Reference< css::uri::XUriReference > uriRef(
             css::uri::UriReferenceFactory::create(m_context)->parse(
                 buf.makeStringAndClear()));
-        assert(uriRef.is());
+        OSL_ASSERT(uriRef.is());
         return uriRef;
     } else {
         return css::uno::Reference< css::uri::XUriReference >();
diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx
index e09c8297ceae..e466904b4314 100644
--- a/stoc/test/tdmanager/testtdmanager.cxx
+++ b/stoc/test/tdmanager/testtdmanager.cxx
@@ -130,7 +130,7 @@ sal_Int32 Service::run(css::uno::Sequence< OUString > const & arguments)
     // test: add cmd line rdbs to manager
 
 
-    assert( arguments.getLength() > 0 );
+    OSL_ASSERT( arguments.getLength() > 0 );
     css::uno::Reference<css::container::XSet> xSet(
         manager, css::uno::UNO_QUERY_THROW );
     for ( sal_Int32 argPos = 0; argPos < arguments.getLength(); ++argPos ) {
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index bbca4088d856..1e9aae16ed42 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -642,13 +642,13 @@ static void test_Conversion( const Reference< XMultiServiceFactory > & xMgr )
     aRet = xConverter->convertTo( aRet, cppu::UnoType<XServiceInfo>::get());
     aRet <<= SAL_CONST_INT64(0x7fffffffffffffff);
     aRet = xConverter->convertTo( aRet, cppu::UnoType<sal_uInt64>::get());
-    assert( *(const sal_uInt64 *)aRet.getValue() == SAL_CONST_UINT64(0x7fffffffffffffff) );
+    OSL_ASSERT( *(const sal_uInt64 *)aRet.getValue() == SAL_CONST_UINT64(0x7fffffffffffffff) );
     aRet <<= SAL_CONST_UINT64(0xffffffffffffffff);
     aRet = xConverter->convertTo( aRet, cppu::UnoType<sal_uInt64>::get());
-    assert( *(const sal_uInt64 *)aRet.getValue() == SAL_CONST_UINT64(0xffffffffffffffff) );
+    OSL_ASSERT( *(const sal_uInt64 *)aRet.getValue() == SAL_CONST_UINT64(0xffffffffffffffff) );
     aRet <<= SAL_CONST_INT64(-1);
     aRet = xConverter->convertTo( aRet, cppu::UnoType<sal_Int8>::get());
-    assert( *(const sal_Int8 *)aRet.getValue() == (-1) );
+    OSL_ASSERT( *(const sal_Int8 *)aRet.getValue() == (-1) );
     printf( "test_Conversion(): end.\n" );
 }
 
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index df6542407d38..3b2a02cccd8a 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -348,11 +348,11 @@ SAL_IMPLEMENT_MAIN()
                 OUString( "stoctest.rdb" ) ) );
         Reference< XComponentContext > xContext;
         Reference< beans::XPropertySet > xProps( xMgr, UNO_QUERY );
-        assert( xProps.is() );
+        OSL_ASSERT( xProps.is() );
         xProps->getPropertyValue(
             OUString( "DefaultContext" ) ) >>=
             xContext;
-        assert( xContext.is() );
+        OSL_ASSERT( xContext.is() );
 
         Reference< XIdlReflection > xRefl;
         xContext->getValueByName(
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index df947c5b5124..a335939b9659 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -309,8 +309,8 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
 
     Any aRet;
 
-    assert( rOutParam.getLength() == 0 );
-    assert( rOutParamIndex.getLength() == 0 );
+    OSL_ASSERT( rOutParam.getLength() == 0 );
+    OSL_ASSERT( rOutParamIndex.getLength() == 0 );
 
     try
     {
@@ -334,7 +334,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
 
         if ( rFunctionName == "setValues" )
         {
-            assert( rParams.getLength() == 17 );
+            OSL_ASSERT( rParams.getLength() == 17 );
             aBool = *(sal_Bool *)rParams[0].getValue();
             aChar = *(sal_Unicode *)rParams[1].getValue();
             rParams[2] >>= nByte;
@@ -781,7 +781,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
             aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float, aRet.Double,
             aRet.Enum, aRet.String, aRet.Interface, aRet.Any, aRet.Sequence, aRet2 );
 
-        assert( equals( aData, aRet ) && equals( aData, aRet2 ) );
+        OSL_ASSERT( equals( aData, aRet ) && equals( aData, aRet2 ) );
 
         // set last retrieved values
         test::TestData aSV2ret = xLBT->setValues2(
@@ -789,7 +789,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
             aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float, aRet.Double,
             aRet.Enum, aRet.String, aRet.Interface, aRet.Any, aRet.Sequence, aRet2 );
 
-        assert( equals( aData, aSV2ret ) && equals( aData, aRet2 ) );
+        OSL_ASSERT( equals( aData, aSV2ret ) && equals( aData, aRet2 ) );
         }
         {
         test::TestData aRet, aRet2;
@@ -798,7 +798,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
             aRet.Long, aRet.ULong, aRet.Hyper, aRet.UHyper, aRet.Float, aRet.Double,
             aRet.Enum, aRet.String, aRet.Interface, aRet.Any, aRet.Sequence, aRet2 );
 
-        assert( equals( aData, aRet ) && equals( aData, aRet2 ) && equals( aData, aGVret ) );
+        OSL_ASSERT( equals( aData, aRet ) && equals( aData, aRet2 ) && equals( aData, aGVret ) );
 
         // set last retrieved values
         xLBT->setBool( aRet.Bool );
diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx
index 7579dce79631..ebc878696316 100644
--- a/stoc/test/testproxyfac.cxx
+++ b/stoc/test/testproxyfac.cxx
@@ -172,7 +172,7 @@ static void test_proxyfac_(
     (void)test;
     Reference< lang::XServiceInfo > xMaster_XServiceInfo(
         xMaster, UNO_QUERY_THROW );
-    assert( xMaster_XServiceInfo->getImplementationName().equals( test ) );
+    OSL_ASSERT( xMaster_XServiceInfo->getImplementationName().equals( test ) );
 
     Reference< reflection::XProxyFactory > xTarget( xMaster, UNO_QUERY_THROW );
     Reference< XCurrentContext > xTarget_XCurrentContext(
@@ -180,34 +180,34 @@ static void test_proxyfac_(
     Reference< XCurrentContext > xMaster_XCurrentContext(
         xMaster, UNO_QUERY_THROW );
 
-    assert(
+    OSL_ASSERT(
         xTarget_XCurrentContext->getValueByName( test ) == makeAny( test ) );
-    assert(
+    OSL_ASSERT(
         xMaster_XCurrentContext->getValueByName( test ) == makeAny( test ) );
 
     Reference< XAggregation > xFakeAgg( xTarget->createProxy( xTarget ) );
     if (xFakeAgg.is())
     {
-        assert( xTarget == xFakeAgg );
-        assert( xMaster == xFakeAgg );
+        OSL_ASSERT( xTarget == xFakeAgg );
+        OSL_ASSERT( xMaster == xFakeAgg );
     }
 
     Reference< lang::XServiceInfo > xTarget_XServiceInfo(
         xTarget, UNO_QUERY_THROW );
-    assert( xTarget_XServiceInfo->getImplementationName().equals( test ) );
+    OSL_ASSERT( xTarget_XServiceInfo->getImplementationName().equals( test ) );
     Reference< lang::XServiceInfo > xTarget_XServiceInfo2(
         xTarget, UNO_QUERY_THROW );
-    assert( xTarget_XServiceInfo2.get() == xTarget_XServiceInfo.get() );
+    OSL_ASSERT( xTarget_XServiceInfo2.get() == xTarget_XServiceInfo.get() );
 
-    assert( xTarget == xTarget_XCurrentContext );
-    assert( xTarget_XCurrentContext == xMaster );
-    assert(
+    OSL_ASSERT( xTarget == xTarget_XCurrentContext );
+    OSL_ASSERT( xTarget_XCurrentContext == xMaster );
+    OSL_ASSERT(
         xTarget_XCurrentContext.get() == xMaster_XCurrentContext.get() );
-    assert( xTarget_XCurrentContext == xMaster );
-    assert( xTarget == xMaster );
-    assert( xTarget_XServiceInfo.get() == xMaster_XServiceInfo.get() );
-    assert( xTarget_XServiceInfo == xMaster );
-    assert( xMaster_XServiceInfo == xMaster );
+    OSL_ASSERT( xTarget_XCurrentContext == xMaster );
+    OSL_ASSERT( xTarget == xMaster );
+    OSL_ASSERT( xTarget_XServiceInfo.get() == xMaster_XServiceInfo.get() );
+    OSL_ASSERT( xTarget_XServiceInfo == xMaster );
+    OSL_ASSERT( xMaster_XServiceInfo == xMaster );
 
     try
     {
diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx
index dfeeff42189e..b2dd4dd7051e 100644
--- a/stoc/test/testregistry.cxx
+++ b/stoc/test/testregistry.cxx
@@ -55,36 +55,33 @@ using namespace osl;
 namespace stoc_impreg
 {
 void SAL_CALL mergeKeys(
-    Reference< registry::XRegistryKey > const & xDest,
-    Reference< registry::XRegistryKey > const & xSource );
+Reference< registry::XRegistryKey > const & xDest,
+Reference< registry::XRegistryKey > const & xSource );
 }
-
 static void mergeKeys(
-    Reference< registry::XSimpleRegistry > const & xDest,
-    OUString const & rBaseNode,
-    OUString const & rURL )
+Reference< registry::XSimpleRegistry > const & xDest,
+OUString const & rBaseNode,
+OUString const & rURL )
 {
-    Reference< registry::XRegistryKey > xDestRoot( xDest->getRootKey() );
-    Reference< registry::XRegistryKey > xDestKey;
-
-    if (rBaseNode.getLength())
-    {
-        xDestKey = xDestRoot->createKey( rBaseNode );
-        xDestRoot->closeKey();
-    }
-    else
-    {
-        xDestKey = xDestRoot;
-    }
-
-    Reference< registry::XSimpleRegistry > xSimReg( ::cppu::createSimpleRegistry() );
-    xSimReg->open( rURL, sal_True, sal_False );
-    assert( xSimReg->isValid() );
-    Reference< registry::XRegistryKey > xSourceKey( xSimReg->getRootKey() );
-    ::stoc_impreg::mergeKeys( xDestKey, xSourceKey );
-    xSourceKey->closeKey();
-    xSimReg->close();
-    xDestKey->closeKey();
+Reference< registry::XRegistryKey > xDestRoot( xDest->getRootKey() );
+Reference< registry::XRegistryKey > xDestKey;
+if (rBaseNode.getLength())
+{
+xDestKey = xDestRoot->createKey( rBaseNode );
+xDestRoot->closeKey();
+}
+else
+{
+xDestKey = xDestRoot;
+}
+Reference< registry::XSimpleRegistry > xSimReg( ::cppu::createSimpleRegistry() );
+xSimReg->open( rURL, sal_True, sal_False );
+OSL_ASSERT( xSimReg->isValid() );
+Reference< registry::XRegistryKey > xSourceKey( xSimReg->getRootKey() );
+::stoc_impreg::mergeKeys( xDestKey, xSourceKey );
+xSourceKey->closeKey();
+xSimReg->close();
+xDestKey->closeKey();
 }
 
 
@@ -92,34 +89,33 @@ OString userRegEnv("STAR_USER_REGISTRY=");
 
 OUString getExePath()
 {
-    OUString        exe;
-    OSL_VERIFY( osl_getExecutableFile( &exe.pData ) == osl_Process_E_None);
+OUString        exe;
+OSL_VERIFY( osl_getExecutableFile( &exe.pData ) == osl_Process_E_None);
 #if defined(_WIN32)
-    exe = exe.copy(0, exe.getLength() - 16);
+exe = exe.copy(0, exe.getLength() - 16);
 #else
-    exe = exe.copy(0, exe.getLength() - 12);
+exe = exe.copy(0, exe.getLength() - 12);
 #endif
-    return exe;
+return exe;
 }
 
 void setStarUserRegistry()
 {
-    Registry *myRegistry = new Registry();
-
-    RegistryKey rootKey, rKey, rKey2;
+Registry *myRegistry = new Registry();
 
-    OUString userReg = getExePath();
-    userReg += "user.rdb";
+RegistryKey rootKey, rKey, rKey2;
 
-    if(myRegistry->open(userReg, RegAccessMode::READWRITE))
-    {
-        OSL_VERIFY(!myRegistry->create(userReg));
-    }
+OUString userReg = getExePath();
+userReg += "user.rdb";
+if(myRegistry->open(userReg, RegAccessMode::READWRITE))
+{
+OSL_VERIFY(!myRegistry->create(userReg));
+}
 
-    OSL_VERIFY(!myRegistry->close());
-    delete myRegistry;
+OSL_VERIFY(!myRegistry->close());
+delete myRegistry;
 
-    userRegEnv += OUStringToOString(userReg, RTL_TEXTENCODING_ASCII_US);
+userRegEnv += OUStringToOString(userReg, RTL_TEXTENCODING_ASCII_US);
     putenv((char *)userRegEnv.getStr());
 }
 
@@ -650,7 +646,7 @@ void test_DefaultRegistry(
 SAL_IMPLEMENT_MAIN()
 {
 //  setStarUserRegistry();
-    setLinkInDefaultRegistry(OUString("/Test/DefaultLink"),
+     setLinkInDefaultRegistry(OUString("/Test/DefaultLink"),
                               OUString("/Test/FifthKey/MyFirstLink"));
 
     OUString reg1( "testreg1.rdb" );
@@ -658,10 +654,10 @@ SAL_IMPLEMENT_MAIN()
     OUString areg1( "atestreg1.rdb" );
     OUString areg2( "atestreg2.rdb" );
 
-    test_SimpleRegistry( reg1, reg2 );
-    test_DefaultRegistry( reg1, reg2 );
-    test_SimpleRegistry( areg1, areg2, true ); // use different merge
-    test_DefaultRegistry( areg1, areg2, true );
+      test_SimpleRegistry( reg1, reg2 );
+      test_DefaultRegistry( reg1, reg2 );
+      test_SimpleRegistry( areg1, areg2, true ); // use different merge
+      test_DefaultRegistry( areg1, areg2, true );
 
     Reference< XSimpleRegistry > xSimReg( ::cppu::createSimpleRegistry() );
     xSimReg->open( reg1, sal_False, sal_True );
diff --git a/stoc/test/testsmgr2.cxx b/stoc/test/testsmgr2.cxx
index dd65f6733724..2e40c0444dca 100644
--- a/stoc/test/testsmgr2.cxx
+++ b/stoc/test/testsmgr2.cxx
@@ -76,7 +76,7 @@ SAL_IMPLEMENT_MAIN()
             n ++;
         }
         // there are two services in two registries !
-        assert( 2 == n );
+        OSL_ASSERT( 2 == n );
         if( 2 == n )
         {
             printf( "test passed\n" );
@@ -101,7 +101,7 @@ SAL_IMPLEMENT_MAIN()
     {
         OString o =  OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US );
         printf( "%s\n" , o.getStr() );
-        assert(0);
+        OSL_ASSERT( 0 );
         return 1;
     }
 }