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

ucb: simplify deprecated XTypeProvider.getImplementationId

Change-Id: Ifece71871e3af4021f885c5dac1b6c406d2962b2
üst 2b0cfed3
...@@ -84,17 +84,7 @@ uno::Sequence< sal_Int8 > SAL_CALL ...@@ -84,17 +84,7 @@ uno::Sequence< sal_Int8 > SAL_CALL
FileContentIdentifier::getImplementationId() FileContentIdentifier::getImplementationId()
throw( uno::RuntimeException, std::exception ) throw( uno::RuntimeException, std::exception )
{ {
static cppu::OImplementationId* pId = NULL; return css::uno::Sequence<sal_Int8>();
if ( !pId )
{
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
static cppu::OImplementationId id( false );
pId = &id;
}
}
return (*pId).getImplementationId();
} }
......
...@@ -145,17 +145,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL FTPContent::getImplementationId() ...@@ -145,17 +145,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL FTPContent::getImplementationId()
throw( css::uno::RuntimeException, throw( css::uno::RuntimeException,
std::exception ) std::exception )
{ {
static cppu::OImplementationId* pId = NULL; return css::uno::Sequence<sal_Int8>();
if ( !pId )
{
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
static cppu::OImplementationId id( false );
pId = &id;
}
}
return (*pId).getImplementationId();
} }
css::uno::Sequence< css::uno::Type > SAL_CALL FTPContent::getTypes() css::uno::Sequence< css::uno::Type > SAL_CALL FTPContent::getTypes()
......
...@@ -76,17 +76,7 @@ Sequence<sal_Int8> SAL_CALL ...@@ -76,17 +76,7 @@ Sequence<sal_Int8> SAL_CALL
FTPContentIdentifier::getImplementationId() FTPContentIdentifier::getImplementationId()
throw(RuntimeException, std::exception) throw(RuntimeException, std::exception)
{ {
static cppu::OImplementationId* pId = NULL; return css::uno::Sequence<sal_Int8>();
if(!pId)
{
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
static cppu::OImplementationId id( false );
pId = &id;
}
}
return (*pId).getImplementationId();
} }
......
...@@ -84,17 +84,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL FTPContentProvider::getImplementationId( ...@@ -84,17 +84,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL FTPContentProvider::getImplementationId(
throw( css::uno::RuntimeException, throw( css::uno::RuntimeException,
std::exception ) std::exception )
{ {
static cppu::OImplementationId* pId = NULL; return css::uno::Sequence<sal_Int8>();
if ( !pId )
{
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
static cppu::OImplementationId id( false );
pId = &id;
}
}
return (*pId).getImplementationId();
} }
css::uno::Sequence< css::uno::Type > SAL_CALL FTPContentProvider::getTypes() css::uno::Sequence< css::uno::Type > SAL_CALL FTPContentProvider::getTypes()
......
...@@ -127,17 +127,7 @@ uno::Sequence< sal_Int8 > SAL_CALL ...@@ -127,17 +127,7 @@ uno::Sequence< sal_Int8 > SAL_CALL
InteractionSupplyPassword::getImplementationId() InteractionSupplyPassword::getImplementationId()
throw( uno::RuntimeException, std::exception ) throw( uno::RuntimeException, std::exception )
{ {
static cppu::OImplementationId * pId = 0; return css::uno::Sequence<sal_Int8>();
if ( !pId )
{
osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
if ( !pId )
{
static cppu::OImplementationId id( false );
pId = &id;
}
}
return (*pId).getImplementationId();
} }
......
...@@ -207,7 +207,7 @@ uno::Sequence< uno::Type > SAL_CALL Storage::getTypes() ...@@ -207,7 +207,7 @@ uno::Sequence< uno::Type > SAL_CALL Storage::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL Storage::getImplementationId() uno::Sequence< sal_Int8 > SAL_CALL Storage::getImplementationId()
throw ( uno::RuntimeException, std::exception ) throw ( uno::RuntimeException, std::exception )
{ {
return m_xWrappedTypeProv->getImplementationId(); return css::uno::Sequence<sal_Int8>();
} }
...@@ -670,7 +670,7 @@ uno::Sequence< uno::Type > SAL_CALL OutputStream::getTypes() ...@@ -670,7 +670,7 @@ uno::Sequence< uno::Type > SAL_CALL OutputStream::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL OutputStream::getImplementationId() uno::Sequence< sal_Int8 > SAL_CALL OutputStream::getImplementationId()
throw ( uno::RuntimeException, std::exception ) throw ( uno::RuntimeException, std::exception )
{ {
return m_xWrappedTypeProv->getImplementationId(); return css::uno::Sequence<sal_Int8>();
} }
...@@ -865,7 +865,7 @@ uno::Sequence< uno::Type > SAL_CALL Stream::getTypes() ...@@ -865,7 +865,7 @@ uno::Sequence< uno::Type > SAL_CALL Stream::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL Stream::getImplementationId() uno::Sequence< sal_Int8 > SAL_CALL Stream::getImplementationId()
throw ( uno::RuntimeException, std::exception ) throw ( uno::RuntimeException, std::exception )
{ {
return m_xWrappedTypeProv->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