diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2012-09-17 16:18:52 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2012-09-17 16:47:40 +0200 |
| commit | 1b3b9585201c8d6037e96aa5ed78c3947a5a8a26 (patch) | |
| tree | e0bf6579e35178efed3758678a86bb4827a87f26 | |
| parent | 7371e3dbeb3637587eab141ee20f4cd8a4fc9373 (diff) | |
Cppcheck: remove duplicate if/else in sd.
Change-Id: I872dd578729d8fe43d50fbf835b977adff8aded5
| -rw-r--r-- | sd/source/filter/ppt/ppt97animations.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index f51a790de6e8..6253978ef417 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -682,11 +682,8 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) // append the effect to the main sequence if( !this->HasParagraphEffect() ) { - if( this->HasAnimateAssociatedShape() ) - pEffect->setTargetSubItem( presentation::ShapeAnimationSubType::AS_WHOLE ); - else - pEffect->setTargetSubItem( presentation::ShapeAnimationSubType::AS_WHOLE ); //todo: set ONLY_TEXT again if that is fixed - //pEffect->setTargetSubItem( presentation::ShapeAnimationSubType::ONLY_TEXT ); + // TODO: !this->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 ------ |