diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-10-24 15:56:35 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-25 09:56:25 +0200 |
commit | 08402a81e55ab43bf079a9c91df8b9494634ef52 (patch) | |
tree | bfd63899b4c31f4e4a48b8dcb222b6da33f41c49 /dbaccess/source/ui/dlg | |
parent | e6176cdb896a53e132920d1e13f2d4f274a62df2 (diff) |
weld OSpreadSheetConnectionPageSetup
Change-Id: Ibcf63af2bb1272d35420ac1b6f71aaa6f147ec16
Reviewed-on: https://gerrit.libreoffice.org/62322
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess/source/ui/dlg')
-rw-r--r-- | dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 23 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 7 |
2 files changed, 12 insertions, 18 deletions
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 0055f65dbc4f..d818b2dc12a8 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -690,11 +690,12 @@ using namespace ::com::sun::star; } - OSpreadSheetConnectionPageSetup::OSpreadSheetConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) - :OConnectionTabPageSetup(pParent, "DBWizSpreadsheetPage", "dbaccess/ui/dbwizspreadsheetpage.ui", _rCoreAttrs, STR_SPREADSHEET_HELPTEXT, STR_SPREADSHEET_HEADERTEXT, STR_SPREADSHEETPATH) + OSpreadSheetConnectionPageSetup::OSpreadSheetConnectionPageSetup(TabPageParent pParent, const SfxItemSet& rCoreAttrs) + : DBOConnectionTabPageSetup(pParent, "dbaccess/ui/dbwizspreadsheetpage.ui", "DBWizSpreadsheetPage", + rCoreAttrs, STR_SPREADSHEET_HELPTEXT, STR_SPREADSHEET_HEADERTEXT, STR_SPREADSHEETPATH) + , m_xPasswordrequired(m_xBuilder->weld_check_button("passwordrequired")) { - get(m_pPasswordrequired, "passwordrequired"); - m_pPasswordrequired->SetToggleHdl( LINK(this, OGenericAdministrationPage, ControlModifiedCheckBoxHdl) ); + m_xPasswordrequired->connect_toggled(LINK(this, OGenericAdministrationPage, OnControlModifiedButtonClick)); } OSpreadSheetConnectionPageSetup::~OSpreadSheetConnectionPageSetup() @@ -702,27 +703,21 @@ using namespace ::com::sun::star; disposeOnce(); } - void OSpreadSheetConnectionPageSetup::dispose() - { - m_pPasswordrequired.clear(); - OConnectionTabPageSetup::dispose(); - } - void OSpreadSheetConnectionPageSetup::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& /*_rControlList*/) { } void OSpreadSheetConnectionPageSetup::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) { - OConnectionTabPageSetup::fillControls(_rControlList); - _rControlList.emplace_back(new OSaveValueWrapper<CheckBox>(m_pPasswordrequired)); + DBOConnectionTabPageSetup::fillControls(_rControlList); + _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::CheckButton>(m_xPasswordrequired.get())); } bool OSpreadSheetConnectionPageSetup::FillItemSet( SfxItemSet* _rSet ) { - bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); - fillBool(*_rSet,m_pPasswordrequired,DSID_PASSWORDREQUIRED,bChangedSomething); + bool bChangedSomething = DBOConnectionTabPageSetup::FillItemSet(_rSet); + fillBool(*_rSet,m_xPasswordrequired.get(),DSID_PASSWORDREQUIRED,false,bChangedSomething); return bChangedSomething; } diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 419be4acc05c..f634232113ae 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -36,17 +36,16 @@ namespace dbaui { // OSpreadSheetConnectionPageSetup - class OSpreadSheetConnectionPageSetup final : public OConnectionTabPageSetup + class OSpreadSheetConnectionPageSetup final : public DBOConnectionTabPageSetup { public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; static VclPtr<OGenericAdministrationPage> CreateDocumentOrSpreadSheetTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); - OSpreadSheetConnectionPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); + OSpreadSheetConnectionPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs); virtual ~OSpreadSheetConnectionPageSetup() override; - virtual void dispose() override; private: - VclPtr<CheckBox> m_pPasswordrequired; + std::unique_ptr<weld::CheckButton> m_xPasswordrequired; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override; virtual void fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override; |