diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-10 16:30:46 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-10 17:39:59 +0100 |
| commit | 2b0cfed33fa3f00485a4cf1566c90ede0a5139f0 (patch) | |
| tree | 56e47e32f89a28a2cc4f982800979084b7c5f657 /include/toolkit | |
| parent | 2f67d67cf3264f8647433a298dec7270f4bfb689 (diff) | |
toolkit: simplify deprecated XTypeProvider.getImplementationId
Change-Id: Ibe481aebad026f8c182052f1327bed8a1054cf7a
Diffstat (limited to 'include/toolkit')
| -rw-r--r-- | include/toolkit/controls/geometrycontrolmodel_impl.hxx | 12 | ||||
| -rw-r--r-- | include/toolkit/helper/macros.hxx | 12 |
2 files changed, 2 insertions, 22 deletions
diff --git a/include/toolkit/controls/geometrycontrolmodel_impl.hxx b/include/toolkit/controls/geometrycontrolmodel_impl.hxx index c035c2e6ea47..b8054dd27dc0 100644 --- a/include/toolkit/controls/geometrycontrolmodel_impl.hxx +++ b/include/toolkit/controls/geometrycontrolmodel_impl.hxx @@ -58,17 +58,7 @@ void OGeometryControlModel<CONTROLMODEL>::fillProperties(::com::sun::star::uno:: template <class CONTROLMODEL> ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL OGeometryControlModel<CONTROLMODEL>::getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { - static ::cppu::OImplementationId * pId = NULL; - if ( !pId ) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if ( !pId ) - { - static ::cppu::OImplementationId s_aId; - pId = &s_aId; - } - } - return pId->getImplementationId(); + return css::uno::Sequence<sal_Int8>(); } diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx index f6622cb3f225..22ae92f34bca 100644 --- a/include/toolkit/helper/macros.hxx +++ b/include/toolkit/helper/macros.hxx @@ -78,17 +78,7 @@ ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference< #define IMPL_IMPLEMENTATION_ID( ClassName ) \ ::com::sun::star::uno::Sequence< sal_Int8 > ClassName::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 IMPL_XTYPEPROVIDER_START( ClassName ) \ |