Change "blink times" to be of type sal_uInt64

...and thus consistent with Timer::Get/SetTimeout since
9c7016b5b530ca212b1275f44f9e2fc0527109ee "Scheduler: Changed uLong to
uInt32/uInt64."  Otherwise, at least JunitTest_forms_unoapi on 32-bit Linux
would stay busy forever in vcl::Cursor::ImplTimerHdl, alternating among
ImplRestore() and ImplDraw().

Change-Id: Ic3fd349344c105078b52749ca85559fce485d0c4

5 files changed, 8 insertions, 14 deletions

diff --git a/svx/inc/sdr/overlay/overlayrectangle.hxx b/svx/inc/sdr/overlay/overlayrectangle.hxx
index 8879fdf52ec4..8be8a36ea263 100644
--- a/svx/inc/sdr/overlay/overlayrectangle.hxx
+++ b/svx/inc/sdr/overlay/overlayrectangle.hxx
@@ -56,7 +56,7 @@ namespace sdr
                 double fDiscreteGrow,
                 double fDiscreteShrink,
                 double fRotation,
-                sal_uInt32 nBlinkTime,
+                sal_uInt64 nBlinkTime,
                 bool bAnimate);
 
             // data read access
diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
index ea717f48529d..bc26abeefab4 100644
--- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
+++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx
@@ -63,7 +63,7 @@ namespace sdr
             const basegfx::B2DPoint& rBasePos,
             const BitmapEx& rBitmapEx1,
             const BitmapEx& rBitmapEx2,
-            sal_uInt32 nBlinkTime,
+            sal_uInt64 nBlinkTime,
             sal_uInt16 nCenX1,
             sal_uInt16 nCenY1,
             sal_uInt16 nCenX2,
@@ -75,16 +75,13 @@ namespace sdr
             maBitmapEx2(rBitmapEx2),
             mnCenterX1(nCenX1), mnCenterY1(nCenY1),
             mnCenterX2(nCenX2), mnCenterY2(nCenY2),
-            mnBlinkTime(nBlinkTime),
+            mnBlinkTime(impCheckBlinkTimeValueRange(nBlinkTime)),
             mfShearX(fShearX),
             mfRotation(fRotation),
             mbOverlayState(false)
         {
             // set AllowsAnimation flag to mark this object as animation capable
             mbAllowsAnimation = true;
-
-            // #i53216# check blink time value range
-            mnBlinkTime = impCheckBlinkTimeValueRange(mnBlinkTime);
         }
 
         OverlayAnimatedBitmapEx::~OverlayAnimatedBitmapEx()
diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx
index 8a5c53cdd0f4..1a8eeb0d42b9 100644
--- a/svx/source/sdr/overlay/overlayobject.cxx
+++ b/svx/source/sdr/overlay/overlayobject.cxx
@@ -63,7 +63,7 @@ namespace sdr
             return drawinglayer::primitive2d::Primitive2DSequence();
         }
 
-        sal_uInt32 OverlayObject::impCheckBlinkTimeValueRange(sal_uInt32 nBlinkTime) const
+        sal_uInt32 OverlayObject::impCheckBlinkTimeValueRange(sal_uInt64 nBlinkTime) const
         {
             if(nBlinkTime < 25)
             {
diff --git a/svx/source/sdr/overlay/overlayrectangle.cxx b/svx/source/sdr/overlay/overlayrectangle.cxx
index 0f1f6b68e245..92932f50af51 100644
--- a/svx/source/sdr/overlay/overlayrectangle.cxx
+++ b/svx/source/sdr/overlay/overlayrectangle.cxx
@@ -71,7 +71,7 @@ namespace sdr
             double fDiscreteGrow,
             double fDiscreteShrink,
             double fRotation,
-            sal_uInt32 nBlinkTime,
+            sal_uInt64 nBlinkTime,
             bool bAnimate)
         :   OverlayObjectWithBasePosition(rBasePosition, rHatchColor),
             maSecondPosition(rSecondPosition),
@@ -79,7 +79,7 @@ namespace sdr
             mfDiscreteGrow(fDiscreteGrow),
             mfDiscreteShrink(fDiscreteShrink),
             mfRotation(fRotation),
-            mnBlinkTime(nBlinkTime),
+            mnBlinkTime(impCheckBlinkTimeValueRange(nBlinkTime)),
             mbOverlayState(false)
         {
             if(Application::GetSettings().GetStyleSettings().GetHighContrastMode())
@@ -90,9 +90,6 @@ namespace sdr
 
             // set AllowsAnimation flag to mark this object as animation capable
             mbAllowsAnimation = bAnimate;
-
-            // #i53216# check blink time value range
-            mnBlinkTime = impCheckBlinkTimeValueRange(mnBlinkTime);
         }
 
         void OverlayRectangle::Trigger(sal_uInt32 nTime)
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index eb26d567af7f..d6248ff9cb45 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -759,7 +759,7 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
 
         // #i53216# Use system cursor blink time. Use the unsigned value.
         const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
-        const sal_uInt32 nBlinkTime((sal_uInt32)rStyleSettings.GetCursorBlinkTime());
+        const sal_uInt64 nBlinkTime(rStyleSettings.GetCursorBlinkTime());
 
         if(eKindOfMarker == Anchor || eKindOfMarker == AnchorPressed)
         {
@@ -2339,7 +2339,7 @@ void SdrCropHdl::CreateB2dIAObject()
 
                         BitmapEx aBmpEx2( GetBitmapForHandle( aHandlesBitmap, nHdlSize + 1 ) );
 
-                        const sal_uInt32 nBlinkTime = sal::static_int_cast<sal_uInt32>(rStyleSettings.GetCursorBlinkTime());
+                        const sal_uInt64 nBlinkTime = rStyleSettings.GetCursorBlinkTime();
 
                         pOverlayObject = new ::sdr::overlay::OverlayAnimatedBitmapEx(
                             aPosition,