vcl/win/dtrans/DOTransferable.cxx | 2 +-
vcl/win/dtrans/DOTransferable.hxx | 3 ++-
vcl/win/dtrans/MtaOleClipb.cxx | 12 ++++++------
vcl/win/dtrans/MtaOleClipb.hxx | 6 +++---
4 files changed, 12 insertions(+), 11 deletions(-)
New commits:
commit 2604dae5729018dcc0894179b032c463f941624b
Author: Noel Grandin <noelgran...@collabora.co.uk>
AuthorDate: Thu Mar 16 11:24:20 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Mar 16 16:21:14 2023 +0000
osl::Mutex->std::mutex in CDOTransferable
Change-Id: I44e9305ec4127f9567fb51ce7bf8c26f17727787
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148974
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/win/dtrans/DOTransferable.cxx
b/vcl/win/dtrans/DOTransferable.cxx
index 7c5b55c02f9b..c2b54bf83a0f 100644
--- a/vcl/win/dtrans/DOTransferable.cxx
+++ b/vcl/win/dtrans/DOTransferable.cxx
@@ -236,7 +236,7 @@ Any SAL_CALL CDOTransferable::getTransferData( const
DataFlavor& aFlavor )
{
OSL_ASSERT( isValidFlavor( aFlavor ) );
- MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
// convert dataflavor to formatetc
diff --git a/vcl/win/dtrans/DOTransferable.hxx
b/vcl/win/dtrans/DOTransferable.hxx
index e42555ce6143..1824c7b44844 100644
--- a/vcl/win/dtrans/DOTransferable.hxx
+++ b/vcl/win/dtrans/DOTransferable.hxx
@@ -31,6 +31,7 @@
#include <systools/win32/comtools.hxx>
+#include <mutex>
#include <vector>
// forward
@@ -84,7 +85,7 @@ private:
const css::uno::Reference< css::uno::XComponentContext >
m_xContext;
CDataFormatTranslator
m_DataFormatTranslator;
css::uno::Reference< css::datatransfer::XMimeContentTypeFactory >
m_rXMimeCntFactory;
- ::osl::Mutex m_aMutex;
+ std::mutex m_aMutex;
bool
m_bUnicodeRegistered;
CLIPFORMAT
m_TxtFormatOnClipboard;
commit 45946d9465b197a20f12828815da6d9da3b2e3e7
Author: Noel Grandin <noelgran...@collabora.co.uk>
AuthorDate: Thu Mar 16 11:22:12 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Mar 16 16:21:04 2023 +0000
osl::Mutex->std::mutex in CMtaOleClipboard
Change-Id: If19fe618de0c316ffa6d74432b03c507b960a891
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148953
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/win/dtrans/MtaOleClipb.cxx b/vcl/win/dtrans/MtaOleClipb.cxx
index 865025057dcc..8753cf46cbae 100644
--- a/vcl/win/dtrans/MtaOleClipb.cxx
+++ b/vcl/win/dtrans/MtaOleClipb.cxx
@@ -438,7 +438,7 @@ bool CMtaOleClipboard::onRegisterClipViewer(
LPFNC_CLIPVIEWER_CALLBACK_t pfncCli
// we need exclusive access because the clipboard changed notifier
// thread also accesses this variable
- MutexGuard aGuard( m_pfncClipViewerCallbackMutex );
+ std::unique_lock aGuard( m_pfncClipViewerCallbackMutex );
// register if not yet done
if ( ( nullptr != pfncClipViewerCallback ) && ( nullptr ==
m_pfncClipViewerCallback ) )
@@ -502,7 +502,7 @@ LRESULT CMtaOleClipboard::onClipboardUpdate()
// registering ourself as clipboard
if ( !m_bInRegisterClipViewer )
{
- MutexGuard aGuard( m_ClipboardChangedEventCountMutex );
+ std::unique_lock aGuard( m_ClipboardChangedEventCountMutex );
m_ClipboardChangedEventCount++;
SetEvent( m_hClipboardChangedEvent );
@@ -713,7 +713,7 @@ DWORD WINAPI
CMtaOleClipboard::clipboardChangedNotifierThreadProc( _In_ LPVOID p
MsgWaitForMultipleObjects(2, pInst->m_hClipboardChangedNotifierEvents,
false, INFINITE,
QS_ALLINPUT | QS_ALLPOSTMESSAGE);
- ClearableMutexGuard aGuard2( pInst->m_ClipboardChangedEventCountMutex
);
+ std::unique_lock aGuard2( pInst->m_ClipboardChangedEventCountMutex );
if ( pInst->m_ClipboardChangedEventCount > 0 )
{
@@ -721,17 +721,17 @@ DWORD WINAPI
CMtaOleClipboard::clipboardChangedNotifierThreadProc( _In_ LPVOID p
if ( 0 == pInst->m_ClipboardChangedEventCount )
ResetEvent( pInst->m_hClipboardChangedEvent );
- aGuard2.clear( );
+ aGuard2.unlock( );
// nobody should touch m_pfncClipViewerCallback while we do
- MutexGuard aClipViewerGuard( pInst->m_pfncClipViewerCallbackMutex
);
+ std::unique_lock aClipViewerGuard(
pInst->m_pfncClipViewerCallbackMutex );
// notify all clipboard listener
if ( pInst->m_pfncClipViewerCallback )
pInst->m_pfncClipViewerCallback( );
}
else
- aGuard2.clear( );
+ aGuard2.unlock( );
}
return 0;
diff --git a/vcl/win/dtrans/MtaOleClipb.hxx b/vcl/win/dtrans/MtaOleClipb.hxx
index a76b85e3b059..c510418f4981 100644
--- a/vcl/win/dtrans/MtaOleClipb.hxx
+++ b/vcl/win/dtrans/MtaOleClipb.hxx
@@ -20,7 +20,7 @@
#pragma once
#include <sal/types.h>
-#include <osl/mutex.hxx>
+#include <mutex>
#include <objidl.h>
@@ -96,10 +96,10 @@ private:
HANDLE m_hClipboardChangedNotifierEvents[2];
HANDLE& m_hClipboardChangedEvent;
HANDLE& m_hTerminateClipboardChangedNotifierEvent;
- osl::Mutex m_ClipboardChangedEventCountMutex;
+ std::mutex m_ClipboardChangedEventCountMutex;
sal_Int32 m_ClipboardChangedEventCount;
- osl::Mutex m_pfncClipViewerCallbackMutex;
+ std::mutex m_pfncClipViewerCallbackMutex;
static CMtaOleClipboard* s_theMtaOleClipboardInst;
