diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-27 12:26:38 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-27 13:32:53 +0100 |
| commit | 81047eaebc0e25ff926bf944c57e082a8727c7f2 (patch) | |
| tree | aa7d706ce0ed855c00e31a711c5c762b9bf62a0e /slideshow | |
| parent | ae11dafc89a1f748233500ea0fd89cff4ef7378c (diff) | |
make animation loop sal_uInt32 consistently
all this foo is ultimately animated gifs and the count there is
limited to unsigned 16bit
Change-Id: Ib6e6dde7355f3619bb7735743e686e6338a235ee
Diffstat (limited to 'slideshow')
5 files changed, 7 insertions, 7 deletions
diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx index 7fb7cc225667..924727577e01 100644 --- a/slideshow/source/engine/shapes/drawshape.hxx +++ b/slideshow/source/engine/shapes/drawshape.hxx @@ -337,7 +337,7 @@ namespace slideshow int mnIsAnimatedCount; /// Number of times the bitmap animation shall loop - ::std::size_t mnAnimationLoopCount; + sal_uInt32 mnAnimationLoopCount; /// Whether shape is visible (without attribute layers) bool mbIsVisible; diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index 5cdd8d0095ed..3d7e643dfb7b 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -263,7 +263,7 @@ sal_Int32 getNextActionOffset( MetaAction * pCurrAct ) } bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, - ::std::size_t& o_rLoopCount, + sal_uInt32& o_rLoopCount, const Graphic& rGraphic ) { o_rFrames.clear(); diff --git a/slideshow/source/engine/shapes/gdimtftools.hxx b/slideshow/source/engine/shapes/gdimtftools.hxx index 861d3528ffa8..ac3989772e2f 100644 --- a/slideshow/source/engine/shapes/gdimtftools.hxx +++ b/slideshow/source/engine/shapes/gdimtftools.hxx @@ -112,9 +112,9 @@ namespace slideshow @param rGraphic Input graphic object, to extract animations from */ - bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames, - ::std::size_t& o_rLoopCount, - const Graphic& rGraphic ); + bool getAnimationFromGraphic(VectorOfMtfAnimationFrames& o_rFrames, + sal_uInt32& o_rLoopCount, + const Graphic& rGraphic); /** Retrieve scroll text animation rectangles from given metafile diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx index 15aca7471c0f..04016826e110 100644 --- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx +++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx @@ -237,7 +237,7 @@ namespace slideshow const DrawShapeSharedPtr& rDrawShape, const WakeupEventSharedPtr& rWakeupEvent, const ::std::vector<double>& rTimeouts, - ::std::size_t nNumLoops ) + sal_uInt32 nNumLoops) { return ActivitySharedPtr( new IntrinsicAnimationActivity(rContext, diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx index 628a458cb728..c19c393a498d 100644 --- a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx +++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx @@ -60,7 +60,7 @@ namespace slideshow const DrawShapeSharedPtr& rDrawShape, const WakeupEventSharedPtr& rWakeupEvent, const ::std::vector<double>& rTimeouts, - ::std::size_t nNumLoops ); + sal_uInt32 nNumLoops); } } |