diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-09-24 14:10:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-26 09:54:49 +0200 |
| commit | deb37c44ecfb8f6aa7c2ceec4771b0505fa7b6bb (patch) | |
| tree | 3953ca620e27fed0442272fdabea9735fd6f3dcd /cui/source/options/optinet2.cxx | |
| parent | a37e559ed123789f6bc8f7972242d6461ce692ab (diff) | |
now drop TabPageParent intermediate
Change-Id: I47328f76342ac023628d9042bdfa8213a1c93d0c
Reviewed-on: https://gerrit.libreoffice.org/79469
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/options/optinet2.cxx')
| -rw-r--r-- | cui/source/options/optinet2.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 71df2eda60f1..16785d64c10a 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -128,8 +128,8 @@ IMPL_STATIC_LINK(SvxProxyTabPage, NoSpaceTextFilterHdl, OUString&, rTest, bool) /* SvxProxyTabPage */ /* */ /********************************************************************/ -SvxProxyTabPage::SvxProxyTabPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "cui/ui/optproxypage.ui", "OptProxyPage", &rSet) +SvxProxyTabPage::SvxProxyTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "cui/ui/optproxypage.ui", "OptProxyPage", &rSet) , m_xProxyModeLB(m_xBuilder->weld_combo_box("proxymode")) , m_xHttpProxyFT(m_xBuilder->weld_label("httpft")) , m_xHttpProxyED(m_xBuilder->weld_entry("http")) @@ -185,9 +185,9 @@ SvxProxyTabPage::~SvxProxyTabPage() { } -std::unique_ptr<SfxTabPage> SvxProxyTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet ) +std::unique_ptr<SfxTabPage> SvxProxyTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet ) { - return std::make_unique<SvxProxyTabPage>(pParent, *rAttrSet); + return std::make_unique<SvxProxyTabPage>(pPage, pController, *rAttrSet); } void SvxProxyTabPage::ReadConfigData_Impl() @@ -495,8 +495,8 @@ IMPL_STATIC_LINK(SvxProxyTabPage, LoseFocusHdl_Impl, weld::Widget&, rControl, vo /* SvxSecurityTabPage */ /* */ /********************************************************************/ -SvxSecurityTabPage::SvxSecurityTabPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "cui/ui/optsecuritypage.ui", "OptSecurityPage", &rSet) +SvxSecurityTabPage::SvxSecurityTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "cui/ui/optsecuritypage.ui", "OptSecurityPage", &rSet) , mpSecOptions(new SvtSecurityOptions) , m_xSecurityOptionsPB(m_xBuilder->weld_button("options")) , m_xSavePasswordsCB(m_xBuilder->weld_check_button("savepassword")) @@ -786,9 +786,9 @@ void SvxSecurityTabPage::InitControls() } } -std::unique_ptr<SfxTabPage> SvxSecurityTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet ) +std::unique_ptr<SfxTabPage> SvxSecurityTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet ) { - return std::make_unique<SvxSecurityTabPage>(pParent, *rAttrSet); + return std::make_unique<SvxSecurityTabPage>(pPage, pController, *rAttrSet); } void SvxSecurityTabPage::ActivatePage( const SfxItemSet& ) @@ -864,8 +864,8 @@ struct SvxEMailTabPage_Impl bool bROHideContent; }; -SvxEMailTabPage::SvxEMailTabPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage( pParent, "cui/ui/optemailpage.ui", "OptEmailPage", &rSet) +SvxEMailTabPage::SvxEMailTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage( pPage, pController, "cui/ui/optemailpage.ui", "OptEmailPage", &rSet) , pImpl(new SvxEMailTabPage_Impl) , m_xMailContainer(m_xBuilder->weld_container("program")) , m_xMailerURLFI(m_xBuilder->weld_image("lockemail")) @@ -888,9 +888,9 @@ SvxEMailTabPage::~SvxEMailTabPage() /* -------------------------------------------------------------------------*/ -std::unique_ptr<SfxTabPage> SvxEMailTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) +std::unique_ptr<SfxTabPage> SvxEMailTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet ) { - return std::make_unique<SvxEMailTabPage>(pParent, *rAttrSet); + return std::make_unique<SvxEMailTabPage>(pPage, pController, *rAttrSet); } /* -------------------------------------------------------------------------*/ |