From f62efe43a25770b8bcbe9b7bc681284b9a006ea0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 23 Oct 2018 16:18:53 +0100 Subject: weld ODbAdminDialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I691ce67b55fb16d06d7266ebe671ac31e30c05d5 Reviewed-on: https://gerrit.libreoffice.org/62297 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- dbaccess/source/ui/inc/dbadmin.hxx | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'dbaccess/source/ui/inc/dbadmin.hxx') 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 m_pImpl; bool m_bUIEnabled : 1; /// if the UI is enabled, false otherwise. Cannot be switched back to , once it is - sal_uInt16 m_nMainPageID; + OString m_sMainPageID; public: /** ctor. The itemset given should have been created by createItemSet 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 ODatasourceMap. 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 .. -- cgit