[Libreoffice-commits] core.git: sc/inc sc/source

Markus Mohrhard markus.mohrhard at googlemail.com
Mon Mar 9 06:17:10 PDT 2015


 sc/inc/refreshtimer.hxx              |    2 +-
 sc/source/core/tool/refreshtimer.cxx |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 958e3cd958b53acb30b0070f76c8d6a1f12165c9
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Mar 9 13:33:39 2015 +0100

    correct fix for the linking problem
    
    Change-Id: Idecead242c71c89cddb166cce36fa41f912298d0

diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index a87686b..cbc8e5c 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -59,7 +59,7 @@ public:
     SC_DLLPUBLIC virtual void Invoke() SAL_OVERRIDE;
 
 private:
-    SC_DLLPUBLIC virtual void Start() SAL_OVERRIDE;
+    void Launch();
 };
 
 #endif // INCLUDED_SC_INC_REFRESHTIMER_HXX
diff --git a/sc/source/core/tool/refreshtimer.cxx b/sc/source/core/tool/refreshtimer.cxx
index 9141e46..1dab3d6 100644
--- a/sc/source/core/tool/refreshtimer.cxx
+++ b/sc/source/core/tool/refreshtimer.cxx
@@ -54,7 +54,7 @@ ScRefreshTimer::ScRefreshTimer() : ppControl(0)
 ScRefreshTimer::ScRefreshTimer( sal_uLong nSeconds ) : ppControl(0)
 {
     SetTimeout( nSeconds * 1000 );
-    Start();
+    Launch();
 }
 
 ScRefreshTimer::ScRefreshTimer( const ScRefreshTimer& r ) : AutoTimer( r ), ppControl(0)
@@ -111,7 +111,7 @@ void ScRefreshTimer::SetRefreshDelay( sal_uLong nSeconds )
         Stop();
     SetTimeout( nSeconds * 1000 );
     if ( !bActive && nSeconds )
-        Start();
+        Launch();
 }
 
 void ScRefreshTimer::Invoke()
@@ -124,11 +124,11 @@ void ScRefreshTimer::Invoke()
         // restart from now on, don't execute immediately again if timed out
         // a second time during refresh
         if ( IsActive() )
-            Start();
+            Launch();
     }
 }
 
-void ScRefreshTimer::Start()
+void ScRefreshTimer::Launch()
 {
     if ( GetTimeout() )
         AutoTimer::Start();


More information about the Libreoffice-commits mailing list