diff options
Diffstat (limited to 'sd/source/filter/ppt/ppt97animations.cxx')
| -rw-r--r-- | sd/source/filter/ppt/ppt97animations.cxx | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index f22df66795dd..02970068ad7b 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -230,7 +230,7 @@ void Ppt97Animation::SetAnimateAssociatedShape( bool bAnimate ) DBG_WARNING("you tried to deselect the animation of the form for random animation-> this has been refused"); return; } - + } if(bAnimate) @@ -290,7 +290,7 @@ void Ppt97Animation::UpdateCacheData() const return; ClearCacheData(); - + if( !HasEffect() ) { m_bDirtyCache = false; @@ -300,19 +300,19 @@ void Ppt97Animation::UpdateCacheData() const switch( m_aAtom.nFlyMethod ) { case 0x0: - //eRetval = ::com::sun::star::presentation::AnimationEffect_APPEAR; + //eRetval = ::com::sun::star::presentation::AnimationEffect_APPEAR; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-appear"); // --- appear --- break; case 0x01: - //eRetval = ::com::sun::star::presentation::AnimationEffect_RANDOM; + //eRetval = ::com::sun::star::presentation::AnimationEffect_RANDOM; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-random"); // --- random --- break; - case 0x02: // --- blinds effect --- + case 0x02: // --- blinds effect --- { switch ( m_aAtom.nFlyDirection ) { case 0x0: - //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_STRIPES; + //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_STRIPES; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-venetian-blinds"); m_aSubType = ::rtl::OUString::createFromAscii("horizontal"); // horizontal break; @@ -324,7 +324,7 @@ void Ppt97Animation::UpdateCacheData() const } } break; - case 0x03: // --- (hor/ver) shifted appear --- + case 0x03: // --- (hor/ver) shifted appear --- { switch ( m_aAtom.nFlyDirection ) { @@ -342,10 +342,10 @@ void Ppt97Animation::UpdateCacheData() const } break; case 0x05: - //eRetval = ::com::sun::star::presentation::AnimationEffect_DISSOLVE; // --- dissolve ---- + //eRetval = ::com::sun::star::presentation::AnimationEffect_DISSOLVE; // --- dissolve ---- m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-dissolve-in"); break; - case 0x08: // --- (hor/ver) lines --- + case 0x08: // --- (hor/ver) lines --- { switch ( m_aAtom.nFlyDirection ) { @@ -355,56 +355,56 @@ void Ppt97Animation::UpdateCacheData() const m_aSubType = ::rtl::OUString::createFromAscii("vertical"); // horizontal ??? break; case 0x1: - //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_LINES; + //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_LINES; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-random-bars"); m_aSubType = rtl::OUString::createFromAscii("horizontal"); // vertical ??? break; } } break; - case 0x09: // --- diagonal --- + case 0x09: // --- diagonal --- { switch ( m_aAtom.nFlyDirection ) { case 0x4: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERRIGHT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERRIGHT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares"); m_aSubType = rtl::OUString::createFromAscii("left-to-top"); // to left top break; case 0x5: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERLEFT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERLEFT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares"); m_aSubType = rtl::OUString::createFromAscii("right-to-top"); // to right top break; case 0x6: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERRIGHT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERRIGHT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares"); m_aSubType = rtl::OUString::createFromAscii("left-to-bottom"); // to left bottom break; case 0x7: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERLEFT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERLEFT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-diagonal-squares"); m_aSubType = rtl::OUString::createFromAscii("right-to-bottom"); // to right bottom break; } } break; - case 0x0a: // --- roll/wipe --- + case 0x0a: // --- roll/wipe --- { switch ( m_aAtom.nFlyDirection ) { case 0x0: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_RIGHT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_RIGHT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe"); m_aSubType = rtl::OUString::createFromAscii("from-right"); // from right break; case 0x1: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_BOTTOM; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_BOTTOM; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe"); m_aSubType = rtl::OUString::createFromAscii("from-bottom"); // from bottom break; case 0x2: - //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LEFT; + //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LEFT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-wipe"); m_aSubType = rtl::OUString::createFromAscii("from-left"); // from left break; @@ -416,7 +416,7 @@ void Ppt97Animation::UpdateCacheData() const } } break; - case 0x0b: //--- fade in --- + case 0x0b: //--- fade in --- { switch ( m_aAtom.nFlyDirection ) { @@ -433,7 +433,7 @@ void Ppt97Animation::UpdateCacheData() const } } break; - case 0x0c: // --- text effects --- + case 0x0c: // --- text effects --- { switch ( m_aAtom.nFlyDirection ) { @@ -441,7 +441,7 @@ void Ppt97Animation::UpdateCacheData() const //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LEFT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-fly-in"); m_aSubType = rtl::OUString::createFromAscii("from-left"); - + break; case 0x1: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_TOP; @@ -481,7 +481,7 @@ void Ppt97Animation::UpdateCacheData() const case 0x8: // -- short text effects -- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_LEFT; m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-peek-in"); - m_aSubType = rtl::OUString::createFromAscii("from-left"); + m_aSubType = rtl::OUString::createFromAscii("from-left"); break; case 0x9: //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_BOTTOM; @@ -597,12 +597,12 @@ void Ppt97Animation::UpdateCacheData() const } } break; - case 0x0d: // --- open/close --- + case 0x0d: // --- open/close --- { switch ( m_aAtom.nFlyDirection ) { case 0x0: - //eRetval = ::com::sun::star::presentation::AnimationEffect_OPEN_VERTICAL ; // ??? + //eRetval = ::com::sun::star::presentation::AnimationEffect_OPEN_VERTICAL ; // ??? m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-split"); m_aSubType = rtl::OUString::createFromAscii("horizontal-out"); //horizontal open break; @@ -624,7 +624,7 @@ void Ppt97Animation::UpdateCacheData() const } } break; - case 0x0e: // --- blink --- + case 0x0e: // --- blink --- { m_aPresetId = ::rtl::OUString::createFromAscii("ooo-entrance-flash-once"); switch ( m_aAtom.nFlyDirection ) @@ -706,7 +706,7 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) // some effects need a different duration than that of the mapped preset effect double fDurationInSeconds = 1.0;//in secunden if( this->GetSpecialDuration( fDurationInSeconds ) ) - pEffect->setDuration( fDurationInSeconds ); + pEffect->setDuration( fDurationInSeconds ); // set after effect if( this->HasAfterEffect() ) @@ -724,11 +724,11 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) // text iteration pEffect->setIterateType( this->GetTextAnimationType() ); - + // some effects need a different delay between text iteration than that of the mapped preset effect double fTextIterationDelay = 1.0; if( this->GetSpecialTextIterationDelay( fTextIterationDelay ) ) - pEffect->setIterateInterval( fTextIterationDelay ); + pEffect->setIterateInterval( fTextIterationDelay ); // is the effect started on click or after the last effect (Another possible value is EffectNodeType::WITH_PREVIOUS ) pEffect->setNodeType( this->GetEffectNodeType() ); @@ -755,16 +755,16 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) double fDelaySeconds = this->GetDelayTimeInSeconds(); sal_Bool bAnimateAssociatedShape = this->HasAnimateAssociatedShape();//or only text sal_Bool bTextReverse = this->HasReverseOrder(); - + // now create effects for each paragraph - ::sd::CustomAnimationTextGroupPtr pGroup = pMainSequence-> + ::sd::CustomAnimationTextGroupPtr pGroup = pMainSequence-> createTextGroup( pEffect, nParagraphLevel, fDelaySeconds, bAnimateAssociatedShape, bTextReverse ); - + if( pGroup ) { const ::sd::EffectSequence& rEffects = pGroup->getEffects(); ::sd::EffectSequence::const_iterator aIter = rEffects.begin(); - + ::sd::CustomAnimationEffectPtr pLastEffect; sal_Int32 nIndex = 0; for( ; aIter != rEffects.end(); aIter++ ) |