diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-05-24 11:49:44 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-05-24 14:20:24 +0200 |
commit | 848058625c7fad21e2469c95c2a2078678925a5a (patch) | |
tree | 8836a8cd5cb470529bc5609df545da3c138caa25 /framework/inc | |
parent | dfbce2a556972f552d194d2358c170077915d776 (diff) |
use vcl::Timer in StatusIndicatorFactory
does not need a separate thread
Change-Id: I47bf2b255a331f4ec3ea24ad3a5d4c3ca398557e
Reviewed-on: https://gerrit.libreoffice.org/72901
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/inc')
-rw-r--r-- | framework/inc/helper/statusindicatorfactory.hxx | 7 | ||||
-rw-r--r-- | framework/inc/helper/wakeupthread.hxx | 57 |
2 files changed, 5 insertions, 59 deletions
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index d343fe35395e..1ad060516313 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -25,7 +25,6 @@ #include <vector> // include files of own module -#include <helper/wakeupthread.hxx> #include <general.h> // include uno interfaces @@ -45,7 +44,9 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/weakref.hxx> #include <vcl/status.hxx> +#include <vcl/timer.hxx> #include <cppuhelper/implbase.hxx> #include <osl/thread.hxx> @@ -165,7 +166,7 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper< /** Notify us if a fix time is over. We use it to implement an intelligent "Reschedule" ... */ - rtl::Reference<WakeUpThread> m_pWakeUp; + boost::optional<Timer> m_xWakeUpTimer; /** Our WakeUpThread calls us in our interface method "XUpdatable::update(). There we set this member m_bAllowReschedule to sal_True. Next time if our impl_reschedule() @@ -182,6 +183,8 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper< /** prevent recursive calling of Application::Reschedule(). */ static sal_Int32 m_nInReschedule; + DECL_LINK( WakeupTimerHdl, Timer*, void ); + // interface public: diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx deleted file mode 100644 index 50e234f23713..000000000000 --- a/framework/inc/helper/wakeupthread.hxx +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_FRAMEWORK_INC_HELPER_WAKEUPTHREAD_HXX -#define INCLUDED_FRAMEWORK_INC_HELPER_WAKEUPTHREAD_HXX - -#include <sal/config.h> - -#include <com/sun/star/uno/Reference.hxx> -#include <cppuhelper/weakref.hxx> -#include <osl/conditn.hxx> -#include <osl/mutex.hxx> -#include <sal/types.h> -#include <salhelper/thread.hxx> - -namespace com { namespace sun { namespace star { namespace util { - class XUpdatable; -} } } } - -namespace framework{ - -class WakeUpThread: public salhelper::Thread { - css::uno::WeakReference<css::util::XUpdatable> updatable_; - osl::Condition condition_; - - osl::Mutex mutex_; - bool terminate_; - - void execute() override; - -public: - WakeUpThread(css::uno::Reference<css::util::XUpdatable> const & updatable); - - void stop(); -}; - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |