DSID_DATASOURCE_UNO is dead

ever since it's introduction in
    commit 1519f106
    Date:   Mon Feb 5 12:57:41 2001 +0000
    #83430# +DSID_DATASOURCE_UNO

Change-Id: If9573e259c8897c6cd5cce649bfde7ff3aef7f77
Reviewed-on: https://gerrit.libreoffice.org/62230
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

dbaccess/Library_dbu.mk

@@ -165,7 +165,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
     dbaccess/source/ui/misc/imageprovider \
     dbaccess/source/ui/misc/indexcollection \
     dbaccess/source/ui/misc/linkeddocuments \
-    dbaccess/source/ui/misc/propertysetitem \
     dbaccess/source/ui/misc/propertystorage \
     dbaccess/source/ui/misc/RowSetDrop \
     dbaccess/source/ui/misc/RtfReader \

dbaccess/source/ui/dlg/DbAdminImpl.cxx

@@ -36,7 +36,6 @@
 #include <dsitems.hxx>
 #include "dsnItem.hxx"
 #include "optionalboolitem.hxx"
-#include <propertysetitem.hxx>
 #include <stringlistitem.hxx>
 #include <OAuthenticationContinuation.hxx>
 
@@ -617,7 +616,6 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr
 
     try
     {
-        _rDest.Put(OPropertySetItem(DSID_DATASOURCE_UNO, _rxSource));
         Reference<XStorable> xStore(getDataSourceOrModel(_rxSource),UNO_QUERY);
         _rDest.Put(SfxBoolItem(DSID_READONLY, !xStore.is() || xStore->isReadonly() ));
     }

dbaccess/source/ui/dlg/TablesSingleDlg.cxx

@@ -21,9 +21,6 @@
 #include "DbAdminImpl.hxx"
 #include "tablespage.hxx"
 #include <dsitems.hxx>
-
-#include <propertysetitem.hxx>
-
 #include <dbu_dlg.hxx>
 
 namespace dbaui

dbaccess/source/ui/dlg/UserAdminDlg.cxx

@@ -24,7 +24,6 @@
 #include <strings.hrc>
 #include "DriverSettings.hxx"
 #include <dsitems.hxx>
-#include <propertysetitem.hxx>
 #include <UITools.hxx>
 #include "UserAdmin.hxx"
 #include <UserAdminDlg.hxx>

dbaccess/source/ui/dlg/dbadmin.cxx

@@ -32,7 +32,6 @@
 #include <dsitems.hxx>
 #include "dsnItem.hxx"
 #include "optionalboolitem.hxx"
-#include <propertysetitem.hxx>
 #include <stringlistitem.hxx>
 
 #include <unotools/confignode.hxx>
