[Libreoffice-commits] core.git: vcl/win

[Stephan Bergmann (via logerrit)]

 vcl/win/dtrans/MtaOleClipb.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5dda4fb74a7f961d067d4a5b8760d96466ebd0be
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jan 7 08:16:16 2022 +0100
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Jan 7 20:24:41 2022 +0100

    -Werror,-Wshadow
    
    ...after c35f81148fb18ba070516edcbb4d614444899235 "Use
    sal::systools::CoInitializeGuard and sal::systools::ThrowIfFailed"
    
    Change-Id: I3df9fd523820e1d3651480d51ebbaafaafa3ed48
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128095
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/vcl/win/dtrans/MtaOleClipb.cxx b/vcl/win/dtrans/MtaOleClipb.cxx
index 6f7304fe3828..e0e08773e4a4 100644
--- a/vcl/win/dtrans/MtaOleClipb.cxx
+++ b/vcl/win/dtrans/MtaOleClipb.cxx
@@ -713,7 +713,7 @@ DWORD WINAPI 
CMtaOleClipboard::clipboardChangedNotifierThreadProc( _In_ LPVOID p
         MsgWaitForMultipleObjects(2, pInst->m_hClipboardChangedNotifierEvents, 
false, INFINITE,
                                   QS_ALLINPUT | QS_ALLPOSTMESSAGE);
 
-        ClearableMutexGuard aGuard( pInst->m_ClipboardChangedEventCountMutex );
+        ClearableMutexGuard aGuard2( pInst->m_ClipboardChangedEventCountMutex 
);
 
         if ( pInst->m_ClipboardChangedEventCount > 0 )
         {
@@ -721,7 +721,7 @@ DWORD WINAPI 
CMtaOleClipboard::clipboardChangedNotifierThreadProc( _In_ LPVOID p
             if ( 0 == pInst->m_ClipboardChangedEventCount )
                 ResetEvent( pInst->m_hClipboardChangedEvent );
 
-            aGuard.clear( );
+            aGuard2.clear( );
 
             // nobody should touch m_pfncClipViewerCallback while we do
             MutexGuard aClipViewerGuard( pInst->m_pfncClipViewerCallbackMutex 
);
@@ -731,7 +731,7 @@ DWORD WINAPI 
CMtaOleClipboard::clipboardChangedNotifierThreadProc( _In_ LPVOID p
                 pInst->m_pfncClipViewerCallback( );
         }
         else
-            aGuard.clear( );
+            aGuard2.clear( );
     }
 
     return 0;