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

[Stephan Bergmann (via logerrit)]

 vcl/win/gdi/salnativewidgets-luna.cxx |   12 ++++++------
 vcl/win/window/salframe.cxx           |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit e99897ff2854c1f37bbbe3cc7bf8738495403f6e
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Nov 27 11:01:35 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Nov 27 13:48:47 2020 +0100

    loplugin:toolslong (Library_vclplug_win)
    
    Change-Id: I1e8c02a4fdb42a7bbc25764ceaf96972f175130a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106751
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx b/vcl/win/gdi/salnativewidgets-luna.cxx
index 68a18b020733..95b95861586f 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -1008,7 +1008,7 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
         if( vsAPI.GetThemeBackgroundContentRect( hTheme, hDC, PP_BAR, iState, &rc, &aProgressRect) != S_OK )
             return false;
 
-        long nProgressWidth = aValue.getNumericVal();
+        tools::Long nProgressWidth = aValue.getNumericVal();
         nProgressWidth *= (aProgressRect.right - aProgressRect.left);
         nProgressWidth /= (rc.right - rc.left);
         if( AllSettings::GetLayoutRTL() )
@@ -1028,13 +1028,13 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
         RECT aTRect = rc;
         if( nPart == ControlPart::TrackHorzArea )
         {
-            long nH = aTrackRect.GetHeight();
+            tools::Long nH = aTrackRect.GetHeight();
             aTRect.top += (rc.bottom - rc.top - nH)/2;
             aTRect.bottom = aTRect.top + nH;
         }
         else
         {
-            long nW = aTrackRect.GetWidth();
+            tools::Long nW = aTrackRect.GetWidth();
             aTRect.left += (rc.right - rc.left - nW)/2;
             aTRect.right = aTRect.left + nW;
         }
@@ -1138,7 +1138,7 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
                 tools::Rectangle aRect( ImplGetThemeRect( hTheme, hDC,
                     MENU_POPUPSEPARATOR, 0, tools::Rectangle( rc.left, rc.top, rc.right, rc.bottom ) ) );
                 // center the separator inside the passed rectangle
-                long nDY = ((rc.bottom - rc.top + 1) - aRect.GetHeight()) / 2;
+                auto const nDY = ((rc.bottom - rc.top + 1) - aRect.GetHeight()) / 2;
                 rc.top += nDY;
                 rc.bottom = rc.top+aRect.GetHeight()-1;
                 return ImplDrawTheme( hTheme, hDC, MENU_POPUPSEPARATOR, 0, rc, aCaption );
@@ -1478,7 +1478,7 @@ bool WinSalGraphics::getNativeControlRegion(  ControlType nType,
             tools::Rectangle aThumbRect = ImplGetThemeRect( hTheme, hDC, iPart, iState, tools::Rectangle() );
             if( nPart == ControlPart::ThumbHorz )
             {
-                long nW = aThumbRect.GetWidth();
+                tools::Long nW = aThumbRect.GetWidth();
                 tools::Rectangle aRect( rControlRegion );
                 aRect.SetRight( aRect.Left() + nW - 1 );
                 rNativeContentRegion = aRect;
@@ -1486,7 +1486,7 @@ bool WinSalGraphics::getNativeControlRegion(  ControlType nType,
             }
             else
             {
-                long nH = aThumbRect.GetHeight();
+                tools::Long nH = aThumbRect.GetHeight();
                 tools::Rectangle aRect( rControlRegion );
                 aRect.SetBottom( aRect.Top() + nH - 1 );
                 rNativeContentRegion = aRect;
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index e016430611ad..34a569be39ab 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -2580,7 +2580,7 @@ static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW& rLogFont, vcl::Fon
 
 static tools::Long ImplW2I( const wchar_t* pStr )
 {
-    long    n = 0;
+    tools::Long n = 0;
     int     nSign = 1;
 
     if ( *pStr == '-' )