diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-02 12:57:55 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-02 13:45:36 +0200 |
commit | 3dcf6dfceee58360501396390d78c006351aef47 (patch) | |
tree | 6e8cea499ee3a9543a03fd4a5321f5153c76cd65 /sd | |
parent | 3b35bcf25fce566f91d084574650181ea791dff8 (diff) |
remove unnecessary use of 'this->'
Change-Id: I5c115389af7d24c18ddaf5fbec8c00f35017a5b4
Reviewed-on: https://gerrit.libreoffice.org/40671
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
3 files changed, 31 insertions, 31 deletions
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index 68069398399a..b76c3346ad7f 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -138,7 +138,7 @@ bool Ppt97Animation::GetSpecialDuration( double& rfDurationInSeconds ) const bool Ppt97Animation::GetSpecialTextIterationDelay( double& rfTextIterationDelay ) const { bool bRet = false; - switch(this->GetTextAnimationType()) + switch(GetTextAnimationType()) { case presentation::TextAnimationType::BY_LETTER: rfTextIterationDelay = 0.075; @@ -163,10 +163,10 @@ void Ppt97Animation::SetAnimateAssociatedShape( bool bAnimate ) if( !bAnimate ) { //the appear effect cannot be animated without text - if( this->GetPresetId() == "ooo-entrance-appear" ) + if( GetPresetId() == "ooo-entrance-appear" ) return; //the random effect may be the appear effect and than has the same problem - if( this->GetPresetId() == "ooo-entrance-random" ) + if( GetPresetId() == "ooo-entrance-random" ) { //this case is not 100% correct -> feel free to complete //i consider this case as seldom and not that problematic and a simple correct fix is not in sight @@ -545,7 +545,7 @@ void Ppt97Animation::UpdateCacheData() const void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) { - if( !this->HasEffect() ) + if( !HasEffect() ) return; if( !pObj || !pObj->GetPage() ) { @@ -567,7 +567,7 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) } const ::sd::CustomAnimationPresets& rPresets( ::sd::CustomAnimationPresets::getCustomAnimationPresets() ); - ::sd::CustomAnimationPresetPtr pPreset( rPresets.getEffectDescriptor( this->GetPresetId() ) ); + ::sd::CustomAnimationPresetPtr pPreset( rPresets.getEffectDescriptor( GetPresetId() ) ); if( !pPreset.get() ) { OSL_FAIL("no suitable preset found for ppt import"); @@ -577,7 +577,7 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) //--------------start doing something //1. ------ create an effect from the presets ------ - ::sd::CustomAnimationEffectPtr pEffect( new ::sd::CustomAnimationEffect( pPreset->create( this->GetPresetSubType() ) ) ); + ::sd::CustomAnimationEffectPtr pEffect( new ::sd::CustomAnimationEffect( pPreset->create( GetPresetSubType() ) ) ); if( !pEffect.get() ) { DBG_ASSERT(pEffect.get(),"no suitable effect found"); @@ -589,57 +589,57 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) // set the shape targeted by this effect pEffect->setTarget( makeAny( xShape ) ); - pEffect->setBegin( this->GetDelayTimeInSeconds() ); + pEffect->setBegin( GetDelayTimeInSeconds() ); // some effects need a different duration than that of the mapped preset effect double fDurationInSeconds = 1.0; //in seconds - if( this->GetSpecialDuration( fDurationInSeconds ) ) + if( GetSpecialDuration( fDurationInSeconds ) ) pEffect->setDuration( fDurationInSeconds ); // set after effect - if( this->HasAfterEffect() ) + if( HasAfterEffect() ) { pEffect->setHasAfterEffect( true ); - if( this->HasAfterEffect_ChangeColor() ) - pEffect->setDimColor( uno::makeAny( this->GetDimColor() ) ); + if( HasAfterEffect_ChangeColor() ) + pEffect->setDimColor( uno::makeAny( GetDimColor() ) ); else - pEffect->setAfterEffectOnNext( this->HasAfterEffect_DimAtNextEffect() ); + pEffect->setAfterEffectOnNext( HasAfterEffect_DimAtNextEffect() ); } // set sound effect - if( this->HasSoundEffect() ) + if( HasSoundEffect() ) pEffect->createAudio( uno::makeAny( m_aSoundFileUrl ) ); // text iteration - pEffect->setIterateType( this->GetTextAnimationType() ); + pEffect->setIterateType( 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 ) ) + if( GetSpecialTextIterationDelay( 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() ); + pEffect->setNodeType( GetEffectNodeType() ); //set stop sound effect - if( this->HasStopPreviousSound() ) + if( HasStopPreviousSound() ) pEffect->setStopAudio(); // append the effect to the main sequence - if( !this->HasParagraphEffect() ) + if( !HasParagraphEffect() ) { - // TODO: !this->HasAnimateAssociatedShape() can possibly have this set to ONLY_TEXT - see i#42737 + // TODO: !HasAnimateAssociatedShape() can possibly have this set to ONLY_TEXT - see i#42737 pEffect->setTargetSubItem( presentation::ShapeAnimationSubType::AS_WHOLE ); } //3. ------ put the created effect to the model and do some last changes fro paragraph effects ------ pMainSequence->append( pEffect ); - if( this->HasParagraphEffect() ) + if( HasParagraphEffect() ) { - sal_Int32 nParagraphLevel = this->GetParagraphLevel(); - double fDelaySeconds = this->GetDelayTimeInSeconds(); - bool bAnimateAssociatedShape = this->HasAnimateAssociatedShape();//or only text - bool bTextReverse = this->HasReverseOrder(); + sal_Int32 nParagraphLevel = GetParagraphLevel(); + double fDelaySeconds = GetDelayTimeInSeconds(); + bool bAnimateAssociatedShape = HasAnimateAssociatedShape();//or only text + bool bTextReverse = HasReverseOrder(); // now create effects for each paragraph ::sd::CustomAnimationTextGroupPtr pGroup = pMainSequence-> @@ -656,11 +656,11 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) { ::sd::CustomAnimationEffectPtr pGroupEffect(*aIter); - ////todo? if( nIndex > 1 && pLastEffect && this->HasSoundEffect() ) + ////todo? if( nIndex > 1 && pLastEffect && HasSoundEffect() ) //// pLastEffect->setStopAudio(); if( nIndex < 2 ) { - pGroupEffect->setNodeType( this->GetEffectNodeType() ); + pGroupEffect->setNodeType( GetEffectNodeType() ); } else if( nIndex > 0 ) { @@ -670,8 +670,8 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) else bAtParagraphBegin = !pLastEffect || pLastEffect->getParaDepth() < nParagraphLevel; if( bAtParagraphBegin ) - pGroupEffect->setNodeType( this->GetEffectNodeType() ); - else if( this->GetTextAnimationType() == presentation::TextAnimationType::BY_PARAGRAPH ) + pGroupEffect->setNodeType( GetEffectNodeType() ); + else if( GetTextAnimationType() == presentation::TextAnimationType::BY_PARAGRAPH ) pGroupEffect->setNodeType( presentation::EffectNodeType::WITH_PREVIOUS ); else pGroupEffect->setNodeType( presentation::EffectNodeType::AFTER_PREVIOUS ); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 5fac67cbb8c3..b530e3ee8471 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -841,7 +841,7 @@ void AccessibleSlideSorterView::Implementation::Notify ( void AccessibleSlideSorterView::SwitchViewActivated() { // Firstly, set focus to view - this->FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, + FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, Any(), Any(AccessibleStateType::FOCUSED)); diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx index 81f102275791..ce19fcc57e53 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx @@ -70,7 +70,7 @@ void ConfigurationControllerResourceManager::ActivateResources ( rResources.begin(), rResources.end(), [&] (Reference<XResourceId> const& xResource) { - return this->ActivateResource(xResource, rxConfiguration); + return ActivateResource(xResource, rxConfiguration); } ); } @@ -86,7 +86,7 @@ void ConfigurationControllerResourceManager::DeactivateResources ( rResources.rbegin(), rResources.rend(), [&] (Reference<XResourceId> const& xResource) { - return this->DeactivateResource(xResource, rxConfiguration); + return DeactivateResource(xResource, rxConfiguration); } ); } |