use css prefix consistently
Change-Id: Ia2f827381ec768a7867918d61d7afb2f68457832
This commit is contained in:
parent
ef69c15bb9
commit
acc04202e8
4 changed files with 16 additions and 16 deletions
|
@ -130,7 +130,7 @@ ref class TypeEmitter : public ::System::IDisposable
|
|||
css::reflection::XCompoundTypeDescription > >& seq_exceptionsTd );
|
||||
/* Creates ::System::Type object for UNO exceptions. The UNO exceptions are
|
||||
obtained by
|
||||
com::sun::star::reflection::XServiceConstructorDescription::getExceptions
|
||||
css::reflection::XServiceConstructorDescription::getExceptions
|
||||
In a first step the respective CLI types are created. Then it is examined
|
||||
if a Type represents a super class of another class. If so the Type of the
|
||||
derived class is discarded. For example there are a uno RuntimeException and
|
||||
|
|
|
@ -47,17 +47,17 @@ inline OUString String_to_ustring( ::System::String ^ str )
|
|||
|
||||
template< typename T >
|
||||
inline ::System::Object ^ to_cli(
|
||||
::com::sun::star::uno::Reference< T > const & x )
|
||||
css::uno::Reference< T > const & x )
|
||||
{
|
||||
::com::sun::star::uno::Mapping mapping(
|
||||
css::uno::Mapping mapping(
|
||||
CPPU_CURRENT_LANGUAGE_BINDING_NAME, UNO_LB_CLI );
|
||||
OSL_ASSERT( mapping.is() );
|
||||
if (! mapping.is())
|
||||
{
|
||||
throw ::com::sun::star::uno::RuntimeException(
|
||||
throw css::uno::RuntimeException(
|
||||
"cannot get mapping from C++ to CLI!",
|
||||
::com::sun::star::uno::Reference<
|
||||
::com::sun::star::uno::XInterface >() );
|
||||
css::uno::Reference<
|
||||
css::uno::XInterface >() );
|
||||
}
|
||||
|
||||
intptr_t intptr =
|
||||
|
@ -71,17 +71,17 @@ inline ::System::Object ^ to_cli(
|
|||
|
||||
template< typename T >
|
||||
inline void to_uno(
|
||||
::com::sun::star::uno::Reference< T > * pRet, ::System::Object ^ x )
|
||||
css::uno::Reference< T > * pRet, ::System::Object ^ x )
|
||||
{
|
||||
::com::sun::star::uno::Mapping mapping(
|
||||
css::uno::Mapping mapping(
|
||||
UNO_LB_CLI, CPPU_CURRENT_LANGUAGE_BINDING_NAME );
|
||||
OSL_ASSERT( mapping.is() );
|
||||
if (! mapping.is())
|
||||
{
|
||||
throw ::com::sun::star::uno::RuntimeException(
|
||||
throw css::uno::RuntimeException(
|
||||
"cannot get mapping from CLI to C++!",
|
||||
::com::sun::star::uno::Reference<
|
||||
::com::sun::star::uno::XInterface >() );
|
||||
css::uno::Reference<
|
||||
css::uno::XInterface >() );
|
||||
}
|
||||
|
||||
::System::Runtime::InteropServices::GCHandle handle(
|
||||
|
|
|
@ -1106,11 +1106,11 @@ void SAL_CALL cli_proxy_dispatch(
|
|||
catch (BridgeRuntimeError & err)
|
||||
{
|
||||
// binary identical struct
|
||||
::com::sun::star::uno::RuntimeException exc(
|
||||
css::uno::RuntimeException exc(
|
||||
"[cli_uno bridge error] " + err.m_message,
|
||||
::com::sun::star::uno::Reference<
|
||||
::com::sun::star::uno::XInterface >() );
|
||||
::com::sun::star::uno::Type const & exc_type = ::getCppuType( & exc);
|
||||
css::uno::Reference<
|
||||
css::uno::XInterface >() );
|
||||
css::uno::Type const & exc_type = ::getCppuType( & exc);
|
||||
uno_type_any_construct( *uno_exc, &exc, exc_type.getTypeLibType(), 0);
|
||||
#if OSL_DEBUG_LEVEL >= 1
|
||||
OString cstr_msg(OUStringToOString(exc.Message,
|
||||
|
|
|
@ -176,7 +176,7 @@ struct CliProxy: public uno_Interface
|
|||
const Bridge* m_bridge;
|
||||
const gcroot<System::Object^> m_cliI;
|
||||
gcroot<System::Type^> m_type;
|
||||
const com::sun::star::uno::TypeDescription m_unoType;
|
||||
const css::uno::TypeDescription m_unoType;
|
||||
const gcroot<System::String^> m_oid;
|
||||
const OUString m_usOid;
|
||||
|
||||
|
|
Loading…
Reference in a new issue