core.git: connectivity/inc connectivity/source dbaccess/source include/connectivity

[Noel Grandin (via logerrit)]

 connectivity/inc/TIndexColumns.hxx                   |    2 -
 connectivity/inc/TKeyColumns.hxx                     |    2 -
 connectivity/source/commontools/TColumnsHelper.cxx   |    6 ++--
 connectivity/source/commontools/TIndexColumns.cxx    |    4 +-
 connectivity/source/commontools/TIndexes.cxx         |    6 ++--
 connectivity/source/commontools/TKeyColumns.cxx      |    4 +-
 connectivity/source/commontools/TKeys.cxx            |   12 ++++----
 connectivity/source/drivers/ado/AColumns.cxx         |    4 +-
 connectivity/source/drivers/ado/AGroups.cxx          |    4 +-
 connectivity/source/drivers/ado/AIndexes.cxx         |    4 +-
 connectivity/source/drivers/ado/AKeys.cxx            |    4 +-
 connectivity/source/drivers/ado/ATables.cxx          |    4 +-
 connectivity/source/drivers/ado/AUsers.cxx           |    4 +-
 connectivity/source/drivers/ado/AViews.cxx           |    4 +-
 connectivity/source/drivers/calc/CTables.cxx         |    2 -
 connectivity/source/drivers/component/CColumns.cxx   |    6 ++--
 connectivity/source/drivers/dbase/DColumns.cxx       |    8 ++---
 connectivity/source/drivers/dbase/DIndexColumns.cxx  |    8 ++---
 connectivity/source/drivers/dbase/DIndexes.cxx       |    6 ++--
 connectivity/source/drivers/dbase/DTables.cxx        |    4 +-
 connectivity/source/drivers/evoab2/NColumns.cxx      |    4 +-
 connectivity/source/drivers/evoab2/NColumns.hxx      |    2 -
 connectivity/source/drivers/evoab2/NTables.cxx       |    4 +-
 connectivity/source/drivers/evoab2/NTables.hxx       |    2 -
 connectivity/source/drivers/file/FColumns.cxx        |    4 +-
 connectivity/source/drivers/file/FTables.cxx         |    4 +-
 connectivity/source/drivers/firebird/Keys.cxx        |    2 -
 connectivity/source/drivers/firebird/Tables.cxx      |    6 ++--
 connectivity/source/drivers/firebird/Tables.hxx      |    4 +-
 connectivity/source/drivers/firebird/Users.cxx       |    4 +-
 connectivity/source/drivers/firebird/Users.hxx       |    4 +-
 connectivity/source/drivers/firebird/Views.cxx       |    5 ++-
 connectivity/source/drivers/firebird/Views.hxx       |    5 ++-
 connectivity/source/drivers/flat/EColumns.cxx        |    6 ++--
 connectivity/source/drivers/flat/ETables.cxx         |    2 -
 connectivity/source/drivers/hsqldb/HTables.cxx       |    8 ++---
 connectivity/source/drivers/hsqldb/HUsers.cxx        |    4 +-
 connectivity/source/drivers/hsqldb/HViews.cxx        |    4 +-
 connectivity/source/drivers/macab/MacabColumns.cxx   |    4 +-
 connectivity/source/drivers/macab/MacabColumns.hxx   |    2 -
 connectivity/source/drivers/macab/MacabTables.cxx    |    4 +-
 connectivity/source/drivers/macab/MacabTables.hxx    |    2 -
 connectivity/source/drivers/mysql_jdbc/YTables.cxx   |   10 +++---
 connectivity/source/drivers/mysql_jdbc/YUsers.cxx    |    6 ++--
 connectivity/source/drivers/mysql_jdbc/YViews.cxx    |    6 ++--
 connectivity/source/drivers/mysqlc/mysqlc_tables.cxx |   11 ++++---
 connectivity/source/drivers/mysqlc/mysqlc_tables.hxx |    8 +++--
 connectivity/source/drivers/mysqlc/mysqlc_users.cxx  |    6 ++--
 connectivity/source/drivers/mysqlc/mysqlc_users.hxx  |    5 ++-
 connectivity/source/drivers/mysqlc/mysqlc_views.cxx  |    5 ++-
 connectivity/source/drivers/mysqlc/mysqlc_views.hxx  |    5 ++-
 connectivity/source/drivers/writer/WTables.cxx       |    2 -
 connectivity/source/inc/ado/AColumns.hxx             |    4 +-
 connectivity/source/inc/ado/AGroups.hxx              |    4 +-
 connectivity/source/inc/ado/AIndexes.hxx             |    4 +-
 connectivity/source/inc/ado/AKeys.hxx                |    4 +-
 connectivity/source/inc/ado/ATables.hxx              |    4 +-
 connectivity/source/inc/ado/AUsers.hxx               |    4 +-
 connectivity/source/inc/ado/AViews.hxx               |    4 +-
 connectivity/source/inc/calc/CTables.hxx             |    2 -
 connectivity/source/inc/component/CColumns.hxx       |    2 -
 connectivity/source/inc/dbase/DColumns.hxx           |    4 +-
 connectivity/source/inc/dbase/DIndexColumns.hxx      |    4 +-
 connectivity/source/inc/dbase/DIndexes.hxx           |    4 +-
 connectivity/source/inc/dbase/DTables.hxx            |    4 +-
 connectivity/source/inc/file/FColumns.hxx            |    2 -
 connectivity/source/inc/file/FTables.hxx             |    2 -
 connectivity/source/inc/flat/EColumns.hxx            |    2 -
 connectivity/source/inc/flat/ETables.hxx             |    2 -
 connectivity/source/inc/hsqldb/HTables.hxx           |    6 ++--
 connectivity/source/inc/hsqldb/HUsers.hxx            |    4 +-
 connectivity/source/inc/hsqldb/HViews.hxx            |    4 +-
 connectivity/source/inc/mysql/YTables.hxx            |    6 ++--
 connectivity/source/inc/mysql/YUsers.hxx             |    4 +-
 connectivity/source/inc/mysql/YViews.hxx             |    4 +-
 connectivity/source/inc/writer/WTables.hxx           |    2 -
 connectivity/source/sdbcx/VCollection.cxx            |   28 +++++++++----------
 dbaccess/source/core/api/CIndexes.cxx                |    6 ++--
 dbaccess/source/core/api/CIndexes.hxx                |    4 +-
 dbaccess/source/core/api/CRowSetDataColumn.cxx       |    4 +-
 dbaccess/source/core/api/CRowSetDataColumn.hxx       |    2 -
 dbaccess/source/core/api/FilteredContainer.cxx       |    2 -
 dbaccess/source/core/api/HelperCollections.cxx       |    8 ++---
 dbaccess/source/core/api/HelperCollections.hxx       |    4 +-
 dbaccess/source/core/api/RowSetBase.cxx              |    6 ++--
 dbaccess/source/core/api/column.cxx                  |   10 +++---
 dbaccess/source/core/api/table.cxx                   |    2 -
 dbaccess/source/core/api/tablecontainer.cxx          |   12 ++++----
 dbaccess/source/core/api/viewcontainer.cxx           |    8 ++---
 dbaccess/source/core/inc/FilteredContainer.hxx       |    2 -
 dbaccess/source/core/inc/column.hxx                  |    6 ++--
 dbaccess/source/core/inc/tablecontainer.hxx          |    4 +-
 dbaccess/source/core/inc/viewcontainer.hxx           |    4 +-
 include/connectivity/TColumnsHelper.hxx              |    4 +-
 include/connectivity/TIndexes.hxx                    |    4 +-
 include/connectivity/TKeys.hxx                       |    8 ++---
 include/connectivity/sdbcx/VCollection.hxx           |   22 ++++++--------
 97 files changed, 246 insertions(+), 238 deletions(-)

New commits:
commit 2df7a51f6e7724a749823435dcd00cc0c07e1a96
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Mar 3 12:54:20 2025 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Mar 3 14:53:27 2025 +0100

    expand the ObjectType typedef
    
    in preparation for making some of the code more typesafe
    
    Change-Id: I7c8a4b30cd1144feaaa2e31fce67cd6545065a38
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182425
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Tested-by: Jenkins

