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

extensions: simplify deprecated XTypeProvider.getImplementationId

Change-Id: I234d36bc7ef9e8e27087067f6e43d7e522e52d4d
üst c63ba20f
...@@ -83,17 +83,7 @@ namespace abp ...@@ -83,17 +83,7 @@ namespace abp
Sequence<sal_Int8> SAL_CALL OABSPilotUno::getImplementationId( ) throw(RuntimeException, std::exception) Sequence<sal_Int8> SAL_CALL OABSPilotUno::getImplementationId( ) throw(RuntimeException, std::exception)
{ {
static ::cppu::OImplementationId* s_pId; return css::uno::Sequence<sal_Int8>();
if ( !s_pId )
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if ( !s_pId )
{
static ::cppu::OImplementationId s_aId;
s_pId = &s_aId;
}
}
return s_pId->getImplementationId();
} }
......
...@@ -32,8 +32,7 @@ OUnoAutoPilot<TYPE, SERVICEINFO>::OUnoAutoPilot(const ::com::sun::star::uno::Ref ...@@ -32,8 +32,7 @@ OUnoAutoPilot<TYPE, SERVICEINFO>::OUnoAutoPilot(const ::com::sun::star::uno::Ref
template <class TYPE, class SERVICEINFO> template <class TYPE, class SERVICEINFO>
::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{ {
static ::cppu::OImplementationId aId; return css::uno::Sequence<sal_Int8>();
return aId.getImplementationId();
} }
......
...@@ -653,17 +653,7 @@ Sequence< Type > SAL_CALL OleServer_Impl::getTypes( ) throw(RuntimeException) ...@@ -653,17 +653,7 @@ Sequence< Type > SAL_CALL OleServer_Impl::getTypes( ) throw(RuntimeException)
} }
Sequence< sal_Int8 > SAL_CALL OleServer_Impl::getImplementationId() throw(RuntimeException) Sequence< sal_Int8 > SAL_CALL OleServer_Impl::getImplementationId() throw(RuntimeException)
{ {
static OImplementationId *pId = 0; return css::uno::Sequence<sal_Int8>();
if( ! pId )
{
MutexGuard guard( Mutex::getGlobalMutex() );
if( ! pId )
{
static OImplementationId id( false );
pId = &id;
}
}
return (*pId).getImplementationId();
} }
......
...@@ -45,8 +45,7 @@ namespace pcr ...@@ -45,8 +45,7 @@ namespace pcr
Sequence<sal_Int8> SAL_CALL MasterDetailLinkDialog::getImplementationId( ) throw(RuntimeException, std::exception) Sequence<sal_Int8> SAL_CALL MasterDetailLinkDialog::getImplementationId( ) throw(RuntimeException, std::exception)
{ {
static ::cppu::OImplementationId aId; return css::uno::Sequence<sal_Int8>();
return aId.getImplementationId();
} }
......
...@@ -67,8 +67,7 @@ namespace pcr ...@@ -67,8 +67,7 @@ namespace pcr
Sequence<sal_Int8> SAL_CALL OControlFontDialog::getImplementationId( ) throw(RuntimeException, std::exception) Sequence<sal_Int8> SAL_CALL OControlFontDialog::getImplementationId( ) throw(RuntimeException, std::exception)
{ {
static ::cppu::OImplementationId aId; return css::uno::Sequence<sal_Int8>();
return aId.getImplementationId();
} }
......
...@@ -71,8 +71,7 @@ namespace pcr ...@@ -71,8 +71,7 @@ namespace pcr
Sequence<sal_Int8> SAL_CALL OTabOrderDialog::getImplementationId( ) throw(RuntimeException, std::exception) Sequence<sal_Int8> SAL_CALL OTabOrderDialog::getImplementationId( ) throw(RuntimeException, std::exception)
{ {
static ::cppu::OImplementationId aId; return css::uno::Sequence<sal_Int8>();
return aId.getImplementationId();
} }
......
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