summaryrefslogtreecommitdiff
path: root/sd/source
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 /sd/source
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 'sd/source')
-rw-r--r--sd/source/ui/dlg/animobjs.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 4388395321d9..2ef96aa2de1c 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/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;