sc/source/ui/docshell/docsh6.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b570bba64d688a906c51455e5bbda854f9eb8b7c
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Mar 1 08:34:00 2024 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Mar 1 20:44:18 2024 +0100
sc lok: make the formula separator warning dialog async
I'm not sure what exactly changed here, but recently online.git
unit-wopi-languages started to fail for me. First it was an assertion
failure:
/home/vmiklos/git/libreoffice/core/vcl/source/window/window.cxx:3186: void
vcl::Window::SetLOKNotifier(const vcl::ILibreOfficeKitNotifier*, bool):
Assertion `pNotifier' failed.
Once ScDocShell::CheckConfigOptions() is changed to pass in the view
shell explicitly, the next error is:
kit-26201-26149 2024-02-28 10:41:31.659255 +0100 [ kitbroker_002 ] ERR
non-async dialog triggered
So convert it to async, similar to the chart2/ hunk of commit
4b33e878a446b0bcdb1d5f882a05a256967eea54 (Make format condition, chart
delete and pivot table error async, 2024-01-10).
Change-Id: I159278b24db0acd5fddb6f4d29dae9a35321e614
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164178
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index eeb35327b333..9b3dd1f4a9ae 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -499,10 +499,10 @@ void ScDocShell::CheckConfigOptions()
ScTabViewShell* pViewShell = GetBestViewShell();
if (pViewShell)
{
- std::unique_ptr<weld::MessageDialog>
xInfoBox(Application::CreateMessageDialog(pViewShell->GetFrameWeld(),
+ std::shared_ptr<weld::MessageDialog>
xInfoBox(Application::CreateMessageDialog(pViewShell->GetFrameWeld(),
VclMessageType::Info, VclButtonsType::Ok,
-
ScResId(STR_OPTIONS_WARN_SEPARATORS)));
- xInfoBox->run();
+
ScResId(STR_OPTIONS_WARN_SEPARATORS), pViewShell));
+ xInfoBox->runAsync(xInfoBox, [] (int) {});
}
// For now, this is the only option setting that could launch info
