[Libreoffice-commits] .: sc/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Mon Nov 29 20:46:45 PST 2010
sc/inc/refreshtimer.hxx | 170 ++++++++++++++++++++----------------------------
1 file changed, 74 insertions(+), 96 deletions(-)
New commits:
commit 6a4ecce78d43d378de9d01b32ba19af20cf9006b
Author: Joseph Powers <jpowers27 at cox.net>
Date: Mon Nov 29 20:46:38 2010 -0800
Dead Code Removal
diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index 6b735f8..1954dfd 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -34,12 +34,7 @@
#include <osl/mutex.hxx>
#include <scdllapi.h>
-#define SC_REFRESHTIMER_CONTROL_LIST 0
-#if SC_REFRESHTIMER_CONTROL_LIST
-class ScRefreshTimer;
-DECLARE_LIST( ScRefreshTimerList, ScRefreshTimer* )
-#endif
-
+//=============================================================================
class ScRefreshTimerControl
{
private:
@@ -47,111 +42,94 @@ private:
USHORT nBlockRefresh;
public:
-#if SC_REFRESHTIMER_CONTROL_LIST
- ScRefreshTimerList aList;
-#endif
-
- ScRefreshTimerControl() : nBlockRefresh(0) {}
-
- void SetAllowRefresh( BOOL b )
- {
- if ( b && nBlockRefresh )
- --nBlockRefresh;
- else if ( !b && nBlockRefresh < (USHORT)(~0) )
- ++nBlockRefresh;
- }
- BOOL IsRefreshAllowed() const { return !nBlockRefresh; }
- ::osl::Mutex& GetMutex() { return aMutex; }
-};
+ ScRefreshTimerControl() : nBlockRefresh(0) {}
+ void SetAllowRefresh( BOOL b ) {
+ if ( b && nBlockRefresh )
+ --nBlockRefresh;
+ else if ( !b && nBlockRefresh < (USHORT)(~0) )
+ ++nBlockRefresh;
+ }
+
+ BOOL IsRefreshAllowed() const { return !nBlockRefresh; }
+
+ ::osl::Mutex& GetMutex() { return aMutex; }
+};
+//=============================================================================
class ScRefreshTimerProtector
{
private:
ScRefreshTimerControl * const * ppControl;
+
public:
- ScRefreshTimerProtector( ScRefreshTimerControl * const * pp );
- ~ScRefreshTimerProtector()
- {
- if ( ppControl && *ppControl )
- (*ppControl)->SetAllowRefresh( TRUE );
- }
-};
+ ScRefreshTimerProtector( ScRefreshTimerControl * const * pp );
+
+ ~ScRefreshTimerProtector() {
+ if ( ppControl && *ppControl )
+ (*ppControl)->SetAllowRefresh( TRUE );
+ }
+}
+//=============================================================================
class ScRefreshTimer : public AutoTimer
{
private:
ScRefreshTimerControl * const * ppControl;
- void AppendToControl()
- {
-#if SC_REFRESHTIMER_CONTROL_LIST
- if ( ppControl && *ppControl )
- (*ppControl)->aList.Insert( this, LIST_APPEND );
-#endif
- }
- void RemoveFromControl()
- {
-#if SC_REFRESHTIMER_CONTROL_LIST
- if ( ppControl && *ppControl )
- (*ppControl)->aList.Remove( this );
-#endif
- }
-
- void Start()
- {
- if ( GetTimeout() )
- AutoTimer::Start();
- }
+ void AppendToControl() {
+ }
+
+ void RemoveFromControl() {
+ }
+
+ void Start() {
+ if ( GetTimeout() )
+ AutoTimer::Start();
+ }
public:
- ScRefreshTimer() : ppControl(0)
- { SetTimeout( 0 ); }
- ScRefreshTimer( ULONG nSeconds ) : ppControl(0)
- {
- SetTimeout( nSeconds * 1000 );
- Start();
- }
- ScRefreshTimer( const ScRefreshTimer& r )
- : AutoTimer( r ), ppControl(0)
- {}
- virtual ~ScRefreshTimer();
-
- ScRefreshTimer& operator=( const ScRefreshTimer& r )
- {
- SetRefreshControl(0);
- AutoTimer::operator=( r );
- return *this;
- }
-
- BOOL operator==( const ScRefreshTimer& r ) const
- { return GetTimeout() == r.GetTimeout(); }
-
- BOOL operator!=( const ScRefreshTimer& r ) const
- { return !ScRefreshTimer::operator==( r ); }
-
- void StartRefreshTimer()
- { Start(); }
-
- void SetRefreshControl( ScRefreshTimerControl * const * pp )
- {
- RemoveFromControl();
- ppControl = pp;
- AppendToControl();
- }
-
- void SetRefreshHandler( const Link& rLink )
- { SetTimeoutHdl( rLink ); }
-
- ULONG GetRefreshDelay() const
- { return GetTimeout() / 1000; }
-
- void StopRefreshTimer()
- { Stop(); }
-
- SC_DLLPUBLIC virtual void SetRefreshDelay( ULONG nSeconds );
- SC_DLLPUBLIC virtual void Timeout();
+ ScRefreshTimer() : ppControl(0) { SetTimeout( 0 ); }
+
+ ScRefreshTimer( ULONG nSeconds ) : ppControl(0) {
+ SetTimeout( nSeconds * 1000 );
+ Start();
+ }
+
+ ScRefreshTimer( const ScRefreshTimer& r ) : AutoTimer( r ), ppControl(0) {}
+
+ virtual ~ScRefreshTimer();
+
+ ScRefreshTimer& operator=( const ScRefreshTimer& r ) {
+ SetRefreshControl(0);
+ AutoTimer::operator=( r );
+ return *this;
+ }
+
+ BOOL operator==( const ScRefreshTimer& r ) const
+ { return GetTimeout() == r.GetTimeout(); }
+
+ BOOL operator!=( const ScRefreshTimer& r ) const
+ { return !ScRefreshTimer::operator==( r ); }
+
+ void StartRefreshTimer() { Start(); }
+
+ void SetRefreshControl( ScRefreshTimerControl * const * pp ) {
+ RemoveFromControl();
+ ppControl = pp;
+ AppendToControl();
+ }
+
+ void SetRefreshHandler( const Link& rLink ) { SetTimeoutHdl( rLink ); }
+
+ ULONG GetRefreshDelay() const { return GetTimeout() / 1000; }
+
+ void StopRefreshTimer() { Stop(); }
+
+ SC_DLLPUBLIC virtual void SetRefreshDelay( ULONG nSeconds );
+
+ SC_DLLPUBLIC virtual void Timeout();
};
More information about the Libreoffice-commits
mailing list