weld ODbAdminDialog

Change-Id: I691ce67b55fb16d06d7266ebe671ac31e30c05d5
Reviewed-on: https://gerrit.libreoffice.org/62297
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 6 insertions, 11 deletions

diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx
index 65ff82a197fb..04b88151df8c 100644
--- a/dbaccess/source/ui/inc/dbadmin.hxx
+++ b/dbaccess/source/ui/inc/dbadmin.hxx
@@ -44,26 +44,21 @@ namespace dbaui
 class ODbDataSourceAdministrationHelper;
 /** tab dialog for administrating the office wide registered data sources
 */
-class ODbAdminDialog final : public SfxTabDialog , public IItemSetHelper, public IDatabaseSettingsDialog
+class ODbAdminDialog final : public SfxTabDialogController, public IItemSetHelper, public IDatabaseSettingsDialog
 {
 private:
-    std::stack< sal_Int32 > m_aCurrentDetailPages;  // ids of all currently enabled (type-dependent) detail pages
-
     std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
 
     bool                m_bUIEnabled : 1;   /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/>
-    sal_uInt16          m_nMainPageID;
+    OString             m_sMainPageID;
 
 public:
     /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed
         after the dialog has been destroyed
     */
-    ODbAdminDialog(vcl::Window* pParent,
-        SfxItemSet const * _pItems,
-        const css::uno::Reference< css::uno::XComponentContext >& _rxORB
-        );
+    ODbAdminDialog(weld::Window* pParent, SfxItemSet const * _pItems,
+                   const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
     virtual ~ODbAdminDialog() override;
-    virtual void dispose() override;
 
     /** create and return an item set for use with the dialog.
         @param      _pTypeCollection        pointer to an <type>ODatasourceMap</type>. May be NULL, in this case
@@ -95,9 +90,9 @@ public:
 
 private:
     // adds a new detail page and remove all the old ones
-    void addDetailPage(sal_uInt16 _nPageId, const char* pTextId, CreateTabPage pCreateFunc);
+    void addDetailPage(const OString& rPageId, const char* pTextId, CreateTabPage pCreateFunc);
 
-    virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) override;
+    virtual void PageCreated(const OString& rId, SfxTabPage& _rPage) override;
     virtual short Ok() override;
 
     /// select a datasource with a given name, adjust the item set accordingly, and everything like that ..