sw/source/uibase/app/docsh2.cxx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 02e8420af6bd75bf172296ea7f6f94db7b63e0c5
Author: Henry Castro <hcas...@collabora.com>
Date: Mon Mar 5 09:03:10 2018 -0400
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 <c...@libreoffice.org>
Reviewed-by: Henry Castro <hcas...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/50784
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
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*/){});
}
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
