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

sfx2: simplify deprecated XTypeProvider.getImplementationId

Change-Id: I7d98f0d3f101d7441e83d37f0ee36a74b991a996
üst 8150f506
......@@ -1435,7 +1435,7 @@ public class UndoManager
public byte[] getImplementationId()
{
return getClass().toString().getBytes();
return new byte[0];
}
}
......
......@@ -299,20 +299,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL BackingComp::getTypes()
css::uno::Sequence< sal_Int8 > SAL_CALL BackingComp::getImplementationId()
throw(css::uno::RuntimeException, std::exception)
{
static ::cppu::OImplementationId* pID = NULL;
if (!pID)
{
/* GLOBAL SAFE { */
::osl::MutexGuard aLock(::osl::Mutex::getGlobalMutex());
// Control these pointer again ... it can be, that another instance will be faster then this one!
if (!pID)
{
static ::cppu::OImplementationId aID(false);
pID = &aID;
}
/* } GLOBAL SAFE */
}
return pID->getImplementationId();
return css::uno::Sequence<sal_Int8>();
}
OUString SAL_CALL BackingComp::getImplementationName()
......
......@@ -615,30 +615,7 @@ Sequence< uno::Type > SAL_CALL SfxBaseModel::getTypes() throw( RuntimeException,
Sequence< sal_Int8 > SAL_CALL SfxBaseModel::getImplementationId() throw( RuntimeException, std::exception )
{
// Create one Id for all instances of this class.
// Use ethernet address to do this! (sal_True)
// Optimize this method
// We initialize a static variable only one time. And we don't must use a mutex at every call!
// For the first call; pID is NULL - for the second call pID is different from NULL!
static ::cppu::OImplementationId* pID = NULL ;
if ( pID == NULL )
{
// Ready for multithreading; get global mutex for first call of this method only! see before
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ) ;
// Control these pointer again ... it can be, that another instance will be faster then these!
if ( pID == NULL )
{
// Create a new static ID ...
static ::cppu::OImplementationId aID( false ) ;
// ... and set his address to static pointer!
pID = &aID ;
}
}
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