svtools: simplify deprecated XTypeProvider.getImplementationId

Change-Id: I2534ad4a720dd5d13324ac6fb19b8676ae50ff4e

10 files changed, 8 insertions, 75 deletions

diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx
index 35d8090e1729..7188d3b2ee1b 100644
--- a/include/svtools/accessibleruler.hxx
+++ b/include/svtools/accessibleruler.hxx
@@ -179,8 +179,6 @@ public:
     virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
         getImplementationId( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
-private:
-    static ::com::sun::star::uno::Sequence< sal_Int8 > getUniqueId( void );
 protected:
 
     /// @Return the object's current bounding box relative to the desktop.
diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx
index 99e1dd5f39dc..c9d55b98324e 100644
--- a/svtools/source/control/accessibleruler.cxx
+++ b/svtools/source/control/accessibleruler.cxx
@@ -379,7 +379,7 @@ Sequence< OUString > SAL_CALL SvtRulerAccessible::getSupportedServiceNames( void
 //=====  XTypeProvider  =======================================================
 Sequence< sal_Int8 > SAL_CALL SvtRulerAccessible::getImplementationId( void ) throw( RuntimeException, std::exception )
 {
-    return getUniqueId();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 void SAL_CALL SvtRulerAccessible::disposing()
@@ -425,21 +425,6 @@ Rectangle SvtRulerAccessible::GetBoundingBox( void ) throw( RuntimeException )
     return Rectangle( mpRepr->GetPosPixel(), mpRepr->GetSizePixel() );
 }
 
-Sequence< sal_Int8 > SvtRulerAccessible::getUniqueId( void )
-{
-    static OImplementationId*   pId = 0;
-    if( !pId )
-    {
-        MutexGuard                      aGuard( Mutex::getGlobalMutex() );
-        if( !pId)
-        {
-            static OImplementationId    aId;
-            pId = &aId;
-        }
-    }
-    return pId->getImplementationId();
-}
-
 void SvtRulerAccessible::ThrowExceptionIfNotAlive( void ) throw( lang::DisposedException )
 {
     if( IsNotAlive() )
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index f235e21d8519..e094783eb52f 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -278,15 +278,10 @@ uno::Sequence< uno::Type > SAL_CALL GraphicDescriptor::getTypes()
     return aTypes;
 }
 
-namespace
-{
-    class theGraphicDescriptorUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theGraphicDescriptorUnoTunnelId > {};
-}
-
 uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId()
     throw( uno::RuntimeException, std::exception )
 {
-    return theGraphicDescriptorUnoTunnelId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 
diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx
index 1248f6ae3e5f..3b75db9b4a6e 100644
--- a/svtools/source/graphic/graphic.cxx
+++ b/svtools/source/graphic/graphic.cxx
@@ -99,21 +99,6 @@ void SAL_CALL Graphic::release() throw()
     ::unographic::GraphicDescriptor::release();
 }
 
-
-
-namespace
-{
-    class theGraphicUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theGraphicUnoTunnelId > {};
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId_Static()
-    throw(uno::RuntimeException)
-{
-    return theGraphicUnoTunnelId::get().getSeq();
-}
-
-
-
 OUString Graphic::getImplementationName_Static()
     throw()
 {
@@ -177,7 +162,7 @@ uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes()
 uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId()
     throw(uno::RuntimeException, std::exception)
 {
-    return getImplementationId_Static();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 
diff --git a/svtools/source/graphic/graphic.hxx b/svtools/source/graphic/graphic.hxx
index b399a5fae634..acfbd45c8c5d 100644
--- a/svtools/source/graphic/graphic.hxx
+++ b/svtools/source/graphic/graphic.hxx
@@ -45,7 +45,6 @@ public:
     void init( const ::Graphic& rGraphic ) throw();
 
     static const ::Graphic* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
-    static ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId_Static(  ) throw(::com::sun::star::uno::RuntimeException);
     static OUString getImplementationName_Static() throw();
     static ::com::sun::star::uno::Sequence< OUString >  getSupportedServiceNames_Static() throw();
 
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index 2adc8e87a27e..0a4d36b8d7ea 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -91,15 +91,10 @@ uno::Sequence< uno::Type > SAL_CALL GraphicProvider::getTypes()
     return aTypes;
 }
 
-namespace
-{
-    class theGraphicProviderUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theGraphicProviderUnoTunnelId > {};
-}
-
 uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId()
     throw(uno::RuntimeException, std::exception)
 {
-    return theGraphicProviderUnoTunnelId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index d5f6163bef0d..e903fc9c53c8 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -146,15 +146,10 @@ uno::Sequence< uno::Type > SAL_CALL GraphicRendererVCL::getTypes()
     return aTypes;
 }
 
-namespace
-{
-    class theGraphicRendererVCLUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theGraphicRendererVCLUnoTunnelId > {};
-}
-
 uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId()
     throw( uno::RuntimeException, std::exception )
 {
-    return theGraphicRendererVCLUnoTunnelId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 
diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx
index eaefd7abd29f..402d8a5f897e 100644
--- a/svtools/source/hatchwindow/hatchwindow.cxx
+++ b/svtools/source/hatchwindow/hatchwindow.cxx
@@ -161,20 +161,7 @@ uno::Sequence< uno::Type > SAL_CALL VCLXHatchWindow::getTypes()
 uno::Sequence< sal_Int8 > SAL_CALL VCLXHatchWindow::getImplementationId()
     throw( uno::RuntimeException, std::exception )
 {
-    static ::cppu::OImplementationId* pID = NULL ;
-
-    if ( pID == NULL )
-    {
-        ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ) ;
-
-        if ( pID == NULL )
-        {
-            static ::cppu::OImplementationId aID( false ) ;
-            pID = &aID ;
-        }
-    }
-
-    return pID->getImplementationId() ;
+    return css::uno::Sequence<sal_Int8>();
 }
 
 ::com::sun::star::awt::Size SAL_CALL VCLXHatchWindow::getHatchBorderSize() throw (::com::sun::star::uno::RuntimeException, std::exception)
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index 1d45f6c14dc3..f947fa8dc560 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -89,8 +89,7 @@ namespace {
 
     Sequence<sal_Int8> SAL_CALL OAddressBookSourceDialogUno::getImplementationId(  ) throw(RuntimeException, std::exception)
     {
-        static ::cppu::OImplementationId aId;
-        return aId.getImplementationId();
+        return css::uno::Sequence<sal_Int8>();
     }
 
 
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 21fbb35944df..e8709576220f 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -361,15 +361,10 @@ uno::Sequence< uno::Type > SAL_CALL SvUnoImageMapObject::getTypes()
     return aTypes;
 }
 
-namespace
-{
-    class theSvUnoImageMapObjectImplementationId : public rtl::Static< UnoTunnelIdInit, theSvUnoImageMapObjectImplementationId > {};
-}
-
 uno::Sequence< sal_Int8 > SAL_CALL SvUnoImageMapObject::getImplementationId()
     throw (uno::RuntimeException, std::exception)
 {
-    return theSvUnoImageMapObjectImplementationId::get().getSeq();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 // XServiceInfo