diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-07 15:42:59 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-07 15:42:59 +0200 |
| commit | 71fefe1dc2bcda3a4cc18d71e1acaf161cc059f2 (patch) | |
| tree | 23052830d85c8ba9ad4862adf77aa31086573f93 /include/svx/sdr | |
| parent | 52ae345470d8fa657817cf87b3e8e8c1b51bd7da (diff) | |
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
Diffstat (limited to 'include/svx/sdr')
| -rw-r--r-- | include/svx/sdr/overlay/overlayanimatedbitmapex.hxx | 2 | ||||
| -rw-r--r-- | include/svx/sdr/overlay/overlayobject.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx index b14f01bfac62..ccd768ff8816 100644 --- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx @@ -61,7 +61,7 @@ namespace sdr const basegfx::B2DPoint& rBasePos, const BitmapEx& rBitmapEx1, const BitmapEx& rBitmapEx2, - sal_uInt32 nBlinkTime = 500, + sal_uInt64 nBlinkTime = 500, sal_uInt16 nCenX1 = 0, sal_uInt16 nCenY1 = 0, sal_uInt16 nCenX2 = 0, diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx index b663ec5255ca..7e97abc34ad0 100644 --- a/include/svx/sdr/overlay/overlayobject.hxx +++ b/include/svx/sdr/overlay/overlayobject.hxx @@ -86,7 +86,7 @@ namespace sdr virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); // #i53216# check blink time value range (currently 25 < mnBlinkTime < 10000) - sal_uInt32 impCheckBlinkTimeValueRange(sal_uInt32 nBlinkTime) const; + sal_uInt32 impCheckBlinkTimeValueRange(sal_uInt64 nBlinkTime) const; // region in logical coordinates basegfx::B2DRange maBaseRange; |