summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-10-13 17:27:53 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-10-14 09:05:33 +0200
commit0b9d1fd252e50a37a5091fd59b772256e7ca22dd (patch)
tree3deac48e29aa145dc3341a6915bb6ed35f21d83a
parent726c911b90b9a3170fa6b3a34bb952a8d2dbe148 (diff)
-Werror,-Wshadow (clang-cl)
Change-Id: I3f76ca202c38b42f55d669a0160fa8203b136031 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104246 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--vcl/win/dtrans/WinClipboard.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/win/dtrans/WinClipboard.cxx b/vcl/win/dtrans/WinClipboard.cxx
index de6ecb775838..f553ba3dd34e 100644
--- a/vcl/win/dtrans/WinClipboard.cxx
+++ b/vcl/win/dtrans/WinClipboard.cxx
@@ -93,7 +93,7 @@ uno::Reference<datatransfer::XTransferable> SAL_CALL CWinClipboard::getContents(
// use the shortcut or create a transferable from
// system clipboard
{
- osl::MutexGuard aGuard(m_ClipContentMutex);
+ osl::MutexGuard aGuard2(m_ClipContentMutex);
if (nullptr != m_pCurrentClipContent)
return m_pCurrentClipContent->m_XTransferable;
@@ -121,7 +121,7 @@ uno::Reference<datatransfer::XTransferable> SAL_CALL CWinClipboard::getContents(
// remember pIDo destroys itself due to the smart pointer
rClipContent = CDOTransferable::create(m_xContext, pIDo);
- osl::MutexGuard aGuard(m_ClipContentMutex);
+ osl::MutexGuard aGuard2(m_ClipContentMutex);
m_foreignContent = rClipContent;
}
@@ -143,7 +143,7 @@ void SAL_CALL CWinClipboard::setContents(
if (xTransferable.is())
{
{
- osl::MutexGuard aGuard(m_ClipContentMutex);
+ osl::MutexGuard aGuard2(m_ClipContentMutex);
m_foreignContent.clear();