diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-12-06 15:03:55 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-12-06 20:27:35 +0100 |
commit | de9667d419bae2c03adf9a9c08b20cd519137cba (patch) | |
tree | a36c3b575a0dfc6f2e1f0c4da93c2b8cad2bf061 /unotools | |
parent | cc3fb303db41492eccf845f34581b462c6ee24ec (diff) |
tdf#157915 Error when running a Basic macro with instruction commitChanges
regression from
commit 1576ef8532cf2cea2da361db9c5707f1994e65e2
Author: Noel Grandin <noelgrandin@gmail.com>
Date: Thu Dec 23 18:40:44 2021 +0200
osl::Mutex->std::mutex in SvtCommandOptions
Note that this only fixes part of the issue - specifically the part that
the original reporter described.
There is a further issue, not fixed here, which only happens on
Linux/GTK, where the messagebox dialog manages to end up behind the
About dialog, and consequently cannot be closed, which freezes the
program.
Change-Id: Idbb7f51e494a69886c80eb92efaa7cf7c6911c16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160393
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/source/config/cmdoptions.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index ec4e826b8c8a..015637d644a2 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -222,7 +222,9 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& ) css::uno::Reference< css::frame::XFrame > xFrame(pIt->get(), css::uno::UNO_QUERY); if (xFrame.is()) { + aGuard.unlock(); // because we can call back into ourself xFrame->contextChanged(); + aGuard.lock(); ++pIt; } else |