diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-11-24 15:09:10 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-25 15:40:15 +0100 |
commit | 3dacf98b70088e6435fb46c3e225bea35a451028 (patch) | |
tree | a222c973d25f69b957bff6429c337809e766a530 /cui/source/tabpages | |
parent | 3a713e78a03f8200668ce146b153e12384de5bee (diff) |
weld SfxMacroAssignDlg
Change-Id: I80045f1d1ca189fc490dc88b3471d68782df6f1c
Reviewed-on: https://gerrit.libreoffice.org/63976
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/tabpages')
-rw-r--r-- | cui/source/tabpages/macroass.cxx | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 4788ccc404cf..75176ba85e30 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -318,23 +318,12 @@ void SfxMacroTabPage::AssignDeleteHdl(const weld::Widget* pBtn) IMPL_LINK( SfxMacroTabPage, TimeOut_Impl, Timer*,, void ) { // FillMacroList() can take a long time -> show wait cursor and disable input - SfxTabDialog* pTabDlg = GetTabDialog(); - // perhaps the tabpage is part of a SingleTabDialog then pTabDlg == NULL - if ( pTabDlg ) - { - pTabDlg->EnterWait(); - pTabDlg->EnableInput( false ); - } + weld::Window* pDialog = GetDialogFrameWeld(); + // perhaps the tabpage is part of a SingleTabDialog then pDialog == nullptr + std::unique_ptr<weld::WaitObject> xWait(pDialog ? new weld::WaitObject(pDialog) : nullptr); // fill macro list - mpImpl->m_xGroupLB->Init( - comphelper::getProcessComponentContext(), - GetFrame(), - OUString(), false); - if ( pTabDlg ) - { - pTabDlg->EnableInput(); - pTabDlg->LeaveWait(); - } + mpImpl->m_xGroupLB->Init(comphelper::getProcessComponentContext(), GetFrame(), + OUString(), false); } void SfxMacroTabPage::InitAndSetHandler() @@ -398,14 +387,15 @@ VclPtr<SfxTabPage> SfxMacroTabPage::Create(TabPageParent pParent, const SfxItemS return CreateSfxMacroTabPage(pParent, *rAttrSet); } -SfxMacroAssignDlg::SfxMacroAssignDlg(vcl::Window* pParent, +SfxMacroAssignDlg::SfxMacroAssignDlg(weld::Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet) - : SfxSingleTabDialog(pParent, rSet, "EventAssignDialog", - "cui/ui/eventassigndialog.ui") + : SfxSingleTabDialogController(pParent, rSet,"cui/ui/eventassigndialog.ui", + "EventAssignDialog") { - VclPtr<SfxMacroTabPage> pPage = CreateSfxMacroTabPage(get_content_area(), rSet); - pPage->SetFrame( rxDocumentFrame ); - SetTabPage( pPage ); + TabPageParent pPageParent(get_content_area(), this); + VclPtr<SfxMacroTabPage> pPage = CreateSfxMacroTabPage(pPageParent, rSet); + pPage->SetFrame(rxDocumentFrame); + SetTabPage(pPage); pPage->LaunchFillGroup(); } |