Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

1 files changed, 10 insertions, 10 deletions

diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index 99a3f512cbc4..9ded9478731f 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -37,20 +37,20 @@ class ScRefreshTimerControl
 {
 private:
     ::osl::Mutex   aMutex;
-    USHORT         nBlockRefresh;
+    sal_uInt16         nBlockRefresh;
 
 public:
     ScRefreshTimerControl() : nBlockRefresh(0) {}
 
-    void SetAllowRefresh( BOOL b )
+    void SetAllowRefresh( sal_Bool b )
     {
         if ( b && nBlockRefresh )
             --nBlockRefresh;
-        else if ( !b && nBlockRefresh < (USHORT)(~0) )
+        else if ( !b && nBlockRefresh < (sal_uInt16)(~0) )
             ++nBlockRefresh;
     }
 
-    BOOL IsRefreshAllowed() const { return !nBlockRefresh; }
+    sal_Bool IsRefreshAllowed() const { return !nBlockRefresh; }
 
     ::osl::Mutex& GetMutex() { return aMutex; }
 };
@@ -66,7 +66,7 @@ public:
     ~ScRefreshTimerProtector()
     {
         if ( ppControl && *ppControl )
-            (*ppControl)->SetAllowRefresh( TRUE );
+            (*ppControl)->SetAllowRefresh( true );
     }
 };
 
@@ -88,7 +88,7 @@ private:
 public:
     ScRefreshTimer() : ppControl(0) { SetTimeout( 0 ); }
 
-    ScRefreshTimer( ULONG nSeconds ) : ppControl(0)
+    ScRefreshTimer( sal_uLong nSeconds ) : ppControl(0)
     {
         SetTimeout( nSeconds * 1000 );
         Start();
@@ -105,10 +105,10 @@ public:
         return *this;
     }
 
-    BOOL operator==( const ScRefreshTimer& r ) const
+    sal_Bool operator==( const ScRefreshTimer& r ) const
         { return GetTimeout() == r.GetTimeout(); }
 
-    BOOL operator!=( const ScRefreshTimer& r ) const
+    sal_Bool operator!=( const ScRefreshTimer& r ) const
         { return !ScRefreshTimer::operator==( r ); }
 
     void StartRefreshTimer() { Start(); }
@@ -122,11 +122,11 @@ public:
 
     void SetRefreshHandler( const Link& rLink ) { SetTimeoutHdl( rLink ); }
 
-    ULONG GetRefreshDelay() const { return GetTimeout() / 1000; }
+    sal_uLong GetRefreshDelay() const { return GetTimeout() / 1000; }
 
     void StopRefreshTimer() { Stop(); }
 
-    SC_DLLPUBLIC virtual void SetRefreshDelay( ULONG nSeconds );
+    SC_DLLPUBLIC virtual void SetRefreshDelay( sal_uLong nSeconds );
 
     SC_DLLPUBLIC virtual void Timeout();
 };