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/runtime/dllmgr-x64.cxx | 26 +++++++++++++------------- basic/source/runtime/dllmgr-x86.cxx | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'basic/source/runtime') diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx index d88f0ecdb589..4c8a0409a635 100644 --- a/basic/source/runtime/dllmgr-x64.cxx +++ b/basic/source/runtime/dllmgr-x64.cxx @@ -50,7 +50,7 @@ using namespace css; Missing support for functions returning structs (see TODO in call()). Missing support for additional data types (64 bit integers, Any, ...; would - trigger assert(false) in various switches). + trigger OSL_ASSERT(false) in various switches). It is assumed that the variables passed into SbiDllMgr::Call to represent the arguments and return value have types that exactly match the Declare @@ -143,7 +143,7 @@ template< typename T > void add( } std::size_t alignment(SbxVariable * variable) { - assert(variable != nullptr); + OSL_ASSERT(variable != nullptr); if ((variable->GetType() & SbxARRAY) == 0) { switch (variable->GetType()) { case SbxINTEGER: @@ -168,7 +168,7 @@ std::size_t alignment(SbxVariable * variable) { case SbxBYTE: return 1; default: - assert(false); + OSL_ASSERT(false); return 1; } } else { @@ -190,7 +190,7 @@ SbError marshal( SbError marshalString( SbxVariable * variable, bool special, MarshalData & data, void ** buffer) { - assert(variable != nullptr && buffer != nullptr); + OSL_ASSERT(variable != nullptr && buffer != nullptr); OString str; SbError e = convert(variable->GetOUString(), &str); if (e != ERRCODE_NONE) { @@ -207,7 +207,7 @@ SbError marshalStruct( SbxVariable * variable, std::vector< char > & blob, std::size_t offset, MarshalData & data) { - assert(variable != nullptr); + OSL_ASSERT(variable != nullptr); SbxArray * props = dynamic_cast( variable->GetObject() )-> GetProperties(); for (sal_uInt16 i = 0; i < props->Count(); ++i) { @@ -223,7 +223,7 @@ SbError marshalArray( SbxVariable * variable, std::vector< char > & blob, std::size_t offset, MarshalData & data) { - assert(variable != nullptr); + OSL_ASSERT(variable != nullptr); SbxDimArray * arr = dynamic_cast( variable->GetObject() ); int dims = arr->GetDims(); std::vector< sal_Int32 > low(dims); @@ -255,7 +255,7 @@ SbError marshal( bool outer, SbxVariable * variable, bool special, std::vector< char > & blob, std::size_t offset, MarshalData & data) { - assert(variable != nullptr); + OSL_ASSERT(variable != nullptr); if (!(variable->GetFlags() & SbxFlagBits::Reference)) { if ((variable->GetType() & SbxARRAY) == 0) { switch (variable->GetType()) { @@ -297,7 +297,7 @@ SbError marshal( add(blob, variable->GetByte(), outer ? 8 : 1, offset); break; default: - assert(false); + OSL_ASSERT(false); break; } } else { @@ -344,7 +344,7 @@ SbError marshal( break; } default: - assert(false); + OSL_ASSERT(false); break; } } else { @@ -370,7 +370,7 @@ template< typename T > T read(void const ** pointer) { } void const * unmarshal(SbxVariable * variable, void const * data) { - assert(variable != nullptr); + OSL_ASSERT(variable != nullptr); if ((variable->GetType() & SbxARRAY) == 0) { switch (variable->GetType()) { case SbxINTEGER: @@ -408,7 +408,7 @@ void const * unmarshal(SbxVariable * variable, void const * data) { variable->PutByte(read< sal_uInt8 >(&data)); break; default: - assert(false); + OSL_ASSERT(false); break; } } else { @@ -596,7 +596,7 @@ SbError call( result.PutByte(static_cast< sal_uInt8 >(iRetVal)); break; default: - assert(false); + OSL_ASSERT(false); break; } for (int i = 1; i < (arguments == nullptr ? 0 : arguments->Count()); ++i) { @@ -621,7 +621,7 @@ SbError call( SbError getProcData(HMODULE handle, OUString const & name, ProcData * proc) { - assert(proc != nullptr); + OSL_ASSERT(proc != nullptr); if (name.getLength() != 0 && name[0] == '@') { //TODO: "@" vs. "#"??? sal_Int32 n = name.copy(1).toInt32(); //TODO: handle bad input if (n <= 0 || n > 0xFFFF) { diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx index 6108e1c8c59a..7cc4c91a8552 100644 --- a/basic/source/runtime/dllmgr-x86.cxx +++ b/basic/source/runtime/dllmgr-x86.cxx @@ -51,7 +51,7 @@ using namespace css::uno; Missing support for functions returning structs (see TODO in call()). Missing support for additional data types (64 bit integers, Any, ...; would - trigger assert(false) in various switches). + trigger OSL_ASSERT(false) in various switches). It is assumed that the variables passed into SbiDllMgr::Call to represent the arguments and return value have types that exactly match the Declare @@ -151,7 +151,7 @@ template< typename T > void add( } std::size_t alignment(SbxVariable * variable) { - assert(variable != 0); + OSL_ASSERT(variable != 0); if ((variable->GetType() & SbxARRAY) == 0) { switch (variable->GetType()) { case SbxINTEGER: @@ -176,7 +176,7 @@ std::size_t alignment(SbxVariable * variable) { case SbxBYTE: return 1; default: - assert(false); + OSL_ASSERT(false); return 1; } } else { @@ -198,7 +198,7 @@ SbError marshal( SbError marshalString( SbxVariable * variable, bool special, MarshalData & data, void ** buffer) { - assert(variable != 0 && buffer != 0); + OSL_ASSERT(variable != 0 && buffer != 0); OString str; SbError e = convert(variable->GetOUString(), &str); if (e != ERRCODE_NONE) { @@ -216,7 +216,7 @@ SbError marshalStruct( SbxVariable * variable, std::vector< char > & blob, std::size_t offset, MarshalData & data) { - assert(variable != 0); + OSL_ASSERT(variable != 0); SbxArray * props = dynamic_cast( variable->GetObject() )-> GetProperties(); for (sal_uInt16 i = 0; i < props->Count(); ++i) { @@ -232,7 +232,7 @@ SbError marshalArray( SbxVariable * variable, std::vector< char > & blob, std::size_t offset, MarshalData & data) { - assert(variable != 0); + OSL_ASSERT(variable != 0); SbxDimArray * arr = dynamic_cast( variable->GetObject() ); int dims = arr->GetDims(); std::vector< sal_Int32 > low(dims); @@ -264,7 +264,7 @@ SbError marshal( bool outer, SbxVariable * variable, bool special, std::vector< char > & blob, std::size_t offset, MarshalData & data) { - assert(variable != 0); + OSL_ASSERT(variable != 0); SbxDataType eVarType = variable->GetType(); bool bByVal = !(variable->GetFlags() & SbxFlagBits::Reference); @@ -312,7 +312,7 @@ SbError marshal( add(blob, variable->GetByte(), outer ? 4 : 1, offset); break; default: - assert(false); + OSL_ASSERT(false); break; } } else { @@ -359,7 +359,7 @@ SbError marshal( break; } default: - assert(false); + OSL_ASSERT(false); break; } } else { @@ -385,7 +385,7 @@ template< typename T > T read(void const ** pointer) { } void const * unmarshal(SbxVariable * variable, void const * data) { - assert(variable != 0); + OSL_ASSERT(variable != 0); if ((variable->GetType() & SbxARRAY) == 0) { switch (variable->GetType()) { case SbxINTEGER: @@ -423,7 +423,7 @@ void const * unmarshal(SbxVariable * variable, void const * data) { variable->PutByte(read< sal_uInt8 >(&data)); break; default: - assert(false); + OSL_ASSERT(false); break; } } else { @@ -550,7 +550,7 @@ SbError call( DllMgr_call32(proc.proc, address(stack), stack.size()))); break; default: - assert(false); + OSL_ASSERT(false); break; } for (sal_uInt16 i = 1; i < (arguments == 0 ? 0 : arguments->Count()); ++i) { @@ -575,7 +575,7 @@ SbError call( SbError getProcData(HMODULE handle, OUString const & name, ProcData * proc) { - assert(proc != 0); + OSL_ASSERT(proc != 0); if ( !name.isEmpty() && name[0] == '@' ) { //TODO: "@" vs. "#"??? sal_Int32 n = name.copy(1).toInt32(); //TODO: handle bad input if (n <= 0 || n > 0xFFFF) { -- cgit