diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-04-27 23:08:01 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2019-04-28 05:31:16 +0200 |
| commit | 6bcc4cb109b4ab6ec194a04c53cf1d545a7a7dfd (patch) | |
| tree | c89f80ddca6eb9dc4c118478e873bc46b7584f6c /sd | |
| parent | 9afa666120d8bb045f3569a77475a58c368c03a1 (diff) | |
prefix member variables of AnimationBitmap
Change-Id: Ic84773399c95d61f843e4388fe01d00cd4facc5a
Reviewed-on: https://gerrit.libreoffice.org/71425
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/animobjs.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 8b26299b78ad..fd57e3f4cc14 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -723,7 +723,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) for( sal_uInt16 i = 0; i < nCount; i++ ) { - const AnimationBitmap& rAnimBmp = aAnimation.Get( i ); + const AnimationBitmap& rAnimationBitmap = aAnimation.Get( i ); // LoopCount if( i == 0 ) @@ -736,12 +736,12 @@ void AnimationWindow::AddObj (::sd::View& rView ) m_pLbLoopCount->SelectEntry(OUString::number( nLoopCount ) ); } - long nTime = rAnimBmp.nWait; + long nTime = rAnimationBitmap.mnWait; ::tools::Time aTime( 0, 0, nTime / 100, nTime % 100 ); size_t nIndex = m_nCurrentFrame + 1; m_FrameList.insert( m_FrameList.begin() + nIndex, - ::std::make_pair(rAnimBmp.aBmpEx, aTime)); + ::std::make_pair(rAnimationBitmap.maBitmapEx, aTime)); // increment => next one inserted after this one ++m_nCurrentFrame; @@ -958,21 +958,21 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) } // find LoopCount (number of passes) - AnimationBitmap aAnimBmp; + AnimationBitmap aAnimationBitmap; sal_uInt32 nLoopCount = 0; sal_Int32 nPos = m_pLbLoopCount->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != m_pLbLoopCount->GetEntryCount() - 1 ) // endless nLoopCount = m_pLbLoopCount->GetSelectedEntry().toUInt32(); - aAnimBmp.aBmpEx = rBitmapEx; - aAnimBmp.aPosPix = aPt; - aAnimBmp.aSizePix = aBitmapSize; - aAnimBmp.nWait = nTime; - aAnimBmp.eDisposal = Disposal::Back; - aAnimBmp.bUserInput = false; + aAnimationBitmap.maBitmapEx = rBitmapEx; + aAnimationBitmap.maPositionPixel = aPt; + aAnimationBitmap.maSizePixel = aBitmapSize; + aAnimationBitmap.mnWait = nTime; + aAnimationBitmap.meDisposal = Disposal::Back; + aAnimationBitmap.mbUserInput = false; - aAnimation.Insert( aAnimBmp ); + aAnimation.Insert( aAnimationBitmap ); aAnimation.SetDisplaySizePixel( aMaxSizePix ); aAnimation.SetLoopCount( nLoopCount ); } |