diff options
| author | Henry Castro <hcastro@collabora.com> | 2018-03-05 09:03:10 -0400 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-05-22 12:03:50 +0200 |
| commit | 2d188986a47e3bc3bee983b942b960fbd6e58d03 (patch) | |
| tree | 509fce0a74bbd918d6ceb8c65f794e817ec6f715 | |
| parent | ab5012bb09bf5107655c1455c637bdd1f8e22c85 (diff) | |
lokdialog: more, convert the dialog to async exec
ClassificationDialog -> To trigger this dialog: enable TSCP Classification toolbar
click toolbar item "Classification Dialog"
SwWatermarkDialog -> To trigger this dialog: Format -> Watermark... SwWatermarkDialog
---
Obs: the ClassificationDialog is not implemented in cp-5.3 branch
Change-Id: I835648df8df5ad3ee5a404a582c2179e5b3b276a
Reviewed-on: https://gerrit.libreoffice.org/50771
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Henry Castro <hcastro@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/50784
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
| -rw-r--r-- | sw/source/uibase/app/docsh2.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index afcd25351308..469239160b26 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -1185,9 +1185,8 @@ void SwDocShell::Execute(SfxRequest& rReq) { SfxViewShell* pViewShell = GetView()? GetView(): SfxViewShell::Current(); SfxBindings& rBindings( pViewShell->GetViewFrame()->GetBindings() ); - ScopedVclPtr<SwWatermarkDialog> pDlg( VclPtr<SwWatermarkDialog>::Create( nullptr, rBindings ) ); - pDlg->Execute(); - pDlg.disposeAndClear(); + VclPtr<SwWatermarkDialog> pDlg(VclPtr<SwWatermarkDialog>::Create(&GetView()->GetViewFrame()->GetWindow(), rBindings)); + pDlg->StartExecuteAsync([](sal_Int32 /*nResult*/){}); } } } |