[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/scroll-accel-vcl.diff |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 6e821b7ecefb31af771fc33eada694d3099f9abb
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Sat Jun 20 11:39:01 2009 -0400

    A minor tweak to prevent unnecessary timer re-start.
    
    * patches/dev300/scroll-accel-vcl.diff:

diff --git a/patches/dev300/scroll-accel-vcl.diff b/patches/dev300/scroll-accel-vcl.diff
index f22d4a9..b58f462 100644
--- a/patches/dev300/scroll-accel-vcl.diff
+++ b/patches/dev300/scroll-accel-vcl.diff
@@ -71,28 +71,31 @@ diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=vcl.vpj vcl.clean/sourc
      aWTimer.Start();
      if ( eSelMode != SINGLE_SELECTION )
      {
-@@ -488,3 +490,24 @@ void SelectionEngine::Command( const CommandEvent& rCEvt )
+@@ -488,3 +490,27 @@ void SelectionEngine::Command( const CommandEvent& rCEvt )
              nFlags &= ~SELENG_CMDEVT;
      }
  }
 +
 +void SelectionEngine::SetUpdateInterval( ULONG nInterval )
 +{
++    if (nInterval < SELENG_AUTOREPEAT_INTERVAL_MIN)
++        // Set a lower threshold.  On Windows, setting this value too low
++        // would cause selection to get updated indefinitely.
++        nInterval = SELENG_AUTOREPEAT_INTERVAL_MIN;
++
 +    if (nUpdateInterval == nInterval)
 +        // no update needed.
 +        return;
 +
-+    nUpdateInterval = nInterval;
-+    if (nUpdateInterval < SELENG_AUTOREPEAT_INTERVAL_MIN)
-+        // Set a lower threshold.  On Windows, setting this value too low
-+        // would cause selection to get updated indefinitely.
-+        nUpdateInterval = SELENG_AUTOREPEAT_INTERVAL_MIN;
-+
 +    if (aWTimer.IsActive())
 +    {
 +        // reset the timer right away on interval change.
 +        aWTimer.Stop();
-+        aWTimer.SetTimeout(nUpdateInterval);
++        aWTimer.SetTimeout(nInterval);
 +        aWTimer.Start();
 +    }
++    else
++        aWTimer.SetTimeout(nInterval);
++
++    nUpdateInterval = nInterval;
 +}