diff options
author | Tor Lillqvist <tlillqvist@suse.com> | 2012-10-08 14:27:13 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-10-08 14:29:39 +0300 |
commit | 1b66ced2367353ad42a14bfc76ca1853c4935d6a (patch) | |
tree | 2c2e0758bb3ddbe5783adfa7e0f57c7f80a5767c /cli_ure | |
parent | scp2: rename misleading WITHOUT_EXTENSION_SCRIPTING_BEANSHELL/JAVSCRIPT (diff) | |
download | core-1b66ced2367353ad42a14bfc76ca1853c4935d6a.tar.gz core-1b66ced2367353ad42a14bfc76ca1853c4935d6a.zip |
Managed C++ to C++/CLI conversion also for the debug code
Change-Id: Ibb4f5e386644a67905421d2f9c33336a119fca88
Diffstat (limited to 'cli_ure')
-rw-r--r-- | cli_ure/source/uno_bridge/cli_bridge.cxx | 4 | ||||
-rw-r--r-- | cli_ure/source/uno_bridge/cli_data.cxx | 10 | ||||
-rw-r--r-- | cli_ure/source/uno_bridge/cli_proxy.cxx | 8 | ||||
-rw-r--r-- | cli_ure/source/uno_bridge/cli_uno.cxx | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index 12b432ed6dab..6da6cdf25aad 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -276,8 +276,8 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * uno_cl uno_cli_env->pExtEnv = 0; //Set the console to print Trace messages #if OSL_DEBUG_LEVEL >= 1 - System::Diagnostics::Trace::get_Listeners()-> - Add( new System::Diagnostics::TextWriterTraceListener(System::Console::get_Out())); + System::Diagnostics::Trace::Listeners-> + Add( gcnew System::Diagnostics::TextWriterTraceListener(System::Console::Out)); #endif OSL_ASSERT( 0 == uno_cli_env->pContext ); diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx index 3a0eb8050319..935a90be2a0a 100644 --- a/cli_ure/source/uno_bridge/cli_data.cxx +++ b/cli_ure/source/uno_bridge/cli_data.cxx @@ -1584,7 +1584,7 @@ void Bridge::map_to_cli( { if (info != nullptr) { - OSL_ASSERT(info->get_IsByRef()); + OSL_ASSERT(info->IsByRef); info= info->GetElementType(); *cli_data= System::Enum::ToObject(info, *(System::Int32*) uno_data); } @@ -1661,10 +1661,10 @@ void Bridge::map_to_cli( ctorInfo = arCtorInfo[i]; break; } - OSL_ASSERT(arParamInfo[0]->get_ParameterType()->Equals(__typeof(System::String)) - && arParamInfo[1]->get_ParameterType()->Equals(__typeof(System::Object)) - && arParamInfo[0]->get_Position() == 0 - && arParamInfo[1]->get_Position() == 1); + OSL_ASSERT(arParamInfo[0]->ParameterType->Equals(System::String::typeid) + && arParamInfo[1]->ParameterType->Equals(System::Object::typeid) + && arParamInfo[0]->Position == 0 + && arParamInfo[1]->Position == 1); //Prepare parameters for constructor int numArgs = arParamInfo->Length; array<System::Object^>^ args = gcnew array<System::Object^>(numArgs); diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx index 1e6ede2f78b6..808e5fef3924 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.cxx +++ b/cli_ure/source/uno_bridge/cli_proxy.cxx @@ -285,10 +285,10 @@ bool UnoInterfaceProxy::CanCastTo(System::Type^ fromType, UnoInterfaceProxy ^ proxy = static_cast< UnoInterfaceProxy ^ >( srr::RemotingServices::GetRealProxy( obj ) ); - OSL_ASSERT( 0 != proxy->findInfo( fromType ) ); + OSL_ASSERT( nullptr != proxy->findInfo( fromType ) ); m_listAdditionalProxies->Add( proxy ); m_nlistAdditionalProxies = m_listAdditionalProxies->Count; - OSL_ASSERT( 0 != findInfo( fromType ) ); + OSL_ASSERT( nullptr != findInfo( fromType ) ); return true; } } @@ -337,7 +337,7 @@ srrm::IMessage^ UnoInterfaceProxy::invokeObject( if (m_Equals_String->Equals(sMethod)) { // Object.Equals - OSL_ASSERT(args->get_Length() == 1); + OSL_ASSERT(args->Length == 1); srrp::RealProxy^ rProxy = srr::RemotingServices::GetRealProxy(args[0]); bool bDone = false; if (rProxy) @@ -433,7 +433,7 @@ srrm::IMessage^ UnoInterfaceProxy::Invoke(srrm::IMessage^ callmsg) System::Type^ typeBeingCalled = loadCliType(sTypeName); UnoInterfaceInfo^ info = findInfo( typeBeingCalled ); - OSL_ASSERT( 0 != info ); + OSL_ASSERT( nullptr != info ); // ToDo do without string conversion, a OUString is not needed here // get the type description of the call diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx index 0ada41d9fd30..e72b8651472f 100644 --- a/cli_ure/source/uno_bridge/cli_uno.cxx +++ b/cli_ure/source/uno_bridge/cli_uno.cxx @@ -78,7 +78,7 @@ System::Object^ Bridge::call_uno(uno_Interface * pUnoI, uno_ret = (mem + (nParams * sizeof (void *))); largest * uno_args_mem = (largest *)(mem + (nParams * sizeof (void *)) + return_size); - OSL_ASSERT( (0 == nParams) || (nParams == args->get_Length()) ); + OSL_ASSERT( (0 == nParams) || (nParams == args->Length) ); for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) { typelib_MethodParameter const & param = pParams[ nPos ]; |