Skip to content

C
core
Kaydet (Commit) c7d2ed40 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

ucbhelper: simplify deprecated XTypeProvider.getImplementationId 

Change-Id: I7797ba7fdc47a5f8d2453e839d8644bf125652bd
üst a3858b40
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 110 deletions
include/ucbhelper/macros.hxx
Dosyayı görüntüle @ c7d2ed40
......@@ -58,17 +58,7 @@ com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL \
Class::getImplementationId() \
throw( com::sun::star::uno::RuntimeException, std::exception ) \
{ \
static cppu::OImplementationId* pId = NULL; \
if ( !pId ) \
{ \
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); \
if ( !pId ) \
{ \
static cppu::OImplementationId id( false ); \
pId = &id; \
} \
} \
return (*pId).getImplementationId(); \
return css::uno::Sequence<sal_Int8>(); \
}
#define GETTYPES_IMPL_START( Class ) \
......
ucbhelper/source/provider/contentidentifier.cxx
Dosyayı görüntüle @ c7d2ed40
......@@ -136,17 +136,7 @@ Sequence< sal_Int8 > SAL_CALL
ContentIdentifier::getImplementationId()
throw( RuntimeException, std::exception )
{
static cppu::OImplementationId* pId = NULL;
if ( !pId )
{
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
static cppu::OImplementationId id( false );
pId = &id;
}
}
return (*pId).getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
......
ucbhelper/source/provider/interactionrequest.cxx
Dosyayı görüntüle @ c7d2ed40
......@@ -147,17 +147,7 @@ InteractionRequest::queryInterface( const uno::Type & rType )
uno::Sequence< sal_Int8 > SAL_CALL InteractionRequest::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
static cppu::OImplementationId* pId = NULL;
if ( !pId )
{
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
static cppu::OImplementationId id( false );
pId = &id;
}
}
return (*pId).getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
......@@ -299,17 +289,7 @@ InteractionAbort::queryInterface( const uno::Type & rType )
uno::Sequence< sal_Int8 > SAL_CALL InteractionAbort::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
static cppu::OImplementationId* pId = NULL;
if ( !pId )
{
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
static cppu::OImplementationId id( false );
pId = &id;
}
}
return (*pId).getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
......@@ -401,17 +381,7 @@ InteractionRetry::queryInterface( const uno::Type & rType )
uno::Sequence< sal_Int8 > SAL_CALL InteractionRetry::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
static cppu::OImplementationId* pId = NULL;
if ( !pId )
{
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
static cppu::OImplementationId id( false );
pId = &id;
}
}
return (*pId).getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
......@@ -503,17 +473,7 @@ InteractionApprove::queryInterface( const uno::Type & rType )
uno::Sequence< sal_Int8 > SAL_CALL InteractionApprove::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
static cppu::OImplementationId* pId = NULL;
if ( !pId )
{
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
static cppu::OImplementationId id( false );
pId = &id;
}
}
return (*pId).getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
......@@ -605,17 +565,7 @@ InteractionDisapprove::queryInterface( const uno::Type & rType )
uno::Sequence< sal_Int8 > SAL_CALL InteractionDisapprove::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
static cppu::OImplementationId* pId = NULL;
if ( !pId )
{
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
static cppu::OImplementationId id( false );
pId = &id;
}
}
return (*pId).getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
......@@ -709,17 +659,7 @@ uno::Sequence< sal_Int8 > SAL_CALL
InteractionSupplyAuthentication::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
static cppu::OImplementationId* pId = NULL;
if ( !pId )
{
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
static cppu::OImplementationId id( false );
pId = &id;
}
}
return (*pId).getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
......@@ -973,17 +913,7 @@ InteractionSupplyName::queryInterface( const uno::Type & rType )
uno::Sequence< sal_Int8 > SAL_CALL InteractionSupplyName::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
static cppu::OImplementationId* pId = NULL;
if ( !pId )
{
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
static cppu::OImplementationId id( false );
pId = &id;
}
}
return (*pId).getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
......@@ -1090,17 +1020,7 @@ uno::Sequence< sal_Int8 > SAL_CALL
InteractionReplaceExistingData::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
static cppu::OImplementationId* pId = NULL;
if ( !pId )
{
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
static cppu::OImplementationId id( false );
pId = &id;
}
}
return (*pId).getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
......
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