ucb: simplify deprecated XTypeProvider.getImplementationId

Change-Id: Ifece71871e3af4021f885c5dac1b6c406d2962b2

6 files changed, 8 insertions, 58 deletions

diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx
index 0fb38f5d52ac..b33c63b05d1b 100644
--- a/ucb/source/ucp/file/filid.cxx
+++ b/ucb/source/ucp/file/filid.cxx
@@ -84,17 +84,7 @@ uno::Sequence< sal_Int8 > SAL_CALL
 FileContentIdentifier::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>();
 }
 
 
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 88641aa475e8..7bc48ebdbbc9 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -145,17 +145,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL FTPContent::getImplementationId()
     throw( css::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>();
 }
 
 css::uno::Sequence< css::uno::Type > SAL_CALL FTPContent::getTypes()
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index 0232bd5194e3..94837e4a3f18 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -76,17 +76,7 @@ Sequence<sal_Int8> SAL_CALL
 FTPContentIdentifier::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/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 0b2c57884b1d..8e12847fc34e 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -84,17 +84,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL FTPContentProvider::getImplementationId(
     throw( css::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>();
 }
 
 css::uno::Sequence< css::uno::Type > SAL_CALL FTPContentProvider::getTypes()
diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
index 1a5ddcc35248..8bfac5f2f0e2 100644
--- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
@@ -127,17 +127,7 @@ uno::Sequence< sal_Int8 > SAL_CALL
 InteractionSupplyPassword::getImplementationId()
     throw( uno::RuntimeException, std::exception )
 {
-    static cppu::OImplementationId * pId = 0;
-    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/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
index a0ec619e44e1..c5f4aa352973 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
@@ -207,7 +207,7 @@ uno::Sequence< uno::Type > SAL_CALL Storage::getTypes()
 uno::Sequence< sal_Int8 > SAL_CALL Storage::getImplementationId()
     throw ( uno::RuntimeException, std::exception )
 {
-    return m_xWrappedTypeProv->getImplementationId();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 
@@ -670,7 +670,7 @@ uno::Sequence< uno::Type > SAL_CALL OutputStream::getTypes()
 uno::Sequence< sal_Int8 > SAL_CALL OutputStream::getImplementationId()
     throw ( uno::RuntimeException, std::exception )
 {
-    return m_xWrappedTypeProv->getImplementationId();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 
@@ -865,7 +865,7 @@ uno::Sequence< uno::Type > SAL_CALL Stream::getTypes()
 uno::Sequence< sal_Int8 > SAL_CALL Stream::getImplementationId()
     throw ( uno::RuntimeException, std::exception )
 {
-    return m_xWrappedTypeProv->getImplementationId();
+    return css::uno::Sequence<sal_Int8>();
 }