From a9f8f86387e7ef7eb5dd17528075e510a1b084a5 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 1 Aug 2019 18:14:35 +0100 Subject: weld OMySQLIntroPageSetup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8378860bfc5cb087b5c04a73e99965afdee4c23f Reviewed-on: https://gerrit.libreoffice.org/76822 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx') diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 099af83ba54a..ffa1198858bb 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -200,11 +200,10 @@ namespace dbaui VIA_NATIVE }; - OMySQLIntroPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); + OMySQLIntroPageSetup(TabPageParent pParent, const SfxItemSet& rCoreAttrs); virtual ~OMySQLIntroPageSetup() override; - virtual void dispose() override; - static VclPtr CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet ); + static VclPtr CreateMySQLIntroTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet); ConnectionType getMySQLMode(); void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } @@ -215,13 +214,12 @@ namespace dbaui virtual void fillWindows(std::vector< std::unique_ptr >& _rControlList) override; private: - VclPtr m_pODBCDatabase; - VclPtr m_pJDBCDatabase; - VclPtr m_pNATIVEDatabase; + std::unique_ptr m_xODBCDatabase; + std::unique_ptr m_xJDBCDatabase; + std::unique_ptr m_xNATIVEDatabase; Link maClickHdl; - DECL_LINK(OnSetupModeSelected, RadioButton&, void); - + DECL_LINK(OnSetupModeSelected, weld::ToggleButton&, void); }; // OAuthentificationPageSetup -- cgit