connectivity: simplify deprecated XTypeProvider.getImplementationId

Change-Id: I4a62143fc46b39525968f10236b10cb547fe8c50

12 files changed, 15 insertions, 81 deletions

diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index d51d9ee3ae67..1d8ac87a1c26 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -219,17 +219,7 @@ Sequence<Type > BaseResultSet::getTypes() throw( RuntimeException, std::exceptio
 
 Sequence< sal_Int8> BaseResultSet::getImplementationId() throw( RuntimeException, std::exception )
 {
-    static cppu::OImplementationId *pId;
-    if( ! pId )
-    {
-        MutexGuard guard( osl::Mutex::getGlobalMutex() );
-        if( ! pId )
-        {
-            static cppu::OImplementationId id(false);
-            pId = &id;
-        }
-    }
-    return pId->getImplementationId();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 // Reference< XResultSetMetaData > BaseResultSet::getMetaData(  ) throw (SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
index eb2e5e2d63ff..b37c3b2e03fd 100644
--- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
@@ -109,17 +109,7 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Type > FakedUpdateableResult
 com::sun::star::uno::Sequence< sal_Int8> FakedUpdateableResultSet::getImplementationId()
         throw( com::sun::star::uno::RuntimeException, std::exception )
 {
-    static cppu::OImplementationId *pId;
-    if( ! pId )
-    {
-        MutexGuard guard( osl::Mutex::getGlobalMutex() );
-        if( ! pId )
-        {
-            static cppu::OImplementationId id(false);
-            pId = &id;
-        }
-    }
-    return pId->getImplementationId();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 void FakedUpdateableResultSet::insertRow(  ) throw (SQLException, RuntimeException, std::exception)
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index 65ecdb4f2c0a..7269c3ca6999 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -287,17 +287,7 @@ Sequence< Type > PreparedStatement::getTypes() throw ( RuntimeException, std::ex
 
 Sequence< sal_Int8> PreparedStatement::getImplementationId() throw ( RuntimeException, std::exception )
 {
-    static cppu::OImplementationId *pId;
-    if( ! pId )
-    {
-        MutexGuard guard( osl::Mutex::getGlobalMutex() );
-        if( ! pId )
-        {
-            static cppu::OImplementationId id(false);
-            pId = &id;
-        }
-    }
-    return pId->getImplementationId();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 void PreparedStatement::close(  ) throw (SQLException, RuntimeException, std::exception)
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index d997bb8ceb60..2a1d9a33bd20 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -232,17 +232,7 @@ Sequence< Type > Statement::getTypes() throw ( RuntimeException, std::exception
 
 Sequence< sal_Int8> Statement::getImplementationId() throw ( RuntimeException, std::exception )
 {
-    static cppu::OImplementationId *pId;
-    if( ! pId )
-    {
-        MutexGuard guard( osl::Mutex::getGlobalMutex() );
-        if( ! pId )
-        {
-            static cppu::OImplementationId id(false);
-            pId = &id;
-        }
-    }
-    return pId->getImplementationId();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 void Statement::close(  ) throw (SQLException, RuntimeException, std::exception)
diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx
index 0b4881e48490..ee6bfde61dbd 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.hxx
@@ -40,8 +40,6 @@
 #include <boost/unordered_map.hpp>
 #include <vector>
 
-#include <rtl/uuid.h>
-
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
@@ -121,15 +119,11 @@ typedef ::boost::unordered_map
 struct ImplementationStatics
 {
     ImplementationStatics() :
-        implementationId(16),
         pProps(0)
-    {
-        rtl_createUuid( (sal_uInt8*)implementationId.getArray(), 0 , sal_False );
-    }
+    {}
 
     OUString implName;
     com::sun::star::uno::Sequence< OUString > serviceNames;
-    com::sun::star::uno::Sequence< sal_Int8 > implementationId;
     cppu::IPropertyArrayHelper *pProps;
     com::sun::star::uno::Sequence< com::sun::star::uno::Type > types;
 };
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index 490f0a16784c..ac7b755faf90 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -170,17 +170,7 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Type > UpdateableResultSet::
 com::sun::star::uno::Sequence< sal_Int8> UpdateableResultSet::getImplementationId()
         throw( com::sun::star::uno::RuntimeException, std::exception )
 {
-    static cppu::OImplementationId *pId;
-    if( ! pId )
-    {
-        MutexGuard guard( osl::Mutex::getGlobalMutex() );
-        if( ! pId )
-        {
-            static cppu::OImplementationId id(false);
-            pId = &id;
-        }
-    }
-    return pId->getImplementationId();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 OUString UpdateableResultSet::buildWhereClause()
diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx
index 14b458b15389..02cd0fc97dfd 100644
--- a/connectivity/source/drivers/postgresql/pq_xbase.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx
@@ -196,17 +196,7 @@ com::sun::star::uno::Any ReflectionBase::queryInterface(
 
 Sequence< sal_Int8> ReflectionBase::getImplementationId() throw( RuntimeException, std::exception )
 {
-    static cppu::OImplementationId *pId;
-    if( ! pId )
-    {
-        MutexGuard guard( osl::Mutex::getGlobalMutex() );
-        if( ! pId )
-        {
-            static cppu::OImplementationId id(false);
-            pId = &id;
-        }
-    }
-    return pId->getImplementationId();
+    return css::uno::Sequence<sal_Int8>();
 }
 
 void ReflectionBase::copyValuesFrom( const Reference< XPropertySet > & set )
diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx b/connectivity/source/drivers/postgresql/pq_xindex.cxx
index 5f6074db68b6..9c81b6ce47f5 100644
--- a/connectivity/source/drivers/postgresql/pq_xindex.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindex.cxx
@@ -144,7 +144,7 @@ Sequence<Type > Index::getTypes() throw( RuntimeException, std::exception )
 
 Sequence< sal_Int8> Index::getImplementationId() throw( RuntimeException, std::exception )
 {
-    return getStatics().refl.index.implementationId;
+    return css::uno::Sequence<sal_Int8>();
 }
 
 Any Index::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception)
@@ -217,7 +217,7 @@ Sequence<Type > IndexDescriptor::getTypes() throw( RuntimeException, std::except
 
 Sequence< sal_Int8> IndexDescriptor::getImplementationId() throw( RuntimeException, std::exception )
 {
-    return getStatics().refl.indexDescriptor.implementationId;
+    return css::uno::Sequence<sal_Int8>();
 }
 
 Any IndexDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception)
diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx b/connectivity/source/drivers/postgresql/pq_xkey.cxx
index 41f137d20f66..7aacf2a72fcd 100644
--- a/connectivity/source/drivers/postgresql/pq_xkey.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkey.cxx
@@ -146,7 +146,7 @@ Sequence<Type > Key::getTypes() throw( RuntimeException, std::exception )
 
 Sequence< sal_Int8> Key::getImplementationId() throw( RuntimeException, std::exception )
 {
-    return getStatics().refl.key.implementationId;
+    return css::uno::Sequence<sal_Int8>();
 }
 
 Any Key::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception)
@@ -214,7 +214,7 @@ Sequence<Type > KeyDescriptor::getTypes() throw( RuntimeException, std::exceptio
 
 Sequence< sal_Int8> KeyDescriptor::getImplementationId() throw( RuntimeException, std::exception )
 {
-    return getStatics().refl.keyDescriptor.implementationId;
+    return css::uno::Sequence<sal_Int8>();
 }
 
 Any KeyDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception)
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx
index 146b42fb4b3e..e6e1363c8117 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx
@@ -305,7 +305,7 @@ Sequence<Type > Table::getTypes() throw( RuntimeException, std::exception )
 
 Sequence< sal_Int8> Table::getImplementationId() throw( RuntimeException, std::exception )
 {
-    return getStatics().refl.table.implementationId;
+    return css::uno::Sequence<sal_Int8>();
 }
 
 Any Table::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception)
@@ -417,7 +417,7 @@ Sequence<Type > TableDescriptor::getTypes() throw( RuntimeException, std::except
 
 Sequence< sal_Int8> TableDescriptor::getImplementationId() throw( RuntimeException, std::exception )
 {
-    return getStatics().refl.tableDescriptor.implementationId;
+    return css::uno::Sequence<sal_Int8>();
 }
 
 Any TableDescriptor::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception)
diff --git a/connectivity/source/drivers/postgresql/pq_xuser.cxx b/connectivity/source/drivers/postgresql/pq_xuser.cxx
index a446267073fa..1ebf29df7d05 100644
--- a/connectivity/source/drivers/postgresql/pq_xuser.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xuser.cxx
@@ -125,7 +125,7 @@ Sequence<Type > User::getTypes() throw( RuntimeException, std::exception )
 
 Sequence< sal_Int8> User::getImplementationId() throw( RuntimeException, std::exception )
 {
-    return getStatics().refl.user.implementationId;
+    return css::uno::Sequence<sal_Int8>();
 }
 
 Any User::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception)
diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx
index 79b808fa5f2e..ca2202f6e8f0 100644
--- a/connectivity/source/drivers/postgresql/pq_xview.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xview.cxx
@@ -197,7 +197,7 @@ Sequence<Type > View::getTypes() throw( RuntimeException, std::exception )
 
 Sequence< sal_Int8> View::getImplementationId() throw( RuntimeException, std::exception )
 {
-    return getStatics().refl.view.implementationId;
+    return css::uno::Sequence<sal_Int8>();
 }
 
 Any View::queryInterface( const Type & reqType ) throw (RuntimeException, std::exception)