summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2024-05-24 21:45:44 +0100
committerCaolán McNamara <caolan.mcnamara@collabora.com>2024-07-28 17:22:54 +0200
commitb707ca9651a3d1b679b81b7d2aec1baf3d596090 (patch)
tree4ead20b272f39bb2448e18c9018f84416a9f9fdd /framework/inc
parentc658efe24f7a7eb4234c1c64668ea115788272e7 (diff)
cool#9082 - lok: cleanup WakeUpThread before forking, then re-start.
It seems likely that this lingering briefly after various un-identified and tough to reproduce, longer running operations in calc - which is a big ScProgress user - caused problems with background save. Change-Id: I1d0ec56c759dff30c48c8562b6400b57be4a25b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168033 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168052 Tested-by: Jenkins
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/helper/statusindicatorfactory.hxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index 1bb07f1a0c08..4d10a52a70b6 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -39,6 +39,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/implbase.hxx>
+#include <comphelper/lok.hxx>
#include <rtl/ref.hxx>
namespace framework{
@@ -120,7 +121,8 @@ class StatusIndicatorFactory final : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo
, css::lang::XInitialization
, css::task::XStatusIndicatorFactory
- , css::util::XUpdatable >
+ , css::util::XUpdatable >,
+ public comphelper::LibreOfficeKit::ThreadJoinable
{
// member
@@ -211,6 +213,11 @@ class StatusIndicatorFactory final : public ::cppu::WeakImplHelper<
void setValue(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
sal_Int32 nValue);
+ // comphelper::LibreOfficeKit::ThreadJoinable
+ virtual bool joinThreads() override;
+
+ virtual void startThreads() override;
+
// specials
private: