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

[Stephan Bergmann (via logerrit)]

 vcl/win/window/salframe.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 9bed2b595688e73a72688852ec5d949d59fb7c2a
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Sat Sep 17 12:58:10 2022 +0200
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sat Sep 17 14:33:15 2022 +0200

    -Werror,-Wshadow (clang-cl)
    
    Change-Id: I58d99d17baf8dc13e4dc951bf281d7c7c358d259
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140101
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index c16a8fd2e8d1..fce43c02602b 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -1326,17 +1326,17 @@ void WinSalFrame::SetPosSize( tools::Long nX, 
tools::Long nY, tools::Long nWidth
     {
         // center window
 
-        HWND hWndParent = ::GetParent( mhWnd );
+        HWND hWndParent2 = ::GetParent( mhWnd );
         // Search for TopLevel Frame
-        while ( hWndParent && (GetWindowStyle( hWndParent ) & WS_CHILD) )
-            hWndParent = ::GetParent( hWndParent );
+        while ( hWndParent2 && (GetWindowStyle( hWndParent2 ) & WS_CHILD) )
+            hWndParent2 = ::GetParent( hWndParent2 );
         // if the Window has a Parent, then center the window to
         // the parent, in the other case to the screen
-        if ( hWndParent && !IsIconic( hWndParent ) &&
-             (GetWindowStyle( hWndParent ) & WS_VISIBLE) )
+        if ( hWndParent2 && !IsIconic( hWndParent2 ) &&
+             (GetWindowStyle( hWndParent2 ) & WS_VISIBLE) )
         {
             RECT aParentRect;
-            GetWindowRect( hWndParent, &aParentRect );
+            GetWindowRect( hWndParent2, &aParentRect );
             int nParentWidth    = aParentRect.right-aParentRect.left;
             int nParentHeight   = aParentRect.bottom-aParentRect.top;