1 files changed, 6 insertions, 11 deletions
diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx
index eef3aed0874e..3d1457793640 100644
--- a/dbaccess/source/ui/inc/dbadmin.hxx
+++ b/dbaccess/source/ui/inc/dbadmin.hxx
@@ -22,18 +22,13 @@
 #include <sfx2/tabdlg.hxx>
 #include <dsntypes.hxx>
 #include "IItemSetHelper.hxx"
+#include <unotools/resmgr.hxx>
 #include <memory>
 
 namespace com::sun::star {
     namespace beans {
         class XPropertySet;
     }
-    namespace sdbc {
-        class XConnection;
-    }
-    namespace lang {
-        class XMultiServiceFactory;
-    }
 }
 
 namespace dbaui
@@ -48,7 +43,7 @@ class ODbAdminDialog final : public SfxTabDialogController, public IItemSetHelpe
 private:
     std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
 
-    OString             m_sMainPageID;
+    OUString             m_sMainPageID;
 
 public:
     /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed
@@ -62,10 +57,10 @@ public:
         @param      _pTypeCollection        pointer to an <type>ODatasourceMap</type>. May be NULL, in this case
                                             the pool will not contain a typecollection default.
     */
-    static void createItemSet(std::unique_ptr<SfxItemSet>& _rpSet, SfxItemPool*& _rpPool, std::vector<SfxPoolItem*>*& _rpDefaults, ::dbaccess::ODsnTypeCollection* _pTypeCollection);
+    static void createItemSet(std::unique_ptr<SfxItemSet>& _rpSet, rtl::Reference<SfxItemPool>& _rpPool, ::dbaccess::ODsnTypeCollection* _pTypeCollection);
     /** destroy and item set / item pool / pool defaults previously created by <method>createItemSet</method>
     */
-    static void destroyItemSet(std::unique_ptr<SfxItemSet>& _rpSet, SfxItemPool*& _rpPool, std::vector<SfxPoolItem*>*& _rpDefaults);
+    static void destroyItemSet(std::unique_ptr<SfxItemSet>& _rpSet, rtl::Reference<SfxItemPool>& _rpPool);
 
     /** selects the DataSource
         @param  _rName
@@ -88,9 +83,9 @@ public:
 
 private:
     // adds a new detail page and remove all the old ones
-    void addDetailPage(const OString& rPageId, const char* pTextId, CreateTabPage pCreateFunc);
+    void addDetailPage(const OUString& rPageId, TranslateId pTextId, CreateTabPage pCreateFunc);
 
-    virtual void PageCreated(const OString& rId, SfxTabPage& _rPage) override;
+    virtual void PageCreated(const OUString& rId, SfxTabPage& _rPage) override;
     virtual short Ok() override;
 
     /// select a datasource with a given name, adjust the item set accordingly, and everything like that ..