mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lokdialog: convert the show sheet dialog to async exec

Browse Source 
Change-Id: I501d9444ef9798a26b4db06ab51e4fb691144b17
Reviewed-on: https://gerrit.libreoffice.org/51094
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Henry Castro <hcastro@collabora.com>
This commit is contained in:
Henry Castro
2018-03-11 18:44:58 -04:00
parent cab04bc39b
commit c9c0f257f4
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sc/source/ui/view/tabvwshf.cxx
View File

@@ -135,7 +135,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
ScopedVclPtr<AbstractScShowTabDlg> pDlg(pFact->CreateScShowTabDlg(GetDialogParent())); VclPtr<AbstractScShowTabDlg> pDlg(pFact->CreateScShowTabDlg(GetDialogParent()));
OSL_ENSURE(pDlg, "Dialog create fail!"); OSL_ENSURE(pDlg, "Dialog create fail!");
OUString aTabName; OUString aTabName;
@@ -150,18 +150,24 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
} }
} }
if ( pDlg->Execute() == RET_OK ) std::shared_ptr<SfxRequest> pReq = std::make_shared<SfxRequest>(rReq);
{ pDlg->StartExecuteAsync([this, pDlg, pReq](sal_Int32 nResult){
const sal_Int32 nCount = pDlg->GetSelectedEntryCount(); OUString sTable;
for (sal_Int32 nPos=0; nPos<nCount; ++nPos) std::vector<OUString> sTables;
if (RET_OK == nResult)
{ {
aName = pDlg->GetSelectedEntry(nPos); const sal_Int32 nCount = pDlg->GetSelectedEntryCount();
rReq.AppendItem( SfxStringItem( FID_TABLE_SHOW, aName ) ); for (sal_Int32 nPos=0; nPos<nCount; ++nPos)
rNames.push_back(aName); {
sTable = pDlg->GetSelectedEntry(nPos);
pReq->AppendItem( SfxStringItem( FID_TABLE_SHOW, sTable ) );
sTables.push_back(sTable);
}
ShowTable( sTables );
pReq->Done();
} }
ShowTable( rNames ); });
rReq.Done(); rReq.Ignore();
}
} }
} }
break; break;