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

[Stephan Bergmann (via logerrit)]

 vcl/inc/win/salframe.h      |    4 ++--
 vcl/win/window/salframe.cxx |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f4a021a196e8f71b92d9e6b4021a99526cb5cc72
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Nov 27 11:15:07 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Nov 27 14:27:21 2020 +0100

    WinSalFrame::mnWidth/Height should presumably be of type LONG
    
    ...as they are only ever set to LO-/HIWORD values cast to a signed integer type
    
    Change-Id: I82f9a80bab7c3b7e3ee5545725efd0d88601b8c5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106755
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 05f907dc66b9..5068ecd987aa 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -41,8 +41,8 @@ public:
     SystemEnvData           maSysData;              // system data
     SalFrameState           maState = {};           // frame state
     int                     mnShowState;            // show state
-    long                    mnWidth;                // client width in pixeln
-    long                    mnHeight;               // client height in pixeln
+    LONG                    mnWidth;                // client width in pixeln
+    LONG                    mnHeight;               // client height in pixeln
     int                     mnMinWidth;             // min. client width in pixeln
     int                     mnMinHeight;            // min. client height in pixeln
     int                     mnMaxWidth;             // max. client width in pixeln
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 34a569be39ab..3454ebf885c8 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -4025,8 +4025,8 @@ static void ImplHandleSizeMsg( HWND hWnd, WPARAM wParam, LPARAM lParam )
         {
             UpdateFrameGeometry( hWnd, pFrame );
 
-            pFrame->mnWidth  = static_cast<int>(LOWORD(lParam));
-            pFrame->mnHeight = static_cast<int>(HIWORD(lParam));
+            pFrame->mnWidth  = static_cast<LONG>(LOWORD(lParam));
+            pFrame->mnHeight = static_cast<LONG>(HIWORD(lParam));
             // save state
             ImplSaveFrameState( pFrame );
             // Call Hdl