[Libreoffice-commits] .: 2 commits - vcl/source vcl/win

[Tor Lillqvist]

 vcl/source/window/scrwnd.cxx   |    2 +-
 vcl/win/source/app/salinst.cxx |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2022a19131c84a48be95f9b0e1cb6d1d9feca104
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jan 24 01:18:19 2011 +0200

    Make parameters to Max() match in type

diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index 3ebdfc9..f5369e8 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -399,7 +399,7 @@ IMPL_LINK( ImplWheelWindow, ImplScrollHdl, Timer*, EMPTYARG )
             pWindow->Command( aCEvt );
             if( aDel.IsDead() )
                 return 0;
-            mnRepaintTime = Max( Time::GetSystemTicks() - nTime, 1UL );
+            mnRepaintTime = Max( Time::GetSystemTicks() - nTime, (ULONG)1 );
             ImplRecalcScrollValues();
         }
     }
commit 8a896db6763b4d55084b424e193ef3eff39f011a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jan 24 01:17:28 2011 +0200

    Hide ULONG while including more Win32 headers

diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 01c0b37..0f6b244 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -68,10 +68,12 @@
 #pragma warning( disable: 4917 )
 #endif
 
+#define ULONG WIN_ULONG
 #include <GdiPlus.h>
 #include <GdiPlusEnums.h>
 #include <GdiPlusColor.h>
 #include <Shlobj.h>
+#undef ULONG
 
 #if defined _MSC_VER
 #pragma warning(pop)