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

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;

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;

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;
 

sd/source/ui/dlg/animobjs.cxx

@@ -744,7 +744,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
                         // LoopCount
                         if( i == 0 )
                         {
-                            long nLoopCount = aAnimation.GetLoopCount();
+                            sal_uInt32 nLoopCount = aAnimation.GetLoopCount();
 
                             if( !nLoopCount ) // endless
                                 m_pLbLoopCount->SelectEntryPos( m_pLbLoopCount->GetEntryCount() - 1);
@@ -980,11 +980,11 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
 
             // find LoopCount (number of passes)
             AnimationBitmap aAnimBmp;
-            long            nLoopCount = 0L;
-            sal_Int32          nPos = m_pLbLoopCount->GetSelectEntryPos();
+            sal_uInt32 nLoopCount = 0;
+            sal_Int32 nPos = m_pLbLoopCount->GetSelectEntryPos();
 
             if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != m_pLbLoopCount->GetEntryCount() - 1 ) // endless
-                nLoopCount = (long) m_pLbLoopCount->GetSelectEntry().toInt32();
+                nLoopCount = m_pLbLoopCount->GetSelectEntry().toUInt32();
 
             aAnimBmp.aBmpEx = *pBitmapEx;
             aAnimBmp.aPosPix = aPt;

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;

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();

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
 

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,

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);
     }
 }
 

vcl/inc/impgraph.hxx

@@ -115,7 +115,7 @@ private:
     void                ImplSetAnimationNotifyHdl( const Link<Animation*,void>& rLink );
     Link<Animation*,void> ImplGetAnimationNotifyHdl() const;
 
-    sal_uLong           ImplGetAnimationLoopCount() const;
+    sal_uInt32          ImplGetAnimationLoopCount() const;
 
 private:
 

vcl/source/gdi/animate.cxx

@@ -510,7 +510,7 @@ void Animation::Replace( const AnimationBitmap& rNewAnimationBitmap, sal_uInt16
     }
 }
 
-void Animation::SetLoopCount( const sal_uLong nLoopCount )
+void Animation::SetLoopCount(const sal_uInt32 nLoopCount)
 {
     mnLoopCount = nLoopCount;
     ResetLoopCount();
@@ -767,7 +767,7 @@ SvStream& ReadAnimation( SvStream& rIStm, Animation& rAnimation )
             rIStm.ReadUInt16( nTmp16 ); aAnimBmp.nWait = ( ( 65535 == nTmp16 ) ? ANIMATION_TIMEOUT_ON_CLICK : nTmp16 );
             rIStm.ReadUInt16( nTmp16 ); aAnimBmp.eDisposal = ( Disposal) nTmp16;
             rIStm.ReadCharAsBool( cTmp ); aAnimBmp.bUserInput = cTmp;
-            rIStm.ReadUInt32( nTmp32 ); rAnimation.mnLoopCount = (sal_uInt16) nTmp32;
+            rIStm.ReadUInt32( rAnimation.mnLoopCount );
             rIStm.ReadUInt32( nTmp32 ); // Unused
             rIStm.ReadUInt32( nTmp32 ); // Unused
             rIStm.ReadUInt32( nTmp32 ); // Unused

vcl/source/gdi/graph.cxx

@@ -484,7 +484,7 @@ Link<Animation*,void> Graphic::GetAnimationNotifyHdl() const
     return mxImpGraphic->ImplGetAnimationNotifyHdl();
 }
 
-sal_uLong Graphic::GetAnimationLoopCount() const
+sal_uInt32 Graphic::GetAnimationLoopCount() const
 {
     return mxImpGraphic->ImplGetAnimationLoopCount();
 }

vcl/source/gdi/impgraph.cxx

@@ -947,12 +947,11 @@ Link<Animation*,void> ImpGraphic::ImplGetAnimationNotifyHdl() const
     return aLink;
 }
 
-sal_uLong ImpGraphic::ImplGetAnimationLoopCount() const
+sal_uInt32 ImpGraphic::ImplGetAnimationLoopCount() const
 {
-    return( mpAnimation ? mpAnimation->GetLoopCount() : 0UL );
+    return( mpAnimation ? mpAnimation->GetLoopCount() : 0 );
 }
 
-
 void ImpGraphic::ImplSetContext( const std::shared_ptr<GraphicReader>& pReader )
 {
     mpContext = pReader;