diff --git a/connectivity/inc/TIndexColumns.hxx 
b/connectivity/inc/TIndexColumns.hxx
index 6d02c445eda2..216a31c7909b 100644
--- a/connectivity/inc/TIndexColumns.hxx
+++ b/connectivity/inc/TIndexColumns.hxx
@@ -27,7 +27,7 @@ namespace connectivity
     class OIndexColumns final : public sdbcx::OCollection
     {
         OIndexHelper* m_pIndex;
-        virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+        virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
         virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
         virtual void impl_refresh() override;
     public:
diff --git a/connectivity/inc/TKeyColumns.hxx b/connectivity/inc/TKeyColumns.hxx
index 19510e4965e9..1a45fd244a0a 100644
--- a/connectivity/inc/TKeyColumns.hxx
+++ b/connectivity/inc/TKeyColumns.hxx
@@ -27,7 +27,7 @@ namespace connectivity
     class OKeyColumnsHelper final : public connectivity::sdbcx::OCollection
     {
         OTableKeyHelper* m_pKey;
-        virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+        virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
         virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
         virtual void impl_refresh() override;
     public:
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx 
b/connectivity/source/commontools/TColumnsHelper.cxx
index ed0a5f0e54a9..b29715c9b472 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -64,7 +64,7 @@ OColumnsHelper::~OColumnsHelper()
 {
 }
 
-sdbcx::ObjectType OColumnsHelper::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
OColumnsHelper::createObject(const OUString& _rName)
 {
     assert(m_pTable && "NO Table set. Error!");
     Reference<XConnection> xConnection = m_pTable->getConnection();
@@ -92,7 +92,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const 
OUString& _rName)
         nDataType       = aFind->second.second;
     } // if ( aFind != m_pImpl->m_aColumnInfo.end() )
 
-    sdbcx::ObjectType xRet;
+    css::uno::Reference< css::beans::XPropertySet > xRet;
     const ColumnDesc* pColDesc = m_pTable->getColumnDescription(_rName);
     if ( pColDesc )
     {
@@ -156,7 +156,7 @@ Reference< XPropertySet > OColumnsHelper::createDescriptor()
 }
 
 // XAppend
-sdbcx::ObjectType OColumnsHelper::appendObject( const OUString& _rForName, 
const Reference< XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > OColumnsHelper::appendObject( 
const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     OSL_ENSURE(m_pTable,"OColumnsHelper::appendByDescriptor: Table is null!");
diff --git a/connectivity/source/commontools/TIndexColumns.cxx 
b/connectivity/source/commontools/TIndexColumns.cxx
index d190bb2af312..2f3b5fb0e043 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -39,7 +39,7 @@ OIndexColumns::OIndexColumns(   OIndexHelper* _pIndex,
 {
 }
 
-sdbcx::ObjectType OIndexColumns::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
OIndexColumns::createObject(const OUString& _rName)
 {
     ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
     OUString aCatalog, aSchema, aTable;
@@ -65,7 +65,7 @@ sdbcx::ObjectType OIndexColumns::createObject(const OUString& 
_rName)
     xResult = m_pIndex->getTable()->getConnection()->getMetaData()->getColumns(
         Catalog, aSchema, aTable, _rName);
 
-    sdbcx::ObjectType xRet;
+    css::uno::Reference< css::beans::XPropertySet > xRet;
     if ( xResult.is() )
     {
         Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/commontools/TIndexes.cxx 
b/connectivity/source/commontools/TIndexes.cxx
index b50f09182c26..ceb9aac439cc 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -50,13 +50,13 @@ OIndexesHelper::OIndexesHelper(OTableHelper* _pTable,
 }
 
 
-sdbcx::ObjectType OIndexesHelper::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
OIndexesHelper::createObject(const OUString& _rName)
 {
     Reference< XConnection> xConnection = m_pTable->getConnection();
     if ( !xConnection.is() )
         return nullptr;
 
-    sdbcx::ObjectType xRet;
+    css::uno::Reference< css::beans::XPropertySet > xRet;
     OUString aName,aQualifier;
     sal_Int32 nLen = _rName.indexOf('.');
     if ( nLen != -1 )
@@ -122,7 +122,7 @@ Reference< XPropertySet > OIndexesHelper::createDescriptor()
 }
 
 // XAppend
-sdbcx::ObjectType OIndexesHelper::appendObject( const OUString& _rForName, 
const Reference< XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > OIndexesHelper::appendObject( 
const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     Reference< XConnection> xConnection = m_pTable->getConnection();
     if ( !xConnection.is() )
diff --git a/connectivity/source/commontools/TKeyColumns.cxx 
b/connectivity/source/commontools/TKeyColumns.cxx
index a26628765417..fd976a4e2085 100644
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
@@ -41,7 +41,7 @@ OKeyColumnsHelper::OKeyColumnsHelper(   OTableKeyHelper* 
_pKey,
 {
 }
 
-sdbcx::ObjectType OKeyColumnsHelper::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
OKeyColumnsHelper::createObject(const OUString& _rName)
 {
     ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
     OUString aCatalog, aSchema, aTable;
@@ -70,7 +70,7 @@ sdbcx::ObjectType OKeyColumnsHelper::createObject(const 
OUString& _rName)
         }
     }
 
-    sdbcx::ObjectType xRet;
+    css::uno::Reference< css::beans::XPropertySet > xRet;
 
     // now describe the column _rName and set his related column
     xResult = m_pKey->getTable()->getMetaData()->getColumns(Catalog, aSchema, 
aTable, _rName);
diff --git a/connectivity/source/commontools/TKeys.cxx 
b/connectivity/source/commontools/TKeys.cxx
index 14af0910a8d8..47fb36515de3 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -50,9 +50,9 @@ OKeysHelper::OKeysHelper(   OTableHelper* _pTable,
 {
 }
 
-sdbcx::ObjectType OKeysHelper::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
OKeysHelper::createObject(const OUString& _rName)
 {
-    sdbcx::ObjectType xRet;
+    css::uno::Reference< css::beans::XPropertySet > xRet;
 
     if(!_rName.isEmpty())
     {
@@ -105,7 +105,9 @@ static OUString getKeyRuleString(bool _bUpdate,sal_Int32 
_nKeyRule)
     return sRet;
 }
 
-void OKeysHelper::cloneDescriptorColumns( const sdbcx::ObjectType& 
_rSourceDescriptor, const sdbcx::ObjectType& _rDestDescriptor )
+void OKeysHelper::cloneDescriptorColumns(
+    const css::uno::Reference< css::beans::XPropertySet >& _rSourceDescriptor,
+    const css::uno::Reference< css::beans::XPropertySet >& _rDestDescriptor )
 {
     Reference< XColumnsSupplier > xColSupp( _rSourceDescriptor, 
UNO_QUERY_THROW );
     Reference< XIndexAccess > xSourceCols( xColSupp->getColumns(), 
UNO_QUERY_THROW );
@@ -122,7 +124,7 @@ void OKeysHelper::cloneDescriptorColumns( const 
sdbcx::ObjectType& _rSourceDescr
 }
 
 // XAppend
-sdbcx::ObjectType OKeysHelper::appendObject( const OUString& _rForName, const 
Reference< XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > OKeysHelper::appendObject( 
const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     Reference< XConnection> xConnection = m_pTable->getConnection();
     if ( !xConnection.is() )
@@ -263,7 +265,7 @@ void OKeysHelper::dropObject(sal_Int32 _nPos, const 
OUString& _sElementName)
     if ( !xConnection.is() || m_pTable->isNew() )
         return;
 
-    Reference<XPropertySet> xKey(getObject(_nPos),UNO_QUERY);
+    Reference<XPropertySet> xKey(getObject(_nPos));
     if ( m_pTable->getKeyService().is() )
     {
         m_pTable->getKeyService()->dropKey(m_pTable,xKey);
diff --git a/connectivity/source/drivers/ado/AColumns.cxx 
b/connectivity/source/drivers/ado/AColumns.cxx
index f56a6d8d007a..5e8cba1f8ac0 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -43,7 +43,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::container;
 
-sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > OColumns::createObject(const 
OUString& _rName)
 {
     return new 
OAdoColumn(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName));
 }
@@ -60,7 +60,7 @@ Reference< XPropertySet > OColumns::createDescriptor()
 }
 
 // XAppend
-sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference< 
XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > OColumns::appendObject( const 
OUString&, const Reference< XPropertySet >& descriptor )
 {
     rtl::Reference<OAdoColumn> pColumn = dynamic_cast<OAdoColumn*>( 
descriptor.get() );
     Reference< XPropertySet > xColumn;
diff --git a/connectivity/source/drivers/ado/AGroups.cxx 
b/connectivity/source/drivers/ado/AGroups.cxx
index 6f7c8b2da8d0..527cfaac13fa 100644
--- a/connectivity/source/drivers/ado/AGroups.cxx
+++ b/connectivity/source/drivers/ado/AGroups.cxx
@@ -40,7 +40,7 @@ using namespace com::sun::star::sdbc;
 using namespace com::sun::star::container;
 
 
-sdbcx::ObjectType OGroups::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > OGroups::createObject(const 
OUString& _rName)
 {
     return new OAdoGroup(m_pCatalog,isCaseSensitive(),_rName);
 }
@@ -56,7 +56,7 @@ Reference< XPropertySet > OGroups::createDescriptor()
 }
 
 // XAppend
-sdbcx::ObjectType OGroups::appendObject( const OUString& _rForName, const 
Reference< XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > OGroups::appendObject( const 
OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     OAdoGroup* pGroup = dynamic_cast<OAdoGroup*>(descriptor.get());
     if ( pGroup == nullptr )
diff --git a/connectivity/source/drivers/ado/AIndexes.cxx 
b/connectivity/source/drivers/ado/AIndexes.cxx
index 1e427a2f0782..ea80e2d6d4a7 100644
--- a/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/connectivity/source/drivers/ado/AIndexes.cxx
@@ -40,7 +40,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::container;
 
-sdbcx::ObjectType OIndexes::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > OIndexes::createObject(const 
OUString& _rName)
 {
     return new 
OAdoIndex(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName));
 }
@@ -56,7 +56,7 @@ Reference< XPropertySet > OIndexes::createDescriptor()
 }
 
 // XAppend
-sdbcx::ObjectType OIndexes::appendObject( const OUString& _rForName, const 
Reference< XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > OIndexes::appendObject( const 
OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     OAdoIndex* pIndex = dynamic_cast<OAdoIndex*>(descriptor.get());
     if ( pIndex == nullptr )
diff --git a/connectivity/source/drivers/ado/AKeys.cxx 
b/connectivity/source/drivers/ado/AKeys.cxx
index 32d02bc743e7..caf7eda5a391 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -40,7 +40,7 @@ using namespace com::sun::star::sdbc;
 using namespace com::sun::star::sdbcx;
 using namespace com::sun::star::container;
 
-sdbcx::ObjectType OKeys::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > OKeys::createObject(const 
OUString& _rName)
 {
     return new 
OAdoKey(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName));
 }
@@ -56,7 +56,7 @@ Reference< XPropertySet > OKeys::createDescriptor()
 }
 
 // XAppend
-sdbcx::ObjectType OKeys::appendObject( const OUString&, const Reference< 
XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > OKeys::appendObject( const 
OUString&, const Reference< XPropertySet >& descriptor )
 {
     OAdoKey* pKey = dynamic_cast<OAdoKey*>( descriptor.get() );
     if ( pKey == nullptr)
diff --git a/connectivity/source/drivers/ado/ATables.cxx 
b/connectivity/source/drivers/ado/ATables.cxx
index 07910462fb17..48a82ceee2d5 100644
--- a/connectivity/source/drivers/ado/ATables.cxx
+++ b/connectivity/source/drivers/ado/ATables.cxx
@@ -44,7 +44,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::container;
 
-sdbcx::ObjectType OTables::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > OTables::createObject(const 
OUString& _rName)
 {
     OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid");
     return new 
OAdoTable(this,isCaseSensitive(),m_pCatalog,m_aCollection.GetItem(_rName));
@@ -63,7 +63,7 @@ Reference< XPropertySet > OTables::createDescriptor()
 }
 
 // XAppend
-sdbcx::ObjectType OTables::appendObject( const OUString&, const Reference< 
XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > OTables::appendObject( const 
OUString&, const Reference< XPropertySet >& descriptor )
 {
     OAdoTable* pTable = dynamic_cast<OAdoTable*>( descriptor.get() );
     if ( pTable == nullptr )
diff --git a/connectivity/source/drivers/ado/AUsers.cxx 
b/connectivity/source/drivers/ado/AUsers.cxx
index 4b050d239237..ce45af21732c 100644
--- a/connectivity/source/drivers/ado/AUsers.cxx
+++ b/connectivity/source/drivers/ado/AUsers.cxx
@@ -39,7 +39,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::container;
 
-sdbcx::ObjectType OUsers::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > OUsers::createObject(const 
OUString& _rName)
 {
     return new OAdoUser(m_pCatalog,isCaseSensitive(),_rName);
 }
@@ -55,7 +55,7 @@ Reference< XPropertySet > OUsers::createDescriptor()
 }
 
 // XAppend
-sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const 
Reference< XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > OUsers::appendObject( const 
OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     OUserExtend* pUser = dynamic_cast<OUserExtend*>( descriptor.get() );
     if ( pUser == nullptr )
diff --git a/connectivity/source/drivers/ado/AViews.cxx 
b/connectivity/source/drivers/ado/AViews.cxx
index 943422289627..536b95309bb2 100644
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
@@ -42,7 +42,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::container;
 
-sdbcx::ObjectType OViews::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > OViews::createObject(const 
OUString& _rName)
 {
     rtl::Reference<OAdoView> pView = new 
OAdoView(isCaseSensitive(),m_aCollection.GetItem(_rName));
     pView->setNew(false);
@@ -61,7 +61,7 @@ Reference< XPropertySet > OViews::createDescriptor()
 
 
 // XAppend
-sdbcx::ObjectType OViews::appendObject( const OUString& _rForName, const 
Reference< XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > OViews::appendObject( const 
OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     OAdoView* pView = dynamic_cast<OAdoView*>( descriptor.get() );
     if ( pView == nullptr )
diff --git a/connectivity/source/drivers/calc/CTables.cxx 
b/connectivity/source/drivers/calc/CTables.cxx
index d0b23a8b64c6..87fb959fbda6 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -31,7 +31,7 @@ using namespace connectivity::file;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::container;
 
-sdbcx::ObjectType OCalcTables::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
OCalcTables::createObject(const OUString& _rName)
 {
     rtl::Reference<OCalcTable> pTable = new OCalcTable(this, 
static_cast<OCalcConnection*>(static_cast<OFileCatalog&>(m_rParent).getConnection()),
                                         _rName,u"TABLE"_ustr);
diff --git a/connectivity/source/drivers/component/CColumns.cxx 
b/connectivity/source/drivers/component/CColumns.cxx
index 7726d3a326d0..9fc7f22882fe 100644
--- a/connectivity/source/drivers/component/CColumns.cxx
+++ b/connectivity/source/drivers/component/CColumns.cxx
@@ -25,14 +25,14 @@ using namespace connectivity;
 using namespace ::com::sun::star::uno;
 
 
-sdbcx::ObjectType OComponentColumns::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
OComponentColumns::createObject(const OUString& _rName)
 {
     ::rtl::Reference<OSQLColumns> aCols = m_pTable->getTableColumns();
 
     OSQLColumns::const_iterator aIter = 
find(aCols->begin(),aCols->end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive()));
-    sdbcx::ObjectType xRet;
+    css::uno::Reference< css::beans::XPropertySet > xRet;
     if(aIter != aCols->end())
-        xRet = sdbcx::ObjectType(*aIter,UNO_QUERY);
+        xRet = *aIter;
     return xRet;
 }
 
diff --git a/connectivity/source/drivers/dbase/DColumns.cxx 
b/connectivity/source/drivers/dbase/DColumns.cxx
index 402ec4e41c07..4025fcc5a800 100644
--- a/connectivity/source/drivers/dbase/DColumns.cxx
+++ b/connectivity/source/drivers/dbase/DColumns.cxx
@@ -26,16 +26,16 @@ using namespace connectivity;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 
-sdbcx::ObjectType ODbaseColumns::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
ODbaseColumns::createObject(const OUString& _rName)
 {
     ODbaseTable* pTable = static_cast<ODbaseTable*>(m_pTable);
 
     const ::rtl::Reference<OSQLColumns>& aCols = pTable->getTableColumns();
     OSQLColumns::const_iterator aIter = 
find(aCols->begin(),aCols->end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive()));
 
-    sdbcx::ObjectType xRet;
+    css::uno::Reference< css::beans::XPropertySet > xRet;
     if(aIter != aCols->end())
-        xRet = sdbcx::ObjectType(*aIter,UNO_QUERY);
+        xRet = *aIter;
     return xRet;
 }
 
@@ -52,7 +52,7 @@ Reference< XPropertySet > ODbaseColumns::createDescriptor()
 
 
 // XAppend
-sdbcx::ObjectType ODbaseColumns::appendObject( const OUString& _rForName, 
const Reference< XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > ODbaseColumns::appendObject( 
const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     if ( m_pTable->isNew() )
         return cloneDescriptor( descriptor );
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx 
b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index 8b20903fa1d3..dbf8f59a43c9 100644
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbc;
 
 
-sdbcx::ObjectType ODbaseIndexColumns::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
ODbaseIndexColumns::createObject(const OUString& _rName)
 {
     const ODbaseTable* pTable = m_pIndex->getTable();
 
@@ -43,9 +43,9 @@ sdbcx::ObjectType ODbaseIndexColumns::createObject(const 
OUString& _rName)
         xCol = *aIter;
 
     if(!xCol.is())
-        return sdbcx::ObjectType();
+        return css::uno::Reference< css::beans::XPropertySet >();
 
-    sdbcx::ObjectType xRet = new sdbcx::OIndexColumn(true,_rName
+    css::uno::Reference< css::beans::XPropertySet > xRet = new 
sdbcx::OIndexColumn(true,_rName
                                                     
,getString(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)))
                                                     ,OUString()
                                                     
,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)))
@@ -71,7 +71,7 @@ Reference< XPropertySet > 
ODbaseIndexColumns::createDescriptor()
     return new 
sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
 
-sdbcx::ObjectType ODbaseIndexColumns::appendObject( const OUString& 
/*_rForName*/, const Reference< XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > 
ODbaseIndexColumns::appendObject( const OUString& /*_rForName*/, const 
Reference< XPropertySet >& descriptor )
 {
     return cloneDescriptor( descriptor );
 }
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx 
b/connectivity/source/drivers/dbase/DIndexes.cxx
index df630c531c3e..daee28bb9b51 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -31,7 +31,7 @@ using namespace ::connectivity::dbase;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 
-sdbcx::ObjectType ODbaseIndexes::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
ODbaseIndexes::createObject(const OUString& _rName)
 {
     OUString sFile = m_pTable->getConnection()->getURL() +
         OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER) +
@@ -45,7 +45,7 @@ sdbcx::ObjectType ODbaseIndexes::createObject(const OUString& 
_rName)
         ::dbtools::throwGenericSQLException( sError, *m_pTable );
     }
 
-    sdbcx::ObjectType xRet;
+    css::uno::Reference< css::beans::XPropertySet > xRet;
     std::unique_ptr<SvStream> pFileStream = 
::connectivity::file::OFileTable::createStream_simpleError(sFile, 
StreamMode::READ | StreamMode::NOCREATE | StreamMode::SHARE_DENYWRITE);
     if(pFileStream)
     {
@@ -84,7 +84,7 @@ Reference< XPropertySet > ODbaseIndexes::createDescriptor()
 }
 
 // XAppend
-sdbcx::ObjectType ODbaseIndexes::appendObject( const OUString& _rForName, 
const Reference< XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > ODbaseIndexes::appendObject( 
const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     ODbaseIndex* pIndex = dynamic_cast<ODbaseIndex*>(descriptor.get());
     if(pIndex)
diff --git a/connectivity/source/drivers/dbase/DTables.cxx 
b/connectivity/source/drivers/dbase/DTables.cxx
index e17f301a1042..d43bfb31356a 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 
-sdbcx::ObjectType ODbaseTables::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
ODbaseTables::createObject(const OUString& _rName)
 {
     rtl::Reference<ODbaseTable> pRet = new ODbaseTable(this, 
static_cast<ODbaseConnection*>(static_cast<OFileCatalog&>(m_rParent).getConnection()),
                                         _rName,u"TABLE"_ustr);
@@ -61,7 +61,7 @@ Reference< XPropertySet > ODbaseTables::createDescriptor()
 }
 
 // XAppend
-sdbcx::ObjectType ODbaseTables::appendObject( const OUString& _rForName, const 
Reference< XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > ODbaseTables::appendObject( 
const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     auto pTable = dynamic_cast<ODbaseTable*>(descriptor.get());
     if(pTable)
diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx 
b/connectivity/source/drivers/evoab2/NColumns.cxx
index 99fce8f3bf46..cbd8f7e20839 100644
--- a/connectivity/source/drivers/evoab2/NColumns.cxx
+++ b/connectivity/source/drivers/evoab2/NColumns.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace connectivity::evoab;
 
 
-sdbcx::ObjectType OEvoabColumns::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
OEvoabColumns::createObject(const OUString& _rName)
 {
     const Any aCatalog;
     const OUString sCatalogName;
@@ -42,7 +42,7 @@ sdbcx::ObjectType OEvoabColumns::createObject(const OUString& 
_rName)
         sTableName,
         _rName);
 
-    sdbcx::ObjectType xRet;
+    css::uno::Reference< css::beans::XPropertySet > xRet;
     if (xResult.is())
     {
         Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx 
b/connectivity/source/drivers/evoab2/NColumns.hxx
index f768c51bb046..14ab99f19f42 100644
--- a/connectivity/source/drivers/evoab2/NColumns.hxx
+++ b/connectivity/source/drivers/evoab2/NColumns.hxx
@@ -28,7 +28,7 @@ namespace connectivity::evoab
         {
             OEvoabTable*    m_pTable;
 
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
 
         public:
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx 
b/connectivity/source/drivers/evoab2/NTables.cxx
index d972564a4668..405ce9b4040a 100644
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
@@ -31,13 +31,13 @@ using namespace connectivity::sdbcx;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdbc;
 
-ObjectType OEvoabTables::createObject(const OUString& aName)
+css::uno::Reference< css::beans::XPropertySet > 
OEvoabTables::createObject(const OUString& aName)
 {
     Sequence< OUString > aTypes { u"TABLE"_ustr };
 
     Reference< XResultSet > xResult = 
m_xMetaData->getTables(Any(),u"%"_ustr,aName,aTypes);
 
-    ObjectType xRet;
+    css::uno::Reference< css::beans::XPropertySet > xRet;
     if(xResult.is())
     {
         Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/evoab2/NTables.hxx 
b/connectivity/source/drivers/evoab2/NTables.hxx
index e5d454729431..f540ad2833e1 100644
--- a/connectivity/source/drivers/evoab2/NTables.hxx
+++ b/connectivity/source/drivers/evoab2/NTables.hxx
@@ -28,7 +28,7 @@ namespace connectivity::evoab
         {
             css::uno::Reference< css::sdbc::XDatabaseMetaData >       
m_xMetaData;
         protected:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
         public:
             OEvoabTables(css::uno::Reference< css::sdbc::XDatabaseMetaData > 
_xMetaData,
diff --git a/connectivity/source/drivers/file/FColumns.cxx 
b/connectivity/source/drivers/file/FColumns.cxx
index 97e9d0c23a2a..55727c9a48f0 100644
--- a/connectivity/source/drivers/file/FColumns.cxx
+++ b/connectivity/source/drivers/file/FColumns.cxx
@@ -28,7 +28,7 @@ using namespace connectivity;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdbc;
 
-sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > OColumns::createObject(const 
OUString& _rName)
 {
     const OUString sCatalogName;
     const OUString sSchemaName(m_pTable->getSchema());
@@ -36,7 +36,7 @@ sdbcx::ObjectType OColumns::createObject(const OUString& 
_rName)
     Reference< XResultSet > xResult = 
m_pTable->getConnection()->getMetaData()->getColumns(Any(),
     sSchemaName, sTableName, _rName);
 
-    sdbcx::ObjectType xRet;
+    css::uno::Reference< css::beans::XPropertySet > xRet;
     if(xResult.is())
     {
         Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/file/FTables.cxx 
b/connectivity/source/drivers/file/FTables.cxx
index eda988d9bb44..25321b1721af 100644
--- a/connectivity/source/drivers/file/FTables.cxx
+++ b/connectivity/source/drivers/file/FTables.cxx
@@ -26,9 +26,9 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 
-sdbcx::ObjectType OTables::createObject(const OUString& /*_rName*/)
+css::uno::Reference< css::beans::XPropertySet > OTables::createObject(const 
OUString& /*_rName*/)
 {
-    return sdbcx::ObjectType();
+    return nullptr;
 }
 
 void OTables::impl_refresh(  )
diff --git a/connectivity/source/drivers/firebird/Keys.cxx 
b/connectivity/source/drivers/firebird/Keys.cxx
index 8de112ec6fc4..18d74c8b6ac0 100644
--- a/connectivity/source/drivers/firebird/Keys.cxx
+++ b/connectivity/source/drivers/firebird/Keys.cxx
@@ -37,7 +37,7 @@ void Keys::dropObject(sal_Int32 nPosition, const OUString& 
sName)
     if (m_pTable->isNew())
         return;
 
-    uno::Reference<XPropertySet> xKey(getObject(nPosition), UNO_QUERY);
+    uno::Reference<XPropertySet> xKey(getObject(nPosition));
 
     if (xKey.is())
     {
diff --git a/connectivity/source/drivers/firebird/Tables.cxx 
b/connectivity/source/drivers/firebird/Tables.cxx
index 7ef7a26e0dad..3675882446f4 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -41,7 +41,7 @@ void Tables::impl_refresh()
     static_cast<Catalog&>(m_rParent).refreshTables();
 }
 
-ObjectType Tables::createObject(const OUString& rName)
+css::uno::Reference< css::beans::XPropertySet > Tables::createObject(const 
OUString& rName)
 {
     // Only retrieving a single table, so table type is irrelevant (param 4)
     uno::Reference< XResultSet > xTables = m_xMetaData->getTables(Any(),
@@ -57,7 +57,7 @@ ObjectType Tables::createObject(const OUString& rName)
     if (!xTables->next())
         throw RuntimeException();
 
-    ObjectType xRet(new Table(this,
+    css::uno::Reference< css::beans::XPropertySet > xRet(new Table(this,
                               m_rMutex,
                               m_xMetaData->getConnection(),
                               xRow->getString(3), // Name
@@ -126,7 +126,7 @@ uno::Reference< XPropertySet > Tables::createDescriptor()
 }
 
 //----- XAppend ---------------------------------------------------------------
-ObjectType Tables::appendObject(const OUString& rName,
+css::uno::Reference< css::beans::XPropertySet > Tables::appendObject(const 
OUString& rName,
                                 const uno::Reference< XPropertySet >& 
rDescriptor)
 {
    /* OUString sSql(::dbtools::createSqlCreateTableStatement(rDescriptor,
diff --git a/connectivity/source/drivers/firebird/Tables.hxx 
b/connectivity/source/drivers/firebird/Tables.hxx
index 9e59da0cf11d..32f47380c65a 100644
--- a/connectivity/source/drivers/firebird/Tables.hxx
+++ b/connectivity/source/drivers/firebird/Tables.hxx
@@ -32,11 +32,11 @@ namespace connectivity::firebird
 
             // OCollection
             virtual void impl_refresh() override;
-            virtual ::connectivity::sdbcx::ObjectType createObject(
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(
                                                 const OUString& rName) 
override;
             virtual css::uno::Reference< css::beans::XPropertySet >
                     createDescriptor() override;
-            virtual ::connectivity::sdbcx::ObjectType appendObject(
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject(
                         const OUString& rName,
                         const css::uno::Reference< css::beans::XPropertySet >& 
rDescriptor) override;
 
diff --git a/connectivity/source/drivers/firebird/Users.cxx 
b/connectivity/source/drivers/firebird/Users.cxx
index 10912d6be0ab..265bae760946 100644
--- a/connectivity/source/drivers/firebird/Users.cxx
+++ b/connectivity/source/drivers/firebird/Users.cxx
@@ -39,7 +39,7 @@ void Users::impl_refresh()
     // TODO: IMPLEMENT ME
 }
 
-ObjectType Users::createObject(const OUString& rName)
+css::uno::Reference< css::beans::XPropertySet > Users::createObject(const 
OUString& rName)
 {
     return new User(m_xMetaData->getConnection(), rName);
 }
@@ -53,7 +53,7 @@ uno::Reference< XPropertySet > Users::createDescriptor()
 }
 
 //----- XAppend ---------------------------------------------------------------
-ObjectType Users::appendObject(const OUString& rName,
+css::uno::Reference< css::beans::XPropertySet > Users::appendObject(const 
OUString& rName,
                                 const uno::Reference< XPropertySet >&)
 {
     // TODO: set sSql as appropriate
diff --git a/connectivity/source/drivers/firebird/Users.hxx 
b/connectivity/source/drivers/firebird/Users.hxx
index 7e78444d1199..c66e9749054b 100644
--- a/connectivity/source/drivers/firebird/Users.hxx
+++ b/connectivity/source/drivers/firebird/Users.hxx
@@ -26,11 +26,11 @@ namespace connectivity::firebird
 
             // OCollection
             virtual void impl_refresh() override;
-            virtual ::connectivity::sdbcx::ObjectType createObject(
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(
                                                 const OUString& rName) 
override;
             virtual css::uno::Reference< css::beans::XPropertySet >
                     createDescriptor() override;
-            virtual ::connectivity::sdbcx::ObjectType appendObject(
+            virtual ::css::uno::Reference< css::beans::XPropertySet > 
appendObject(
                         const OUString& rName,
                         const css::uno::Reference< css::beans::XPropertySet >& 
rDescriptor) override;
 
diff --git a/connectivity/source/drivers/firebird/Views.cxx 
b/connectivity/source/drivers/firebird/Views.cxx
index f7d3c55ce415..606ac9ae7e64 100644
--- a/connectivity/source/drivers/firebird/Views.cxx
+++ b/connectivity/source/drivers/firebird/Views.cxx
@@ -24,7 +24,8 @@ connectivity::firebird::Views::Views(
 {
 }
 
-connectivity::sdbcx::ObjectType 
connectivity::firebird::Views::createObject(const OUString& _rName)
+css::uno::Reference<css::beans::XPropertySet>
+connectivity::firebird::Views::createObject(const OUString& _rName)
 {
     OUString sCatalog, sSchema, sTable;
     ::dbtools::qualifiedNameComponents(m_xMetaData, _rName, sCatalog, sSchema, 
sTable,
@@ -43,7 +44,7 @@ css::uno::Reference<css::beans::XPropertySet> 
connectivity::firebird::Views::cre
 }
 
 // XAppend
-connectivity::sdbcx::ObjectType connectivity::firebird::Views::appendObject(
+css::uno::Reference<css::beans::XPropertySet> 
connectivity::firebird::Views::appendObject(
     const OUString& _rForName, const 
css::uno::Reference<css::beans::XPropertySet>& descriptor)
 {
     createView(descriptor);
diff --git a/connectivity/source/drivers/firebird/Views.hxx 
b/connectivity/source/drivers/firebird/Views.hxx
index 6887bdc66ed0..d1308d385494 100644
--- a/connectivity/source/drivers/firebird/Views.hxx
+++ b/connectivity/source/drivers/firebird/Views.hxx
@@ -19,10 +19,11 @@ class Views final : public connectivity::sdbcx::OCollection
     bool m_bInDrop;
 
     // OCollection
-    virtual connectivity::sdbcx::ObjectType createObject(const OUString& 
_rName) override;
+    virtual css::uno::Reference<css::beans::XPropertySet>
+    createObject(const OUString& _rName) override;
     virtual void impl_refresh() override;
     virtual css::uno::Reference<css::beans::XPropertySet> createDescriptor() 
override;
-    virtual sdbcx::ObjectType
+    virtual css::uno::Reference<css::beans::XPropertySet>
     appendObject(const OUString& _rForName,
                  const css::uno::Reference<css::beans::XPropertySet>& 
descriptor) override;
 
diff --git a/connectivity/source/drivers/flat/EColumns.cxx 
b/connectivity/source/drivers/flat/EColumns.cxx
index 56585f1e8059..f2d5c5f69461 100644
--- a/connectivity/source/drivers/flat/EColumns.cxx
+++ b/connectivity/source/drivers/flat/EColumns.cxx
@@ -25,14 +25,14 @@ using namespace connectivity;
 using namespace ::com::sun::star::uno;
 
 
-sdbcx::ObjectType OFlatColumns::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
OFlatColumns::createObject(const OUString& _rName)
 {
     OFlatTable* pTable = static_cast<OFlatTable*>(m_pTable);
     const ::rtl::Reference<OSQLColumns>& aCols = pTable->getTableColumns();
     OSQLColumns::const_iterator aIter = 
find(aCols->begin(),aCols->end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive()));
-    sdbcx::ObjectType xRet;
+    css::uno::Reference< css::beans::XPropertySet > xRet;
     if(aIter != aCols->end())
-        xRet = sdbcx::ObjectType(*aIter,UNO_QUERY);
+        xRet = *aIter;
     return xRet;
 }
 
diff --git a/connectivity/source/drivers/flat/ETables.cxx 
b/connectivity/source/drivers/flat/ETables.cxx
index f2f0a16166d7..b1a0859a7acb 100644
--- a/connectivity/source/drivers/flat/ETables.cxx
+++ b/connectivity/source/drivers/flat/ETables.cxx
@@ -25,7 +25,7 @@ using namespace connectivity;
 using namespace connectivity::flat;
 using namespace connectivity::file;
 
-sdbcx::ObjectType OFlatTables::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
OFlatTables::createObject(const OUString& _rName)
 {
     rtl::Reference<OFlatTable> pRet = new OFlatTable(this, 
static_cast<OFlatConnection*>(static_cast<OFileCatalog&>(m_rParent).getConnection()),
                                         _rName,u"TABLE"_ustr);
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx 
b/connectivity/source/drivers/hsqldb/HTables.cxx
index bec309c0950d..390f36e19a04 100644
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace dbtools;
 
-sdbcx::ObjectType OTables::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > OTables::createObject(const 
OUString& _rName)
 {
     OUString sCatalog,sSchema,sTable;
     
::dbtools::qualifiedNameComponents(m_xMetaData,_rName,sCatalog,sSchema,sTable,::dbtools::EComposeRule::InDataManipulation);
@@ -51,7 +51,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& 
_rName)
         aCatalog <<= sCatalog;
     Reference< XResultSet > xResult = 
m_xMetaData->getTables(aCatalog,sSchema,sTable,sTableTypes);
 
-    sdbcx::ObjectType xRet;
+    css::uno::Reference< css::beans::XPropertySet > xRet;
     if ( xResult.is() )
     {
         Reference< XRow > xRow(xResult,UNO_QUERY);
@@ -94,7 +94,7 @@ Reference< XPropertySet > OTables::createDescriptor()
 }
 
 // XAppend
-sdbcx::ObjectType OTables::appendObject( const OUString& _rForName, const 
Reference< XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > OTables::appendObject( const 
OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     createTable(descriptor);
     return createObject( _rForName );
@@ -165,7 +165,7 @@ void OTables::appendNew(const OUString& _rsNewTable)
         aListenerLoop.next()->elementInserted(aEvent);
 }
 
-OUString OTables::getNameForObject(const sdbcx::ObjectType& _xObject)
+OUString OTables::getNameForObject(const css::uno::Reference< 
css::beans::XPropertySet >& _xObject)
 {
     OSL_ENSURE(_xObject.is(),"OTables::getNameForObject: Object is NULL!");
     return ::dbtools::composeTableName( m_xMetaData, _xObject, 
::dbtools::EComposeRule::InDataManipulation, false );
diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx 
b/connectivity/source/drivers/hsqldb/HUsers.cxx
index 64933178e05d..2141a0045d58 100644
--- a/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/connectivity/source/drivers/hsqldb/HUsers.cxx
@@ -44,7 +44,7 @@ OUsers::OUsers( ::cppu::OWeakObject& _rParent,
 }
 
 
-sdbcx::ObjectType OUsers::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > OUsers::createObject(const 
OUString& _rName)
 {
     return new OHSQLUser(m_xConnection,_rName);
 }
@@ -60,7 +60,7 @@ Reference< XPropertySet > OUsers::createDescriptor()
 }
 
 // XAppend
-sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const 
Reference< XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > OUsers::appendObject( const 
OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     OUString aQuote  = m_xConnection->getMetaData()->getIdentifierQuoteString( 
 );
     OUString sPassword;
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx 
b/connectivity/source/drivers/hsqldb/HViews.cxx
index 56da442a2866..880b7bc4ce51 100644
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -48,7 +48,7 @@ HViews::HViews( const Reference< XConnection >& 
_rxConnection, ::cppu::OWeakObje
 }
 
 
-sdbcx::ObjectType HViews::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > HViews::createObject(const 
OUString& _rName)
 {
     OUString sCatalog,sSchema,sTable;
     ::dbtools::qualifiedNameComponents(m_xMetaData,
@@ -79,7 +79,7 @@ Reference< XPropertySet > HViews::createDescriptor()
 }
 
 // XAppend
-sdbcx::ObjectType HViews::appendObject( const OUString& _rForName, const 
Reference< XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > HViews::appendObject( const 
OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     createView(descriptor);
     return createObject( _rForName );
diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx 
b/connectivity/source/drivers/macab/MacabColumns.cxx
index 6a49ad1d066c..ef6c0a6d255f 100644
--- a/connectivity/source/drivers/macab/MacabColumns.cxx
+++ b/connectivity/source/drivers/macab/MacabColumns.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
 
-sdbcx::ObjectType MacabColumns::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
MacabColumns::createObject(const OUString& _rName)
 {
     const Any aCatalog;
     const OUString sCatalogName;
@@ -45,7 +45,7 @@ sdbcx::ObjectType MacabColumns::createObject(const OUString& 
_rName)
     Reference< XResultSet > xResult = 
m_pTable->getConnection()->getMetaData()->getColumns(
         aCatalog, sSchemaName, sTableName, _rName);
 
-    sdbcx::ObjectType xRet;
+    css::uno::Reference< css::beans::XPropertySet > xRet;
     if (xResult.is())
     {
         Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx 
b/connectivity/source/drivers/macab/MacabColumns.hxx
index 7123af89d30a..5991e8948f10 100644
--- a/connectivity/source/drivers/macab/MacabColumns.hxx
+++ b/connectivity/source/drivers/macab/MacabColumns.hxx
@@ -29,7 +29,7 @@ namespace connectivity::macab
         protected:
             MacabTable* m_pTable;
 
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
 
         public:
diff --git a/connectivity/source/drivers/macab/MacabTables.cxx 
b/connectivity/source/drivers/macab/MacabTables.cxx
index e7149d2646c1..e7aba053a48a 100644
--- a/connectivity/source/drivers/macab/MacabTables.cxx
+++ b/connectivity/source/drivers/macab/MacabTables.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-sdbcx::ObjectType MacabTables::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
MacabTables::createObject(const OUString& _rName)
 {
     OUString aName,aSchema;
     aSchema = "%";
@@ -46,7 +46,7 @@ sdbcx::ObjectType MacabTables::createObject(const OUString& 
_rName)
 
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema, 
aName, aTypes);
 
-    sdbcx::ObjectType xRet;
+    css::uno::Reference< css::beans::XPropertySet > xRet;
     if (xResult.is())
     {
         Reference< XRow > xRow(xResult, UNO_QUERY);
diff --git a/connectivity/source/drivers/macab/MacabTables.hxx 
b/connectivity/source/drivers/macab/MacabTables.hxx
index 0b0d841b7a43..0fe248045a85 100644
--- a/connectivity/source/drivers/macab/MacabTables.hxx
+++ b/connectivity/source/drivers/macab/MacabTables.hxx
@@ -29,7 +29,7 @@ namespace connectivity::macab
             css::uno::Reference< css::sdbc::XDatabaseMetaData >       
m_xMetaData;
 
         protected:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
 
         public:
diff --git a/connectivity/source/drivers/mysql_jdbc/YTables.cxx 
b/connectivity/source/drivers/mysql_jdbc/YTables.cxx
index 8fd165b61654..999ff79d9e82 100644
--- a/connectivity/source/drivers/mysql_jdbc/YTables.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YTables.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace dbtools;
 
-sdbcx::ObjectType OTables::createObject(const OUString& _rName)
+css::uno::Reference<css::beans::XPropertySet> OTables::createObject(const 
OUString& _rName)
 {
     OUString sCatalog, sSchema, sTable;
     ::dbtools::qualifiedNameComponents(m_xMetaData, _rName, sCatalog, sSchema, 
sTable,
@@ -54,7 +54,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& 
_rName)
         aCatalog <<= sCatalog;
     Reference<XResultSet> xResult = m_xMetaData->getTables(aCatalog, sSchema, 
sTable, sTableTypes);
 
-    sdbcx::ObjectType xRet;
+    css::uno::Reference<css::beans::XPropertySet> xRet;
     if (xResult.is())
     {
         Reference<XRow> xRow(xResult, UNO_QUERY);
@@ -89,8 +89,8 @@ Reference<XPropertySet> OTables::createDescriptor()
 }
 
 // XAppend
-sdbcx::ObjectType OTables::appendObject(const OUString& _rForName,
-                                        const Reference<XPropertySet>& 
descriptor)
+css::uno::Reference<css::beans::XPropertySet>
+OTables::appendObject(const OUString& _rForName, const 
Reference<XPropertySet>& descriptor)
 {
     createTable(descriptor);
     return createObject(_rForName);
@@ -183,7 +183,7 @@ void OTables::appendNew(const OUString& _rsNewTable)
         aListenerLoop.next()->elementInserted(aEvent);
 }
 
-OUString OTables::getNameForObject(const sdbcx::ObjectType& _xObject)
+OUString OTables::getNameForObject(const 
css::uno::Reference<css::beans::XPropertySet>& _xObject)
 {
     OSL_ENSURE(_xObject.is(), "OTables::getNameForObject: Object is NULL!");
     return ::dbtools::composeTableName(m_xMetaData, _xObject,
diff --git a/connectivity/source/drivers/mysql_jdbc/YUsers.cxx 
b/connectivity/source/drivers/mysql_jdbc/YUsers.cxx
index 73fa7069400a..43a032d35ff0 100644
--- a/connectivity/source/drivers/mysql_jdbc/YUsers.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YUsers.cxx
@@ -42,7 +42,7 @@ OUsers::OUsers(::cppu::OWeakObject& _rParent, ::osl::Mutex& 
_rMutex,
 {
 }
 
-sdbcx::ObjectType OUsers::createObject(const OUString& _rName)
+css::uno::Reference<css::beans::XPropertySet> OUsers::createObject(const 
OUString& _rName)
 {
     return new OMySQLUser(m_xConnection, _rName);
 }
@@ -52,8 +52,8 @@ void OUsers::impl_refresh() { m_pParent->refreshUsers(); }
 Reference<XPropertySet> OUsers::createDescriptor() { return new 
OUserExtend(m_xConnection); }
 
 // XAppend
-sdbcx::ObjectType OUsers::appendObject(const OUString& _rForName,
-                                       const Reference<XPropertySet>& 
descriptor)
+css::uno::Reference<css::beans::XPropertySet>
+OUsers::appendObject(const OUString& _rForName, const Reference<XPropertySet>& 
descriptor)
 {
     OUString aSql(u"GRANT USAGE ON * TO "_ustr);
     OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString();
diff --git a/connectivity/source/drivers/mysql_jdbc/YViews.cxx 
b/connectivity/source/drivers/mysql_jdbc/YViews.cxx
index 4308d88c9949..6fbeaeef25ba 100644
--- a/connectivity/source/drivers/mysql_jdbc/YViews.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YViews.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace dbtools;
 typedef connectivity::sdbcx::OCollection OCollection_TYPE;
 
-sdbcx::ObjectType OViews::createObject(const OUString& _rName)
+css::uno::Reference<css::beans::XPropertySet> OViews::createObject(const 
OUString& _rName)
 {
     OUString sCatalog, sSchema, sTable;
     ::dbtools::qualifiedNameComponents(m_xMetaData, _rName, sCatalog, sSchema, 
sTable,
@@ -62,8 +62,8 @@ Reference<XPropertySet> OViews::createDescriptor()
 }
 
 // XAppend
-sdbcx::ObjectType OViews::appendObject(const OUString& _rForName,
-                                       const Reference<XPropertySet>& 
descriptor)
+css::uno::Reference<css::beans::XPropertySet>
+OViews::appendObject(const OUString& _rForName, const Reference<XPropertySet>& 
descriptor)
 {
     createView(descriptor);
     return createObject(_rForName);
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_tables.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_tables.cxx
index 61293664d5ba..dd59963075ea 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_tables.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_tables.cxx
@@ -45,7 +45,8 @@ static void lcl_unescape(OUString& rName)
     rName = rName.replaceAll("``", "`");
 }
 
-connectivity::sdbcx::ObjectType 
connectivity::mysqlc::Tables::createObject(const OUString& rName)
+css::uno::Reference<css::beans::XPropertySet>
+connectivity::mysqlc::Tables::createObject(const OUString& rName)
 {
     OUString sCatalog, sSchema, sTable;
     ::dbtools::qualifiedNameComponents(m_xMetaData, rName, sCatalog, sSchema, 
sTable,
@@ -73,7 +74,7 @@ connectivity::sdbcx::ObjectType 
connectivity::mysqlc::Tables::createObject(const
     if (!xTables->next())
         throw css::uno::RuntimeException();
 
-    connectivity::sdbcx::ObjectType xRet(
+    css::uno::Reference<css::beans::XPropertySet> xRet(
         new Table(this, m_rMutex, m_xMetaData->getConnection(),
                   xRow->getString(1), // Catalog
                   xRow->getString(2), // Schema
@@ -111,7 +112,7 @@ void connectivity::mysqlc::Tables::createTable(
 }
 
 // XAppend
-connectivity::sdbcx::ObjectType connectivity::mysqlc::Tables::appendObject(
+css::uno::Reference<css::beans::XPropertySet> 
connectivity::mysqlc::Tables::appendObject(
     const OUString& _rForName, const 
css::uno::Reference<css::beans::XPropertySet>& descriptor)
 {
     createTable(descriptor);
@@ -131,8 +132,8 @@ void connectivity::mysqlc::Tables::appendNew(const 
OUString& _rsNewTable)
         aListenerLoop.next()->elementInserted(aEvent);
 }
 
-OUString
-connectivity::mysqlc::Tables::getNameForObject(const 
connectivity::sdbcx::ObjectType& _xObject)
+OUString connectivity::mysqlc::Tables::getNameForObject(
+    const css::uno::Reference<css::beans::XPropertySet>& _xObject)
 {
     OSL_ENSURE(_xObject.is(), "OTables::getNameForObject: Object is NULL!");
     return ::dbtools::composeTableName(m_xMetaData, _xObject,
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_tables.hxx 
b/connectivity/source/drivers/mysqlc/mysqlc_tables.hxx
index 8b05c5afaf9f..0dff83f247f5 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_tables.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_tables.hxx
@@ -27,14 +27,16 @@ protected:
 
     // OCollection
     virtual void impl_refresh() override;
-    virtual ::connectivity::sdbcx::ObjectType createObject(const OUString& 
rName) override;
+    virtual ::css::uno::Reference<css::beans::XPropertySet>
+    createObject(const OUString& rName) override;
     virtual css::uno::Reference<css::beans::XPropertySet> createDescriptor() 
override;
-    virtual ::connectivity::sdbcx::ObjectType
+    virtual ::css::uno::Reference<css::beans::XPropertySet>
     appendObject(const OUString& rName,
                  const css::uno::Reference<css::beans::XPropertySet>& 
rDescriptor) override;
 
     void createTable(const css::uno::Reference<css::beans::XPropertySet>& 
descriptor);
-    virtual OUString getNameForObject(const sdbcx::ObjectType& _xObject) 
override;
+    virtual OUString
+    getNameForObject(const css::uno::Reference<css::beans::XPropertySet>& 
_xObject) override;
     // XDrop
     virtual void dropObject(sal_Int32 nPosition, const OUString& rName) 
override;
 
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_users.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_users.cxx
index b7ad6cecc8cf..e2149d532d04 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_users.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_users.cxx
@@ -38,7 +38,7 @@ void Users::impl_refresh()
     // TODO: IMPLEMENT ME
 }
 
-ObjectType Users::createObject(const OUString& rName)
+css::uno::Reference<css::beans::XPropertySet> Users::createObject(const 
OUString& rName)
 {
     return new OUserExtend(m_xMetaData->getConnection(), rName);
 }
@@ -52,8 +52,8 @@ uno::Reference<XPropertySet> Users::createDescriptor()
 }
 
 //----- XAppend ---------------------------------------------------------------
-ObjectType Users::appendObject(const OUString& rName,
-                               const uno::Reference<XPropertySet>& descriptor)
+css::uno::Reference<css::beans::XPropertySet>
+Users::appendObject(const OUString& rName, const uno::Reference<XPropertySet>& 
descriptor)
 {
     OUString aSql(u"GRANT USAGE ON * TO "_ustr);
     OUString aQuote = m_xMetaData->getIdentifierQuoteString();
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_users.hxx 
b/connectivity/source/drivers/mysqlc/mysqlc_users.hxx
index d4c4d3558e42..42a1b8319ca8 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_users.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_users.hxx
@@ -21,9 +21,10 @@ class Users : public ::connectivity::sdbcx::OCollection
 protected:
     // OCollection
     virtual void impl_refresh() override;
-    virtual ::connectivity::sdbcx::ObjectType createObject(const OUString& 
rName) override;
+    virtual ::css::uno::Reference<css::beans::XPropertySet>
+    createObject(const OUString& rName) override;
     virtual css::uno::Reference<css::beans::XPropertySet> createDescriptor() 
override;
-    virtual ::connectivity::sdbcx::ObjectType
+    virtual ::css::uno::Reference<css::beans::XPropertySet>
     appendObject(const OUString& rName,
                  const css::uno::Reference<css::beans::XPropertySet>& 
rDescriptor) override;
 
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_views.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_views.cxx
index 23437e1c885b..a603b84d04d1 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_views.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_views.cxx
@@ -34,7 +34,8 @@ connectivity::mysqlc::Views::Views(const 
css::uno::Reference<css::sdbc::XConnect
 {
 }
 
-connectivity::sdbcx::ObjectType 
connectivity::mysqlc::Views::createObject(const OUString& _rName)
+css::uno::Reference<css::beans::XPropertySet>
+connectivity::mysqlc::Views::createObject(const OUString& _rName)
 {
     OUString sCatalog, sSchema, sTable;
     ::dbtools::qualifiedNameComponents(m_xMetaData, _rName, sCatalog, sSchema, 
sTable,
@@ -53,7 +54,7 @@ css::uno::Reference<css::beans::XPropertySet> 
connectivity::mysqlc::Views::creat
 }
 
 // XAppend
-connectivity::sdbcx::ObjectType connectivity::mysqlc::Views::appendObject(
+css::uno::Reference<css::beans::XPropertySet> 
connectivity::mysqlc::Views::appendObject(
     const OUString& _rForName, const 
css::uno::Reference<css::beans::XPropertySet>& descriptor)
 {
     createView(descriptor);
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_views.hxx 
b/connectivity/source/drivers/mysqlc/mysqlc_views.hxx
index 14570fc8d9a9..f55d6a032184 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_views.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_views.hxx
@@ -28,10 +28,11 @@ class Views final : public connectivity::sdbcx::OCollection
     css::uno::Reference<css::sdbc::XDatabaseMetaData> m_xMetaData;
 
     // OCollection
-    virtual connectivity::sdbcx::ObjectType createObject(const OUString& 
_rName) override;
+    virtual css::uno::Reference<css::beans::XPropertySet>
+    createObject(const OUString& _rName) override;
     virtual void impl_refresh() override;
     virtual css::uno::Reference<css::beans::XPropertySet> createDescriptor() 
override;
-    virtual sdbcx::ObjectType
+    virtual css::uno::Reference<css::beans::XPropertySet>
     appendObject(const OUString& _rForName,
                  const css::uno::Reference<css::beans::XPropertySet>& 
descriptor) override;
 
diff --git a/connectivity/source/drivers/writer/WTables.cxx 
b/connectivity/source/drivers/writer/WTables.cxx
index 95f8d7c177f5..0d98471217f6 100644
--- a/connectivity/source/drivers/writer/WTables.cxx
+++ b/connectivity/source/drivers/writer/WTables.cxx
@@ -29,7 +29,7 @@ using namespace ::com::sun::star;
 
 namespace connectivity::writer
 {
-sdbcx::ObjectType OWriterTables::createObject(const OUString& rName)
+css::uno::Reference<css::beans::XPropertySet> 
OWriterTables::createObject(const OUString& rName)
 {
     rtl::Reference<OWriterTable> pTable
         = new OWriterTable(this,
diff --git a/connectivity/source/inc/ado/AColumns.hxx 
b/connectivity/source/inc/ado/AColumns.hxx
index 25decfa6877f..9c307c9dc386 100644
--- a/connectivity/source/inc/ado/AColumns.hxx
+++ b/connectivity/source/inc/ado/AColumns.hxx
@@ -33,10 +33,10 @@ namespace connectivity::ado
             WpADOColumns    m_aCollection;
             OConnection*    m_pConnection;
 
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos,const OUString& 
_sElementName) override;
         public:
             OColumns(   ::cppu::OWeakObject& _rParent,
diff --git a/connectivity/source/inc/ado/AGroups.hxx 
b/connectivity/source/inc/ado/AGroups.hxx
index 85817cec84d0..c5bdba263947 100644
--- a/connectivity/source/inc/ado/AGroups.hxx
+++ b/connectivity/source/inc/ado/AGroups.hxx
@@ -31,10 +31,10 @@ namespace connectivity::ado
             OCatalog*   m_pCatalog;
         protected:
 
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos,const OUString& 
_sElementName) override;
         public:
             OGroups(OCatalog* _pParent,
diff --git a/connectivity/source/inc/ado/AIndexes.hxx 
b/connectivity/source/inc/ado/AIndexes.hxx
index 48c2d1abee83..85d2c30314f3 100644
--- a/connectivity/source/inc/ado/AIndexes.hxx
+++ b/connectivity/source/inc/ado/AIndexes.hxx
@@ -30,10 +30,10 @@ namespace connectivity::ado
             WpADOIndexes    m_aCollection;
             OConnection*    m_pConnection;
         protected:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos,const OUString& 
_sElementName) override;
         public:
             OIndexes(::cppu::OWeakObject& _rParent,
diff --git a/connectivity/source/inc/ado/AKeys.hxx 
b/connectivity/source/inc/ado/AKeys.hxx
index 45e127e29bf7..65af4dd0ee75 100644
--- a/connectivity/source/inc/ado/AKeys.hxx
+++ b/connectivity/source/inc/ado/AKeys.hxx
@@ -31,10 +31,10 @@ namespace connectivity::ado
             OConnection*    m_pConnection;
 
         protected:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos,const OUString& 
_sElementName) override;
         public:
             OKeys(::cppu::OWeakObject& _rParent,
diff --git a/connectivity/source/inc/ado/ATables.hxx 
b/connectivity/source/inc/ado/ATables.hxx
index 4fff5b97956e..37c91f7c451f 100644
--- a/connectivity/source/inc/ado/ATables.hxx
+++ b/connectivity/source/inc/ado/ATables.hxx
@@ -30,10 +30,10 @@ namespace connectivity::ado
             WpADOTables m_aCollection;
             OCatalog*   m_pCatalog;
         protected:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos,const OUString& 
_sElementName) override;
         public:
             OTables(OCatalog* _pParent, ::osl::Mutex& _rMutex,
diff --git a/connectivity/source/inc/ado/AUsers.hxx 
b/connectivity/source/inc/ado/AUsers.hxx
index 1ec0bd5ad8f7..3f715f8b7209 100644
--- a/connectivity/source/inc/ado/AUsers.hxx
+++ b/connectivity/source/inc/ado/AUsers.hxx
@@ -31,10 +31,10 @@ namespace connectivity::ado
             WpADOUsers  m_aCollection;
             OCatalog*   m_pCatalog;
         public:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
             virtual void impl_refresh() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos,const OUString& 
_sElementName) override;
         public:
             OUsers( OCatalog* _pParent,
diff --git a/connectivity/source/inc/ado/AViews.hxx 
b/connectivity/source/inc/ado/AViews.hxx
index ef0c692fdfc3..8709bdc9fae8 100644
--- a/connectivity/source/inc/ado/AViews.hxx
+++ b/connectivity/source/inc/ado/AViews.hxx
@@ -32,10 +32,10 @@ namespace connectivity::ado
             WpADOViews  m_aCollection;
             OCatalog*   m_pCatalog;
         protected:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos,const OUString& 
_sElementName) override;
         public:
             OViews(OCatalog* _pParent, ::osl::Mutex& _rMutex,
diff --git a/connectivity/source/inc/calc/CTables.hxx 
b/connectivity/source/inc/calc/CTables.hxx
index 0b88592a2e6a..0fb9ac54c08a 100644
--- a/connectivity/source/inc/calc/CTables.hxx
+++ b/connectivity/source/inc/calc/CTables.hxx
@@ -28,7 +28,7 @@ namespace connectivity::calc
         class OCalcTables : public OCalcTables_BASE
         {
         protected:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
         public:
             OCalcTables(const css::uno::Reference< 
css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, 
::osl::Mutex& _rMutex,
                 const ::std::vector< OUString> &_rVector) : 
OCalcTables_BASE(_rMetaData,_rParent,_rMutex,_rVector)
diff --git a/connectivity/source/inc/component/CColumns.hxx 
b/connectivity/source/inc/component/CColumns.hxx
index a63cae4bde6e..b0cbde89f577 100644
--- a/connectivity/source/inc/component/CColumns.hxx
+++ b/connectivity/source/inc/component/CColumns.hxx
@@ -27,7 +27,7 @@ namespace connectivity::component
         class OComponentColumns : public file::OColumns
         {
         protected:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
         public:
             OComponentColumns(file::OFileTable* _pTable,
                             ::osl::Mutex& _rMutex,
diff --git a/connectivity/source/inc/dbase/DColumns.hxx 
b/connectivity/source/inc/dbase/DColumns.hxx
index dbbbbec90acc..c9bbf2eebe90 100644
--- a/connectivity/source/inc/dbase/DColumns.hxx
+++ b/connectivity/source/inc/dbase/DColumns.hxx
@@ -26,10 +26,10 @@ namespace connectivity::dbase
         class ODbaseColumns : public file::OColumns
         {
         protected:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos, const OUString& 
_sElementName) override;
         public:
             ODbaseColumns(file::OFileTable* _pTable,
diff --git a/connectivity/source/inc/dbase/DIndexColumns.hxx 
b/connectivity/source/inc/dbase/DIndexColumns.hxx
index 8f7a895b95ad..eaf2f5cc0ccf 100644
--- a/connectivity/source/inc/dbase/DIndexColumns.hxx
+++ b/connectivity/source/inc/dbase/DIndexColumns.hxx
@@ -29,10 +29,10 @@ namespace connectivity::dbase
         {
             ODbaseIndex* m_pIndex;
         protected:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
         public:
             ODbaseIndexColumns( ODbaseIndex* _pIndex,
                                 ::osl::Mutex& _rMutex,
diff --git a/connectivity/source/inc/dbase/DIndexes.hxx 
b/connectivity/source/inc/dbase/DIndexes.hxx
index a5b1c27e67f2..aadb531f4107 100644
--- a/connectivity/source/inc/dbase/DIndexes.hxx
+++ b/connectivity/source/inc/dbase/DIndexes.hxx
@@ -32,10 +32,10 @@ namespace connectivity::dbase
         {
             ODbaseTable*    m_pTable;
         protected:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos, const OUString& 
_sElementName) override;
         public:
             ODbaseIndexes(ODbaseTable* _pTable, ::osl::Mutex& _rMutex,
diff --git a/connectivity/source/inc/dbase/DTables.hxx 
b/connectivity/source/inc/dbase/DTables.hxx
index c85a1ab3cd07..058ea0802f4a 100644
--- a/connectivity/source/inc/dbase/DTables.hxx
+++ b/connectivity/source/inc/dbase/DTables.hxx
@@ -28,10 +28,10 @@ namespace connectivity::dbase
         class ODbaseTables : public ODbaseTables_BASE
         {
         protected:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos, const OUString& 
_sElementName) override;
         public:
             ODbaseTables(const css::uno::Reference< 
css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, 
::osl::Mutex& _rMutex,
diff --git a/connectivity/source/inc/file/FColumns.hxx 
b/connectivity/source/inc/file/FColumns.hxx
index 056934f88c65..b3710e3083cc 100644
--- a/connectivity/source/inc/file/FColumns.hxx
+++ b/connectivity/source/inc/file/FColumns.hxx
@@ -31,7 +31,7 @@ namespace connectivity::file
         protected:
             OFileTable* m_pTable;
 
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
         public:
             OColumns(   OFileTable* _pTable,
diff --git a/connectivity/source/inc/file/FTables.hxx 
b/connectivity/source/inc/file/FTables.hxx
index 9d14c3627916..be2f26719700 100644
--- a/connectivity/source/inc/file/FTables.hxx
+++ b/connectivity/source/inc/file/FTables.hxx
@@ -29,7 +29,7 @@ namespace connectivity::file
             public sdbcx::OCollection
         {
         protected:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
         public:
             OTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& 
_rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
diff --git a/connectivity/source/inc/flat/EColumns.hxx 
b/connectivity/source/inc/flat/EColumns.hxx
index d25f79aae240..e54fa8efd4b0 100644
--- a/connectivity/source/inc/flat/EColumns.hxx
+++ b/connectivity/source/inc/flat/EColumns.hxx
@@ -26,7 +26,7 @@ namespace connectivity::flat
         class OFlatColumns : public file::OColumns
         {
         protected:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
         public:
             OFlatColumns(file::OFileTable* _pTable,
                             ::osl::Mutex& _rMutex,
diff --git a/connectivity/source/inc/flat/ETables.hxx 
b/connectivity/source/inc/flat/ETables.hxx
index cb9b032dbc45..6d198a9b021c 100644
--- a/connectivity/source/inc/flat/ETables.hxx
+++ b/connectivity/source/inc/flat/ETables.hxx
@@ -28,7 +28,7 @@ namespace connectivity::flat
         class OFlatTables : public OFlatTables_BASE
         {
         protected:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
         public:
             OFlatTables(const css::uno::Reference< 
css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, 
::osl::Mutex& _rMutex,
                 const ::std::vector< OUString> &_rVector) : 
OFlatTables_BASE(_rMetaData,_rParent,_rMutex,_rVector)
diff --git a/connectivity/source/inc/hsqldb/HTables.hxx 
b/connectivity/source/inc/hsqldb/HTables.hxx
index bff5e0e6421a..d889ff686cae 100644
--- a/connectivity/source/inc/hsqldb/HTables.hxx
+++ b/connectivity/source/inc/hsqldb/HTables.hxx
@@ -27,14 +27,14 @@ namespace connectivity::hsqldb
         {
             css::uno::Reference< css::sdbc::XDatabaseMetaData >       
m_xMetaData;
 
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos, const OUString& 
_sElementName) override;
 
             void createTable( const css::uno::Reference< 
css::beans::XPropertySet >& descriptor );
-            virtual OUString getNameForObject(const sdbcx::ObjectType& 
_xObject) override;
+            virtual OUString getNameForObject(const css::uno::Reference< 
css::beans::XPropertySet >& _xObject) override;
         public:
             OTables(css::uno::Reference< css::sdbc::XDatabaseMetaData > 
_xMetaData, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
                 const ::std::vector< OUString> &_rVector) : 
sdbcx::OCollection(_rParent, true, _rMutex, _rVector)
diff --git a/connectivity/source/inc/hsqldb/HUsers.hxx 
b/connectivity/source/inc/hsqldb/HUsers.hxx
index a5a099e9927e..2bddc4da776f 100644
--- a/connectivity/source/inc/hsqldb/HUsers.hxx
+++ b/connectivity/source/inc/hsqldb/HUsers.hxx
@@ -34,10 +34,10 @@ namespace connectivity
             css::uno::Reference< css::sdbc::XConnection > m_xConnection;
             connectivity::sdbcx::IRefreshableUsers* m_pParent;
         public:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
             virtual void impl_refresh() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos, const OUString& 
_sElementName) override;
         public:
             OUsers( ::cppu::OWeakObject& _rParent,
diff --git a/connectivity/source/inc/hsqldb/HViews.hxx 
b/connectivity/source/inc/hsqldb/HViews.hxx
index cb2041524ecc..b71b1c87a66e 100644
--- a/connectivity/source/inc/hsqldb/HViews.hxx
+++ b/connectivity/source/inc/hsqldb/HViews.hxx
@@ -28,10 +28,10 @@ namespace connectivity::hsqldb
             css::uno::Reference< css::sdbc::XDatabaseMetaData >   m_xMetaData;
             bool m_bInDrop;
 
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos, const OUString& 
_sElementName) override;
 
             void createView( const css::uno::Reference< 
css::beans::XPropertySet >& descriptor );
diff --git a/connectivity/source/inc/mysql/YTables.hxx 
b/connectivity/source/inc/mysql/YTables.hxx
index 3e3283ca96da..af1d145e9595 100644
--- a/connectivity/source/inc/mysql/YTables.hxx
+++ b/connectivity/source/inc/mysql/YTables.hxx
@@ -29,14 +29,14 @@ namespace connectivity::mysql
         {
             css::uno::Reference< css::sdbc::XDatabaseMetaData >       
m_xMetaData;
 
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos, const OUString& 
_sElementName) override;
 
             void createTable( const css::uno::Reference< 
css::beans::XPropertySet >& descriptor );
-            virtual OUString getNameForObject(const sdbcx::ObjectType& 
_xObject) override;
+            virtual OUString getNameForObject(const css::uno::Reference< 
css::beans::XPropertySet >& _xObject) override;
         public:
             OTables(css::uno::Reference< css::sdbc::XDatabaseMetaData > 
_xMetaData, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
                 const ::std::vector< OUString> &_rVector) : 
sdbcx::OCollection(_rParent, true, _rMutex, _rVector)
diff --git a/connectivity/source/inc/mysql/YUsers.hxx 
b/connectivity/source/inc/mysql/YUsers.hxx
index e4b35c12e718..6bb552f7e25e 100644
--- a/connectivity/source/inc/mysql/YUsers.hxx
+++ b/connectivity/source/inc/mysql/YUsers.hxx
@@ -34,10 +34,10 @@ namespace connectivity
             css::uno::Reference< css::sdbc::XConnection > m_xConnection;
             connectivity::sdbcx::IRefreshableUsers* m_pParent;
         public:
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
             virtual void impl_refresh() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos,const OUString& 
_sElementName) override;
         public:
             OUsers( ::cppu::OWeakObject& _rParent,
diff --git a/connectivity/source/inc/mysql/YViews.hxx 
b/connectivity/source/inc/mysql/YViews.hxx
index 2e9a1b25162a..e1ea94d2d6c2 100644
--- a/connectivity/source/inc/mysql/YViews.hxx
+++ b/connectivity/source/inc/mysql/YViews.hxx
@@ -27,10 +27,10 @@ namespace connectivity::mysql
         {
             css::uno::Reference< css::sdbc::XDatabaseMetaData >       
m_xMetaData;
             bool m_bInDrop;
-            virtual sdbcx::ObjectType createObject(const OUString& _rName) 
override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
             virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
-            virtual sdbcx::ObjectType appendObject( const OUString& _rForName, 
const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
+            virtual css::uno::Reference< css::beans::XPropertySet > 
appendObject( const OUString& _rForName, const css::uno::Reference< 
css::beans::XPropertySet >& descriptor ) override;
             virtual void dropObject(sal_Int32 _nPos, const OUString& 
_sElementName) override;
 
             void createView( const css::uno::Reference< 
css::beans::XPropertySet >& descriptor );
diff --git a/connectivity/source/inc/writer/WTables.hxx 
b/connectivity/source/inc/writer/WTables.hxx
index df39cc1c22ce..c4be63b90442 100644
--- a/connectivity/source/inc/writer/WTables.hxx
+++ b/connectivity/source/inc/writer/WTables.hxx
@@ -28,7 +28,7 @@ using OWriterTables_BASE = file::OTables;
 class OWriterTables : public OWriterTables_BASE
 {
 protected:
-    sdbcx::ObjectType createObject(const OUString& rName) override;
+    css::uno::Reference<css::beans::XPropertySet> createObject(const OUString& 
rName) override;
 
 public:
     OWriterTables(const css::uno::Reference<css::sdbc::XDatabaseMetaData>& 
_rMetaData,
diff --git a/connectivity/source/sdbcx/VCollection.cxx 
b/connectivity/source/sdbcx/VCollection.cxx
index 0491288a7298..b5564f90930e 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -99,7 +99,7 @@ namespace
             m_aNameMap.clear();
         }
 
-        virtual void insert(const OUString& _sName,const ObjectType& _xObject) 
override
+        virtual void insert(const OUString& _sName,const css::uno::Reference< 
css::beans::XPropertySet >& _xObject) override
         {
             m_aElements.push_back(m_aNameMap.insert(m_aNameMap.begin(), 
ObjectEntry(_sName,_xObject)));
         }
@@ -110,7 +110,7 @@ namespace
             m_aElements.reserve(_rVector.size());
 
             for (auto const& elem : _rVector)
-                m_aElements.push_back(m_aNameMap.insert(m_aNameMap.begin(), 
ObjectEntry(elem,ObjectType())));
+                m_aElements.push_back(m_aNameMap.insert(m_aNameMap.begin(), 
ObjectEntry(elem,nullptr)));
         }
 
         virtual bool rename(const OUString& _sOldName, const OUString& 
_sNewName) override
@@ -189,18 +189,18 @@ namespace
             return m_aElements.size() - (m_aElements.end() - 
std::find(m_aElements.begin(),m_aElements.end(),aIter));
         }
 
-        virtual ObjectType getObject(sal_Int32 _nIndex) override
+        virtual css::uno::Reference< css::beans::XPropertySet > 
getObject(sal_Int32 _nIndex) override
         {
             OSL_ENSURE(_nIndex >= 0 && _nIndex < 
static_cast<sal_Int32>(m_aElements.size()),"Illegal argument!");
             return m_aElements[_nIndex]->second;
         }
 
-        virtual ObjectType getObject(const OUString& columnName) override
+        virtual css::uno::Reference< css::beans::XPropertySet > 
getObject(const OUString& columnName) override
         {
             return m_aNameMap.find(columnName)->second;
         }
 
-        virtual void setObject(sal_Int32 _nIndex,const ObjectType& _xObject) 
override
+        virtual void setObject(sal_Int32 _nIndex,const css::uno::Reference< 
css::beans::XPropertySet >& _xObject) override
         {
             OSL_ENSURE(_nIndex >= 0 && _nIndex < 
static_cast<sal_Int32>(m_aElements.size()),"Illegal argument!");
             m_aElements[_nIndex]->second = _xObject;
@@ -232,7 +232,7 @@ OCollection::OCollection(::cppu::OWeakObject& _rParent
 {
     if ( _bUseHardRef )
     {
-        m_pElements.reset(new OHardRefMap< ObjectType >(_bCase));
+        m_pElements.reset(new OHardRefMap< css::uno::Reference< 
css::beans::XPropertySet > >(_bCase));
     }
     else
     {
@@ -352,7 +352,7 @@ Reference< XPropertySet > SAL_CALL 
OCollection::createDataDescriptor(  )
     return createDescriptor();
 }
 
-OUString OCollection::getNameForObject(const ObjectType& _xObject)
+OUString OCollection::getNameForObject(const css::uno::Reference< 
css::beans::XPropertySet >& _xObject)
 {
     OSL_ENSURE(_xObject.is(),"OCollection::getNameForObject: Object is NULL!");
     OUString sName;
@@ -370,7 +370,7 @@ void SAL_CALL OCollection::appendByDescriptor( const 
Reference< XPropertySet >&
     if ( m_pElements->exists(sName) )
         throw ElementExistException(sName,static_cast<XTypeProvider*>(this));
 
-    ObjectType xNewlyCreated = appendObject( sName, descriptor );
+    css::uno::Reference< css::beans::XPropertySet > xNewlyCreated = 
appendObject( sName, descriptor );
     if ( !xNewlyCreated.is() )
         throw RuntimeException();
 
@@ -498,7 +498,7 @@ void SAL_CALL OCollection::removeRefreshListener( const 
Reference< XRefreshListe
     m_aRefreshListeners.removeInterface(l);
 }
 
-void OCollection::insertElement(const OUString& _sElementName,const 
ObjectType& _xElement)
+void OCollection::insertElement(const OUString& _sElementName,const 
css::uno::Reference< css::beans::XPropertySet >& _xElement)
 {
     OSL_ENSURE(!m_pElements->exists(_sElementName),"Element already exists");
     if ( !m_pElements->exists(_sElementName) )
@@ -522,9 +522,9 @@ void OCollection::renameObject(const OUString& _sOldName, 
const OUString& _sNewN
     }
 }
 
-ObjectType OCollection::getObject(sal_Int32 _nIndex)
+css::uno::Reference< css::beans::XPropertySet > 
OCollection::getObject(sal_Int32 _nIndex)
 {
-    ObjectType xName = m_pElements->getObject(_nIndex);
+    css::uno::Reference< css::beans::XPropertySet > xName = 
m_pElements->getObject(_nIndex);
     if ( !xName.is() )
     {
         try
@@ -559,14 +559,14 @@ Reference< XPropertySet > OCollection::createDescriptor()
     throw SQLException();
 }
 
-ObjectType OCollection::cloneDescriptor( const ObjectType& _descriptor )
+css::uno::Reference< css::beans::XPropertySet > OCollection::cloneDescriptor( 
const css::uno::Reference< css::beans::XPropertySet >& _descriptor )
 {
-    ObjectType xNewDescriptor( createDescriptor() );
+    css::uno::Reference< css::beans::XPropertySet > xNewDescriptor( 
createDescriptor() );
     ::comphelper::copyProperties( _descriptor, xNewDescriptor );
     return xNewDescriptor;
 }
 
-ObjectType OCollection::appendObject( const OUString& /*_rForName*/, const 
Reference< XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > OCollection::appendObject( 
const OUString& /*_rForName*/, const Reference< XPropertySet >& descriptor )
 {
     return cloneDescriptor( descriptor );
 }
diff --git a/dbaccess/source/core/api/CIndexes.cxx 
b/dbaccess/source/core/api/CIndexes.cxx
index 9b3dd5aefa83..8cf1c601d85a 100644
--- a/dbaccess/source/core/api/CIndexes.cxx
+++ b/dbaccess/source/core/api/CIndexes.cxx
@@ -29,9 +29,9 @@ using namespace ::com::sun::star::container;
 using namespace dbaccess;
 
 
-ObjectType OIndexes::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > OIndexes::createObject(const 
OUString& _rName)
 {
-    ObjectType xRet;
+    css::uno::Reference< css::beans::XPropertySet > xRet;
     if ( m_xIndexes.is() && m_xIndexes->hasByName(_rName) )
         xRet.set(m_xIndexes->getByName(_rName),UNO_QUERY);
     else
@@ -50,7 +50,7 @@ Reference< XPropertySet > OIndexes::createDescriptor()
 }
 
 // XAppend
-ObjectType OIndexes::appendObject( const OUString& _rForName, const Reference< 
XPropertySet >& descriptor )
+css::uno::Reference< css::beans::XPropertySet > OIndexes::appendObject( const 
OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     Reference<XAppend> xData( m_xIndexes,UNO_QUERY);
     if ( !xData.is() )
diff --git a/dbaccess/source/core/api/CIndexes.hxx 
b/dbaccess/source/core/api/CIndexes.hxx
index d8dbeb82a8f6..953811e94e82 100644
--- a/dbaccess/source/core/api/CIndexes.hxx
+++ b/dbaccess/source/core/api/CIndexes.hxx
@@ -28,9 +28,9 @@ namespace dbaccess
     {
         css::uno::Reference< css::container::XNameAccess > m_xIndexes;
     protected:
-        virtual connectivity::sdbcx::ObjectType createObject(const OUString& 
_rName) override;
+        virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
         virtual css::uno::Reference< css::beans::XPropertySet > 
createDescriptor() override;
-        virtual connectivity::sdbcx::ObjectType appendObject( const OUString& 
_rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) 
override;
+        virtual css::uno::Reference< css::beans::XPropertySet > appendObject( 
const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet 
>& descriptor ) override;
         virtual void dropObject(sal_Int32 _nPos, const OUString& 
_sElementName) override;
     public:
         OIndexes(connectivity::OTableHelper* _pTable,
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx 
b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index 693e1ad3dd75..fa99533c0f61 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -205,9 +205,9 @@ ORowSetDataColumns::~ORowSetDataColumns()
 {
 }
 
-sdbcx::ObjectType ORowSetDataColumns::createObject(const OUString& _rName)
+css::uno::Reference< css::beans::XPropertySet > 
ORowSetDataColumns::createObject(const OUString& _rName)
 {
-    connectivity::sdbcx::ObjectType xNamed;
+    css::uno::Reference< css::beans::XPropertySet > xNamed;
 
     ::comphelper::UStringMixEqual aCase(isCaseSensitive());
     ::connectivity::OSQLColumns::Vector::const_iterator first =  
::connectivity::find(m_aColumns->begin(),m_aColumns->end(),_rName,aCase);
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx 
b/dbaccess/source/core/api/CRowSetDataColumn.hxx
index a19aad8497e5..cc8157c96055 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx
@@ -79,7 +79,7 @@ namespace dbaccess
     {
         ::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns;
     protected:
-        virtual connectivity::sdbcx::ObjectType createObject(const OUString& 
_rName) override;
+        virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
         virtual void impl_refresh() override;
     public:
         ORowSetDataColumns(
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx 
b/dbaccess/source/core/api/FilteredContainer.cxx
index 7690bca3e10f..0c4592b000bc 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -381,7 +381,7 @@ static sal_Int32 createWildCardVector(Sequence< OUString >& 
_rTableFilter, std::
         }
     }
 
-    OUString OFilteredContainer::getNameForObject(const ObjectType& _xObject)
+    OUString OFilteredContainer::getNameForObject(const css::uno::Reference< 
css::beans::XPropertySet >& _xObject)
     {
         OSL_ENSURE( _xObject.is(), "OFilteredContainer::getNameForObject: 
Object is NULL!" );
         return ::dbtools::composeTableName( m_xMetaData, _xObject, 
::dbtools::EComposeRule::InDataManipulation, false );
diff --git a/dbaccess/source/core/api/HelperCollections.cxx 
b/dbaccess/source/core/api/HelperCollections.cxx
index 503c12c93a1b..3f29b50fe9e1 100644
--- a/dbaccess/source/core/api/HelperCollections.cxx
+++ b/dbaccess/source/core/api/HelperCollections.cxx
@@ -71,7 +71,7 @@ namespace dbaccess
         OPrivateColumns_Base::disposing();
     }
 
-    connectivity::sdbcx::ObjectType OPrivateColumns::createObject(const 
OUString& _rName)
+    css::uno::Reference< css::beans::XPropertySet > 
OPrivateColumns::createObject(const OUString& _rName)
     {
         if ( m_aColumns.is() )
         {
@@ -80,21 +80,21 @@ namespace dbaccess
                 aIter = 
findRealName(m_aColumns->begin(),m_aColumns->end(),_rName,UStringMixEqual(isCaseSensitive()));
 
             if(aIter != m_aColumns->end())
-                return connectivity::sdbcx::ObjectType(*aIter,UNO_QUERY);
+                return *aIter;
 
             OSL_FAIL("Column not found in collection!");
         }
         return nullptr;
     }
 
-    connectivity::sdbcx::ObjectType OPrivateTables::createObject(const 
OUString& _rName)
+    css::uno::Reference< css::beans::XPropertySet > 
OPrivateTables::createObject(const OUString& _rName)
     {
         if ( !m_aTables.empty() )
         {
             OSQLTables::iterator aIter = m_aTables.find(_rName);
             OSL_ENSURE(aIter != m_aTables.end(),"Table not found!");
             OSL_ENSURE(aIter->second.is(),"Table is null!");
-            return 
connectivity::sdbcx::ObjectType(m_aTables.find(_rName)->second,UNO_QUERY);
+            return css::uno::Reference< css::beans::XPropertySet 
>(m_aTables.find(_rName)->second,UNO_QUERY);
         }
         return nullptr;
     }
diff --git a/dbaccess/source/core/api/HelperCollections.hxx 
b/dbaccess/source/core/api/HelperCollections.hxx
index 2c066064de54..f0f38c80a48e 100644
--- a/dbaccess/source/core/api/HelperCollections.hxx
+++ b/dbaccess/source/core/api/HelperCollections.hxx
@@ -38,7 +38,7 @@ namespace dbaccess
     {
         ::rtl::Reference< ::connectivity::OSQLColumns>  m_aColumns;
     protected:
-        virtual connectivity::sdbcx::ObjectType createObject(const OUString& 
_rName) override;
+        virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
         virtual void impl_refresh() override {}
         virtual Reference< XPropertySet > createDescriptor() override
         {
@@ -71,7 +71,7 @@ namespace dbaccess
     {
         OSQLTables  m_aTables;
     protected:
-        virtual connectivity::sdbcx::ObjectType createObject(const OUString& 
_rName) override;
+        virtual css::uno::Reference< css::beans::XPropertySet > 
createObject(const OUString& _rName) override;
         virtual void impl_refresh() override {}
         virtual Reference< XPropertySet > createDescriptor() override
         {
diff --git a/dbaccess/source/core/api/RowSetBase.cxx 
b/dbaccess/source/core/api/RowSetBase.cxx
index d2811d8af564..2b49e8f1650d 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -60,7 +60,7 @@ class OEmptyCollection : public sdbcx::OCollection
 {
 protected:
     virtual void impl_refresh() override;
-    virtual connectivity::sdbcx::ObjectType createObject(const OUString& 
_rName) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > createObject(const 
OUString& _rName) override;
 public:
     OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : 
OCollection(_rParent, true, _rMutex, std::vector< OUString>()){}
 };
@@ -69,9 +69,9 @@ void OEmptyCollection::impl_refresh()
 {
 }
 
-connectivity::sdbcx::ObjectType OEmptyCollection::createObject(const OUString& 
/*_rName*/)
+css::uno::Reference< css::beans::XPropertySet > 
OEmptyCollection::createObject(const OUString& /*_rName*/)
 {
-    return connectivity::sdbcx::ObjectType();
+    return css::uno::Reference< css::beans::XPropertySet >();
 }
 
 // ORowSetBase
diff --git a/dbaccess/source/core/api/column.cxx 
b/dbaccess/source/core/api/column.cxx
index 15378e22fd82..4dc4071fdc8f 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -216,11 +216,11 @@ void OColumns::impl_refresh()
         m_pRefreshColumns->refreshColumns();
 }
 
-connectivity::sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
-e 
... etc. - the rest is truncated