[Libreoffice-commits] core.git: fpicker/source

[Stephan Bergmann (via logerrit)]

 fpicker/source/win32/VistaFilePickerImpl.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bb5900acfe6e250c75c34cd377777e752bae3a80
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Mar 8 17:23:05 2021 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Mar 9 09:30:07 2021 +0100

    -Werror,-Wshadow (clang-cl)
    
    Change-Id: I8b39e510266404a28acb380f449862366c647b87
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112173
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx b/fpicker/source/win32/VistaFilePickerImpl.cxx
index 29eb33409e80..5e275e4657c8 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -537,7 +537,7 @@ void VistaFilePickerImpl::impl_sta_InitDialog(const RequestRef& rRequest, DWORD
             aAny >>= tmp;
             if(tmp != 0)
             {
-                osl::MutexGuard aLock(m_aMutex);
+                osl::MutexGuard aLock2(m_aMutex);
                 m_hParentWindow = reinterpret_cast<HWND>(tmp);
             }
         }
@@ -1018,7 +1018,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)
     HRESULT hResult = E_FAIL;
     HWND hParentWindow;
     {
-        osl::MutexGuard aLock(m_aMutex);
+        osl::MutexGuard aLock2(m_aMutex);
         // Note that there is a potential race between retrieving and
         // using parent window (window might get destroyed)
         hParentWindow = m_hParentWindow ? m_hParentWindow : choose_parent_window();