[Libreoffice-commits] .: binfilter/inc

[Joseph Powers]

 binfilter/inc/bf_sc/refreshtimer.hxx |  171 +++++++++++++++--------------------
 1 file changed, 76 insertions(+), 95 deletions(-)

New commits:
commit e526dc881cb191ac605c1dd372771062806f505c
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Mon Nov 29 20:47:16 2010 -0800

    Dead code removal

diff --git a/binfilter/inc/bf_sc/refreshtimer.hxx b/binfilter/inc/bf_sc/refreshtimer.hxx
index f10d789..5618fb4 100644
--- a/binfilter/inc/bf_sc/refreshtimer.hxx
+++ b/binfilter/inc/bf_sc/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
@@ -33,123 +33,104 @@
 #include <osl/mutex.hxx>
 namespace binfilter {
 
-#define SC_REFRESHTIMER_CONTROL_LIST 0
-#if SC_REFRESHTIMER_CONTROL_LIST
-class ScRefreshTimer;
-DECLARE_LIST( ScRefreshTimerList, ScRefreshTimer* )
-#endif
-
+//=============================================================================
 class ScRefreshTimerControl
 {
 private:
-            ::osl::Mutex		aMutex;
-            USHORT				nBlockRefresh;
+    ::osl::Mutex    aMutex;
+    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(); }
-
-    virtual	void				SetRefreshDelay( ULONG nSeconds );
+    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(); }
+
+    virtual	void SetRefreshDelay( ULONG nSeconds );
 };