summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2021-11-21 18:12:08 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-11-22 07:55:31 +0100
commit16289b6de6ba37c7008fb198260517f3bc505bf4 (patch)
tree854fe82e76eae0d969b1d34e13e82a1d05cd4238 /framework
parent9b0ea78959f6bcbc1a776c505352ab37e91381ad (diff)
osl::Mutex->std::mutex in XFrameImpl::windowShown
Change-Id: I1e56d0931a6e814cb9a4faa6a06e70b3740cb728 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125628 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
-rw-r--r--framework/source/services/frame.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index d27cea6942d5..991a7b58131b 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -81,6 +81,7 @@
#include <tools/diagnose_ex.h>
#include <unotools/cmdoptions.hxx>
#include <vcl/threadex.hxx>
+#include <mutex>
using namespace framework;
@@ -2580,7 +2581,7 @@ void SAL_CALL XFrameImpl::windowClosing( const css::lang::EventObject& )
*//*-*****************************************************************************************************/
void SAL_CALL XFrameImpl::windowShown( const css::lang::EventObject& )
{
- static osl::Mutex aFirstVisibleLock;
+ static std::mutex aFirstVisibleLock;
/* SAFE { */
SolarMutexClearableGuard aReadLock;
@@ -2595,10 +2596,10 @@ void SAL_CALL XFrameImpl::windowShown( const css::lang::EventObject& )
return;
static bool bFirstVisibleTask = true;
- osl::ClearableMutexGuard aGuard(aFirstVisibleLock);
+ std::unique_lock aGuard(aFirstVisibleLock);
bool bMustBeTriggered = bFirstVisibleTask;
bFirstVisibleTask = false;
- aGuard.clear();
+ aGuard.unlock();
if (bMustBeTriggered)
{