Kaydet (Commit) 5bce6e34 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

stoc: simplify deprecated XTypeProvider.getImplementationId

Change-Id: I57eca2dcf316232c26c528015c4ba18ba3c4760d
üst af277041
......@@ -68,17 +68,7 @@ Sequence< Type > ArrayIdlClassImpl::getTypes()
Sequence< sal_Int8 > ArrayIdlClassImpl::getImplementationId()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
static OImplementationId * s_pId = 0;
if (! s_pId)
{
MutexGuard aGuard( getMutexAccess() );
if (! s_pId)
{
static OImplementationId s_aId;
s_pId = &s_aId;
}
}
return s_pId->getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
// XIdlArray
......
......@@ -111,17 +111,7 @@ Sequence< Type > IdlCompFieldImpl::getTypes()
Sequence< sal_Int8 > IdlCompFieldImpl::getImplementationId()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
static OImplementationId * s_pId = 0;
if (! s_pId)
{
MutexGuard aGuard( getMutexAccess() );
if (! s_pId)
{
static OImplementationId s_aId;
s_pId = &s_aId;
}
}
return s_pId->getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
// XIdlMember
......
......@@ -119,17 +119,7 @@ Sequence< Type > IdlReflectionServiceImpl::getTypes()
Sequence< sal_Int8 > IdlReflectionServiceImpl::getImplementationId()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
static OImplementationId * s_pId = 0;
if (! s_pId)
{
MutexGuard aGuard( _aComponentMutex );
if (! s_pId)
{
static OImplementationId s_aId;
s_pId = &s_aId;
}
}
return s_pId->getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
// XComponent
......
......@@ -109,17 +109,7 @@ Sequence< Type > IdlEnumFieldImpl::getTypes()
Sequence< sal_Int8 > IdlEnumFieldImpl::getImplementationId()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
static OImplementationId * s_pId = 0;
if (! s_pId)
{
MutexGuard aGuard( getMutexAccess() );
if (! s_pId)
{
static OImplementationId s_aId;
s_pId = &s_aId;
}
}
return s_pId->getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
// XIdlMember
......
......@@ -123,17 +123,7 @@ Sequence< Type > IdlAttributeFieldImpl::getTypes()
Sequence< sal_Int8 > IdlAttributeFieldImpl::getImplementationId()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
static OImplementationId * s_pId = 0;
if (! s_pId)
{
MutexGuard aGuard( getMutexAccess() );
if (! s_pId)
{
static OImplementationId s_aId;
s_pId = &s_aId;
}
}
return s_pId->getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
// XIdlMember
......@@ -427,17 +417,7 @@ Sequence< Type > IdlInterfaceMethodImpl::getTypes()
Sequence< sal_Int8 > IdlInterfaceMethodImpl::getImplementationId()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
static OImplementationId * s_pId = 0;
if (! s_pId)
{
MutexGuard aGuard( getMutexAccess() );
if (! s_pId)
{
static OImplementationId s_aId;
s_pId = &s_aId;
}
}
return s_pId->getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
// XIdlMember
......
......@@ -1050,17 +1050,7 @@ Sequence< Type > SAL_CALL Invocation_Impl::getTypes(void) throw( RuntimeExceptio
Sequence< sal_Int8 > SAL_CALL Invocation_Impl::getImplementationId( ) throw( RuntimeException, std::exception)
{
static OImplementationId *pId = 0;
if( ! pId )
{
MutexGuard guard( Mutex::getGlobalMutex() );
if( ! pId )
{
static OImplementationId id( false );
pId = &id;
}
}
return pId->getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
......
......@@ -56,7 +56,7 @@ public class TestComponent implements XServiceInfo, XTypeProvider
// XTypeProvider
public byte[] getImplementationId( )
{
return TestComponent.class.getName().getBytes();
return new byte[0];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment