diff options
| -rw-r--r-- | include/ucbhelper/macros.hxx | 12 | ||||
| -rw-r--r-- | ucbhelper/source/provider/contentidentifier.cxx | 12 | ||||
| -rw-r--r-- | ucbhelper/source/provider/interactionrequest.cxx | 96 |
3 files changed, 10 insertions, 110 deletions
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx index e74c597bd5c9..9f69cdab4166 100644 --- a/include/ucbhelper/macros.hxx +++ b/include/ucbhelper/macros.hxx @@ -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 ) \ diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx index 387e04deec20..6d389af0d195 100644 --- a/ucbhelper/source/provider/contentidentifier.cxx +++ b/ucbhelper/source/provider/contentidentifier.cxx @@ -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>(); } diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx index 3521968a1ea4..5e51bb246adb 100644 --- a/ucbhelper/source/provider/interactionrequest.cxx +++ b/ucbhelper/source/provider/interactionrequest.cxx @@ -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>(); } |