summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-07-27 12:26:38 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-07-27 13:32:53 +0100
commit81047eaebc0e25ff926bf944c57e082a8727c7f2 (patch)
treeaa7d706ce0ed855c00e31a711c5c762b9bf62a0e /include
parentae11dafc89a1f748233500ea0fd89cff4ef7378c (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 'include')
-rw-r--r--include/svtools/grfmgr.hxx2
-rw-r--r--include/vcl/animate.hxx8
-rw-r--r--include/vcl/graph.hxx2
3 files changed, 6 insertions, 6 deletions
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index a6339128c479..4edde4dcb503 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -186,7 +186,7 @@ private:
OUString maUserData;
std::unique_ptr<Timer> mxSwapOutTimer;
std::unique_ptr<GrfSimpleCacheObj> mxSimpleCache;
- sal_uLong mnAnimationLoopCount;
+ sal_uInt32 mnAnimationLoopCount;
// a unique increasing ID to be able to say which data change is older
sal_uLong mnDataChangeTimeStamp;
diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index 119499629d36..bb8cc968c3ac 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -118,8 +118,8 @@ public:
const BitmapEx& GetBitmapEx() const { return maBitmapEx; }
void SetBitmapEx( const BitmapEx& rBmpEx ) { maBitmapEx = rBmpEx; }
- sal_uLong GetLoopCount() const { return mnLoopCount; }
- void SetLoopCount( const sal_uLong nLoopCount );
+ sal_uInt32 GetLoopCount() const { return mnLoopCount; }
+ void SetLoopCount(const sal_uInt32 nLoopCount);
void ResetLoopCount();
void SetNotifyHdl( const Link<Animation*,void>& rLink ) { maNotifyLink = rLink; }
@@ -176,8 +176,8 @@ private:
BitmapEx maBitmapEx;
Timer maTimer;
Size maGlobalSize;
- long mnLoopCount;
- long mnLoops;
+ sal_uInt32 mnLoopCount;
+ sal_uInt32 mnLoops;
size_t mnPos;
bool mbIsInAnimation;
bool mbLoopTerminated;
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 39fd594e878e..626b11bcddca 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -187,7 +187,7 @@ public:
void SetAnimationNotifyHdl( const Link<Animation*,void>& rLink );
Link<Animation*,void> GetAnimationNotifyHdl() const;
- sal_uLong GetAnimationLoopCount() const;
+ sal_uInt32 GetAnimationLoopCount() const;
BitmapChecksum GetChecksum() const;