1 files changed, 12 insertions, 12 deletions
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index ab4102056604..e016430611ad 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -126,7 +126,7 @@ bool WinSalFrame::mbInReparent = false;
 
 // Macros for support of WM_UNICHAR & Keyman 6.0
 //#define Uni_UTF32ToSurrogate1(ch)   (((unsigned long) (ch) - 0x10000) / 0x400 + 0xD800)
-#define Uni_UTF32ToSurrogate2(ch)   ((static_cast<unsigned long>(ch) - 0x10000) % 0x400 + 0xDC00)
+#define Uni_UTF32ToSurrogate2(ch)   ((static_cast<tools::ULong>(ch) - 0x10000) % 0x400 + 0xDC00)
 #define Uni_SupplementaryPlanesStart    0x10000
 
 static void UpdateFrameGeometry( HWND hWnd, WinSalFrame* pFrame );
@@ -160,10 +160,10 @@ static void ImplSaveFrameState( WinSalFrame* pFrame )
                 RECT aRect2 = aRect;
                 AdjustWindowRectEx( &aRect2, GetWindowStyle( pFrame->mhWnd ),
                                     FALSE,  GetWindowExStyle( pFrame->mhWnd ) );
-                long nTopDeco = abs( aRect.top - aRect2.top );
-                long nLeftDeco = abs( aRect.left - aRect2.left );
-                long nBottomDeco = abs( aRect.bottom - aRect2.bottom );
-                long nRightDeco = abs( aRect.right - aRect2.right );
+                tools::Long nTopDeco = abs( aRect.top - aRect2.top );
+                tools::Long nLeftDeco = abs( aRect.left - aRect2.left );
+                tools::Long nBottomDeco = abs( aRect.bottom - aRect2.bottom );
+                tools::Long nRightDeco = abs( aRect.right - aRect2.right );
 
                 pFrame->maState.mnX      = aRect.left + nLeftDeco;
                 pFrame->maState.mnY      = aRect.top + nTopDeco;
@@ -180,10 +180,10 @@ static void ImplSaveFrameState( WinSalFrame* pFrame )
             RECT aRect2 = aRect;
             AdjustWindowRectEx( &aRect2, GetWindowStyle( pFrame->mhWnd ),
                             FALSE,     GetWindowExStyle( pFrame->mhWnd ) );
-            long nTopDeco = abs( aRect.top - aRect2.top );
-            long nLeftDeco = abs( aRect.left - aRect2.left );
-            long nBottomDeco = abs( aRect.bottom - aRect2.bottom );
-            long nRightDeco = abs( aRect.right - aRect2.right );
+            tools::Long nTopDeco = abs( aRect.top - aRect2.top );
+            tools::Long nLeftDeco = abs( aRect.left - aRect2.left );
+            tools::Long nBottomDeco = abs( aRect.bottom - aRect2.bottom );
+            tools::Long nRightDeco = abs( aRect.right - aRect2.right );
 
             pFrame->maState.mnState &= ~WindowStateState(WindowStateState::Minimized | WindowStateState::Maximized);
             // subtract decoration
@@ -2578,7 +2578,7 @@ static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW& rLogFont, vcl::Fon
     }
 }
 
-static long ImplW2I( const wchar_t* pStr )
+static tools::Long ImplW2I( const wchar_t* pStr )
 {
     long    n = 0;
     int     nSign = 1;
@@ -2607,8 +2607,8 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
     aMouseSettings.SetDoubleClickTime( GetDoubleClickTime() );
     aMouseSettings.SetDoubleClickWidth( GetSystemMetrics( SM_CXDOUBLECLK ) );
     aMouseSettings.SetDoubleClickHeight( GetSystemMetrics( SM_CYDOUBLECLK ) );
-    long nDragWidth = GetSystemMetrics( SM_CXDRAG );
-    long nDragHeight = GetSystemMetrics( SM_CYDRAG );
+    tools::Long nDragWidth = GetSystemMetrics( SM_CXDRAG );
+    tools::Long nDragHeight = GetSystemMetrics( SM_CYDRAG );
     if ( nDragWidth )
         aMouseSettings.SetStartDragWidth( nDragWidth );
     if ( nDragHeight )