vcl/win/dtrans/WinClipboard.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 0b9d1fd252e50a37a5091fd59b772256e7ca22dd Author: Stephan Bergmann <[email protected]> AuthorDate: Tue Oct 13 17:27:53 2020 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed Oct 14 09:05:33 2020 +0200 -Werror,-Wshadow (clang-cl) Change-Id: I3f76ca202c38b42f55d669a0160fa8203b136031 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104246 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> 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(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