@@ -321,7 +320,6 @@ void ODbAdminDialog::createItemSet(std::unique_ptr<SfxItemSet>& _rpSet, SfxItemP
     *pCounter++ = new SfxBoolItem(DSID_PARAMETERNAMESUBST, false);
     *pCounter++ = new SfxInt32Item(DSID_CONN_PORTNUMBER, 8100);
     *pCounter++ = new SfxBoolItem(DSID_SUPPRESSVERSIONCL, false);
-    *pCounter++ = new OPropertySetItem(DSID_DATASOURCE_UNO);
     *pCounter++ = new SfxBoolItem(DSID_CONN_SHUTSERVICE, false);
     *pCounter++ = new SfxInt32Item(DSID_CONN_DATAINC, 20);
     *pCounter++ = new SfxInt32Item(DSID_CONN_CACHESIZE, 20);
@@ -422,7 +420,6 @@ void ODbAdminDialog::createItemSet(std::unique_ptr<SfxItemSet>& _rpSet, SfxItemP
         {0,false},
         {0,false},
         {0,false},
-        {0,false}
     };
 
     OSL_ENSURE(SAL_N_ELEMENTS(aItemInfos) == DSID_LAST_ITEM_ID,"Invalid Ids!");

dbaccess/source/ui/dlg/dbwiz.cxx

@@ -31,7 +31,6 @@
 #include "adminpages.hxx"
 #include "generalpage.hxx"
 #include <stringlistitem.hxx>
-#include <propertysetitem.hxx>
 #include <unotools/confignode.hxx>
 #include "ConnectionPage.hxx"
 #include "DriverSettings.hxx"

dbaccess/source/ui/dlg/dbwizsetup.cxx

@@ -37,7 +37,6 @@
 #include <unotools/ucbhelper.hxx>
 #include "generalpage.hxx"
 #include <stringlistitem.hxx>
-#include <propertysetitem.hxx>
 #include <unotools/confignode.hxx>
 #include "DbAdminImpl.hxx"
 #include <helpids.h>

dbaccess/source/ui/inc/dsitems.hxx

@@ -48,43 +48,42 @@ typedef sal_Int32   ItemID;
 #define DSID_PARAMETERNAMESUBST     22
 #define DSID_CONN_PORTNUMBER        23
 #define DSID_SUPPRESSVERSIONCL      24          // meta data: sal_True if the data source described by the set is to-be-deleted
-#define DSID_DATASOURCE_UNO         25          // meta data: OPropertySetItem, the data source the set represents
-#define DSID_CONN_SHUTSERVICE       26
-#define DSID_CONN_DATAINC           27
-#define DSID_CONN_CACHESIZE         28
-#define DSID_CONN_CTRLUSER          29
-#define DSID_CONN_CTRLPWD           30
-#define DSID_USECATALOG             31          // should the driver use the catalog name when the database is filebased
-#define DSID_CONN_HOSTNAME          32
-#define DSID_CONN_LDAP_BASEDN       33
-#define DSID_CONN_LDAP_PORTNUMBER   34
-#define DSID_CONN_LDAP_ROWCOUNT     35
-#define DSID_SQL92CHECK             36
-#define DSID_AUTOINCREMENTVALUE     37
-#define DSID_AUTORETRIEVEVALUE      38
-#define DSID_AUTORETRIEVEENABLED    39
-#define DSID_APPEND_TABLE_ALIAS     40
-#define DSID_MYSQL_PORTNUMBER       41
-#define DSID_IGNOREDRIVER_PRIV      42
-#define DSID_BOOLEANCOMPARISON      43
-#define DSID_ORACLE_PORTNUMBER      44
-#define DSID_ENABLEOUTERJOIN        45
-#define DSID_CATALOG                46
-#define DSID_SCHEMA                 47
-#define DSID_INDEXAPPENDIX          48
-#define DSID_CONN_LDAP_USESSL       49
-#define DSID_DOCUMENT_URL           50
-#define DSID_DOSLINEENDS            51
-#define DSID_DATABASENAME           52
-#define DSID_AS_BEFORE_CORRNAME     53
-#define DSID_CHECK_REQUIRED_FIELDS  54
-#define DSID_IGNORECURRENCY         55
-#define DSID_CONN_SOCKET            56
-#define DSID_ESCAPE_DATETIME        57
-#define DSID_NAMED_PIPE             58
-#define DSID_PRIMARY_KEY_SUPPORT    59
-#define DSID_MAX_ROW_SCAN           60
-#define DSID_RESPECTRESULTSETTYPE   61
+#define DSID_CONN_SHUTSERVICE       25
+#define DSID_CONN_DATAINC           26
+#define DSID_CONN_CACHESIZE         27
+#define DSID_CONN_CTRLUSER          28
+#define DSID_CONN_CTRLPWD           29
+#define DSID_USECATALOG             30          // should the driver use the catalog name when the database is filebased
+#define DSID_CONN_HOSTNAME          31
+#define DSID_CONN_LDAP_BASEDN       32
+#define DSID_CONN_LDAP_PORTNUMBER   33
+#define DSID_CONN_LDAP_ROWCOUNT     34
+#define DSID_SQL92CHECK             35
+#define DSID_AUTOINCREMENTVALUE     36
+#define DSID_AUTORETRIEVEVALUE      37
+#define DSID_AUTORETRIEVEENABLED    38
+#define DSID_APPEND_TABLE_ALIAS     39
+#define DSID_MYSQL_PORTNUMBER       40
+#define DSID_IGNOREDRIVER_PRIV      41
+#define DSID_BOOLEANCOMPARISON      42
+#define DSID_ORACLE_PORTNUMBER      43
+#define DSID_ENABLEOUTERJOIN        44
+#define DSID_CATALOG                45
+#define DSID_SCHEMA                 46
+#define DSID_INDEXAPPENDIX          47
+#define DSID_CONN_LDAP_USESSL       48
+#define DSID_DOCUMENT_URL           49
+#define DSID_DOSLINEENDS            50
+#define DSID_DATABASENAME           51
+#define DSID_AS_BEFORE_CORRNAME     52
+#define DSID_CHECK_REQUIRED_FIELDS  53
+#define DSID_IGNORECURRENCY         54
+#define DSID_CONN_SOCKET            55
+#define DSID_ESCAPE_DATETIME        56
+#define DSID_NAMED_PIPE             57
+#define DSID_PRIMARY_KEY_SUPPORT    58
+#define DSID_MAX_ROW_SCAN           59
+#define DSID_RESPECTRESULTSETTYPE   60
     // don't forget to adjust DSID_LAST_ITEM_ID below!
 
 // item range. Adjust this if you introduce new items above

dbaccess/source/ui/inc/propertysetitem.hxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_PROPERTYSETITEM_HXX
-#define INCLUDED_DBACCESS_SOURCE_UI_INC_PROPERTYSETITEM_HXX
-
-#include <svl/poolitem.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
-
-namespace dbaui
-{
-
-    // OPropertySetItem
-    /** <type>SfxPoolItem</type> which transports a XPropertySet
-    */
-    class OPropertySetItem : public SfxPoolItem
-    {
-        css::uno::Reference< css::beans::XPropertySet >   m_xSet;
-
-    public:
-        OPropertySetItem(sal_Int16 nWhich);
-        OPropertySetItem(sal_Int16 nWhich,
-            const css::uno::Reference< css::beans::XPropertySet >& _rxSet);
-        OPropertySetItem(const OPropertySetItem& _rSource);
-
-        virtual bool             operator==(const SfxPoolItem& _rItem) const override;
-        virtual SfxPoolItem*     Clone(SfxItemPool* _pPool = nullptr) const override;
-    };
-
-}   // namespace dbaui
-
-#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_PROPERTYSETITEM_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/ui/misc/propertysetitem.cxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <propertysetitem.hxx>
-
-namespace dbaui
-{
-
-    using namespace ::com::sun::star::uno;
-    using namespace ::com::sun::star::beans;
-
-    // OPropertySetItem
-    OPropertySetItem::OPropertySetItem(sal_Int16 _nWhich)
-        :SfxPoolItem(_nWhich)
-    {
-    }
-
-    OPropertySetItem::OPropertySetItem(sal_Int16 _nWhich, const Reference< XPropertySet >& _rxSet)
-        :SfxPoolItem(_nWhich)
-        ,m_xSet(_rxSet)
-    {
-    }
-
-    OPropertySetItem::OPropertySetItem(const OPropertySetItem& _rSource)
-        :SfxPoolItem(_rSource)
-        ,m_xSet(_rSource.m_xSet)
-    {
-    }
-
-    bool OPropertySetItem::operator==(const SfxPoolItem& _rItem) const
-    {
-        const OPropertySetItem* pCompare = dynamic_cast<const OPropertySetItem*>( &_rItem );
-        return pCompare && (pCompare->m_xSet.get() == m_xSet.get());
-    }
-
-    SfxPoolItem* OPropertySetItem::Clone(SfxItemPool* /* _pPool */) const
-    {
-        return new OPropertySetItem(*this);
-    }
-
-}   // namespace dbaui
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */