diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-04 11:20:03 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-05 07:49:30 +0100 |
commit | e4472d3c139294499f4c0caeebd9d4e995958eb0 (patch) | |
tree | 3e62a6530f8b758dddab18981ee38cc76ecaef9e /sd | |
parent | 126e5a4d5b1d6c7ba5b313786793a38f99488b33 (diff) |
loplugin:unnecessaryparen include more assignments
Change-Id: I9fb8366634b31230b732dd38a98f800075529714
Reviewed-on: https://gerrit.libreoffice.org/64510
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/core/CustomAnimationEffect.cxx | 30 | ||||
-rw-r--r-- | sd/source/core/CustomAnimationPreset.cxx | 2 | ||||
-rw-r--r-- | sd/source/core/EffectMigration.cxx | 36 | ||||
-rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 4 | ||||
-rw-r--r-- | sd/source/filter/html/buttonset.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/html/pubdlg.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 42 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowviewimpl.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsLayouter.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/unoidl/SdUnoDrawView.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/DocumentRenderer.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/sdview3.cxx | 4 |
12 files changed, 68 insertions, 68 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 230f2811db8c..7585480b155c 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -1619,7 +1619,7 @@ void EffectSequenceHelper::reset() EffectSequence::iterator aEnd( maEffects.end() ); if( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; pEffect->setEffectSequence(nullptr); } maEffects.clear(); @@ -1839,7 +1839,7 @@ void EffectSequenceHelper::implRebuild() { std::vector< sd::AfterEffectNode > aAfterEffects; - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; bool bFirst = true; do @@ -1900,7 +1900,7 @@ void EffectSequenceHelper::implRebuild() fDuration = fTemp; if( aIter != aEnd ) - pEffect = (*aIter++); + pEffect = *aIter++; else pEffect.reset(); } @@ -2084,7 +2084,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::findEffect( const css::uno::Refer { if( (*aIter)->getNode() == xNode ) { - pEffect = (*aIter); + pEffect = *aIter; break; } } @@ -2114,7 +2114,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::getEffectFromOffset( sal_Int32 nO CustomAnimationEffectPtr pEffect; if( aIter != maEffects.end() ) - pEffect = (*aIter); + pEffect = *aIter; return pEffect; } @@ -2317,7 +2317,7 @@ void EffectSequenceHelper::updateTextGroups() const EffectSequence::iterator aEnd( maEffects.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect( (*aIter++) ); + CustomAnimationEffectPtr pEffect( *aIter++ ); const sal_Int32 nGroupId = pEffect->getGroupId(); @@ -2523,7 +2523,7 @@ void EffectSequenceHelper::setTextGrouping( const CustomAnimationTextGroupPtr& p const EffectSequence::iterator aEnd( aEffects.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect( (*aIter++) ); + CustomAnimationEffectPtr pEffect( *aIter++ ); if( pEffect->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) remove( pEffect ); @@ -2544,7 +2544,7 @@ void EffectSequenceHelper::setTextGrouping( const CustomAnimationTextGroupPtr& p const EffectSequence::iterator aEnd( aEffects.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect( (*aIter++) ); + CustomAnimationEffectPtr pEffect( *aIter++ ); if( pEffect->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) { @@ -2605,7 +2605,7 @@ void EffectSequenceHelper::setAnimateForm( const CustomAnimationTextGroupPtr& pT { // special case, only one effect and that targets whole text, // convert this to target whole shape - pEffect = (*aIter++); + pEffect = *aIter++; pEffect->setTargetSubItem( ShapeAnimationSubType::AS_WHOLE ); } else @@ -2621,7 +2621,7 @@ void EffectSequenceHelper::setAnimateForm( const CustomAnimationTextGroupPtr& pT if( !bAnimateForm && (aEffects.size() == 1) ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); pEffect->setTarget( makeAny( (*aIter)->getTargetShape() ) ); pEffect->setTargetSubItem( ShapeAnimationSubType::ONLY_TEXT ); pTextGroup->addEffect( pEffect ); @@ -2631,7 +2631,7 @@ void EffectSequenceHelper::setAnimateForm( const CustomAnimationTextGroupPtr& pT // read the rest to the group again while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect( (*aIter++) ); + CustomAnimationEffectPtr pEffect( *aIter++ ); if( pEffect->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) { @@ -2659,7 +2659,7 @@ void EffectSequenceHelper::setTextGroupingAuto( const CustomAnimationTextGroupPt const EffectSequence::iterator aEnd( aEffects.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect( (*aIter++) ); + CustomAnimationEffectPtr pEffect( *aIter++ ); if( pEffect->getTarget().getValueType() == ::cppu::UnoType<ParagraphTarget>::get() ) { @@ -2749,7 +2749,7 @@ void EffectSequenceHelper::setTextReverse( const CustomAnimationTextGroupPtr& pT EffectSequence::iterator aInsertIter( find( *aIter++ ) ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect( (*aIter++) ); + CustomAnimationEffectPtr pEffect( *aIter++ ); maEffects.erase( find( pEffect ) ); aInsertIter = maEffects.insert( ++aInsertIter, pEffect ); pTextGroup->addEffect( pEffect ); @@ -2896,7 +2896,7 @@ void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode > stl_CustomAnimationEffect_search_node_predict aSearchPredict( xMaster ); EffectSequence::iterator aIter( std::find_if( maEffects.begin(), maEffects.end(), aSearchPredict ) ); if( aIter != maEffects.end() ) - pMasterEffect = (*aIter ); + pMasterEffect = *aIter; if( pMasterEffect.get() ) { @@ -3289,7 +3289,7 @@ void MainSequence::implRebuild() auto aIter( maInteractiveSequenceVector.begin() ); while( aIter != maInteractiveSequenceVector.end() ) { - InteractiveSequencePtr pIS( (*aIter) ); + InteractiveSequencePtr pIS( *aIter ); if( pIS->maEffects.empty() ) { // remove empty interactive sequences diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index 804ef7b9ddf2..5735c5df9f13 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -333,7 +333,7 @@ void CustomAnimationPresets::importEffects() while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter); + CustomAnimationEffectPtr pEffect = *aIter; const OUString aPresetId( pEffect->getPresetId() ); CustomAnimationPresetPtr pDescriptor = getEffectDescriptor( aPresetId ); diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 626495ed3b7c..b0fc5ea41570 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -396,7 +396,7 @@ static EffectSequence::iterator ImplFindEffect( MainSequencePtr const & pMainSeq for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( (pEffect->getTargetShape() == rShape) && (pEffect->getTargetSubItem() == nSubItem) ) break; } @@ -530,11 +530,11 @@ void EffectMigration::SetAnimationEffect( SvxShape* pShape, AnimationEffect eEff CustomAnimationEffectPtr pEffect; if( aIterAsWhole != aEnd ) { - pEffect = (*aIterAsWhole); + pEffect = *aIterAsWhole; } else { - pEffect = (*aIterOnlyBackground); + pEffect = *aIterOnlyBackground; } if( pEffect.get() ) @@ -565,7 +565,7 @@ AnimationEffect EffectMigration::GetAnimationEffect( SvxShape* pShape ) for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { if( (pEffect->getTargetSubItem() == ShapeAnimationSubType::ONLY_BACKGROUND) || @@ -650,14 +650,14 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect EffectSequence::iterator aIterOnlyBackground( ImplFindEffect( pMainSequence, xShape, ShapeAnimationSubType::ONLY_BACKGROUND ) ); if( aIterOnlyBackground != aEnd ) { - pShapeEffect = (*aIterOnlyBackground); + pShapeEffect = *aIterOnlyBackground; } else { EffectSequence::iterator aIterAsWhole( ImplFindEffect( pMainSequence, xShape, ShapeAnimationSubType::AS_WHOLE ) ); if( aIterAsWhole != aEnd ) { - pShapeEffect = (*aIterAsWhole); + pShapeEffect = *aIterAsWhole; } else { @@ -840,7 +840,7 @@ void EffectMigration::SetAnimationSpeed( SvxShape* pShape, AnimationSpeed eSpeed for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { if( pEffect->getDuration() != 0.1 ) @@ -866,7 +866,7 @@ AnimationSpeed EffectMigration::GetAnimationSpeed( SvxShape* pShape ) for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { if( pEffect->getDuration() != 0.1 ) @@ -914,7 +914,7 @@ void EffectMigration::SetDimColor( SvxShape* pShape, sal_Int32 nColor ) for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { pEffect->setHasAfterEffect( true ); @@ -943,7 +943,7 @@ sal_Int32 EffectMigration::GetDimColor( SvxShape* pShape ) for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( (pEffect->getTargetShape() == xShape) && pEffect->getDimColor().hasValue() && pEffect->hasAfterEffect()) @@ -978,7 +978,7 @@ void EffectMigration::SetDimHide( SvxShape* pShape, bool bDimHide ) for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { pEffect->setHasAfterEffect( bDimHide ); @@ -1010,7 +1010,7 @@ bool EffectMigration::GetDimHide( SvxShape* pShape ) EffectSequence::iterator aIter; for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { bRet = pEffect->hasAfterEffect() && @@ -1050,7 +1050,7 @@ void EffectMigration::SetDimPrevious( SvxShape* pShape, bool bDimPrevious ) for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { pEffect->setHasAfterEffect( bDimPrevious ); @@ -1080,7 +1080,7 @@ bool EffectMigration::GetDimPrevious( SvxShape* pShape ) EffectSequence::iterator aIter; for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { bRet = pEffect->hasAfterEffect() && @@ -1117,7 +1117,7 @@ void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos EffectSequence::iterator aEnd( rSequence.end() ); for( nPos = 0; aIter != aEnd; ++aIter ) { - CustomAnimationEffectPtr pEffect = (*aIter); + CustomAnimationEffectPtr pEffect = *aIter; if( !xCurrent.is() ) { @@ -1204,7 +1204,7 @@ sal_Int32 EffectMigration::GetPresentationOrder( SvxShape* pShape ) EffectSequence::iterator aEnd( rSequence.end() ); for( ; aIter != aEnd; ++aIter ) { - CustomAnimationEffectPtr pEffect = (*aIter); + CustomAnimationEffectPtr pEffect = *aIter; if( !xCurrent.is() || pEffect->getTargetShape() != xCurrent ) { @@ -1241,7 +1241,7 @@ void EffectMigration::UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo const for( aIter = pMainSequence->getBegin(); aIter != pMainSequence->getEnd(); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { if( !aSoundFile.isEmpty() ) @@ -1280,7 +1280,7 @@ OUString EffectMigration::GetSoundFile( SvxShape* pShape ) (aSoundFile.isEmpty()) && (aIter != pMainSequence->getEnd()); ++aIter ) { - CustomAnimationEffectPtr pEffect( (*aIter) ); + CustomAnimationEffectPtr pEffect( *aIter ); if( pEffect->getTargetShape() == xShape ) { if( pEffect->getAudio().is() ) diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 895c4b16c6b0..2917b19d787b 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -132,8 +132,8 @@ sal_uInt16 PPTExBulletProvider::GetId(Graphic const & rGraphic, Size& rGraphicSi } else { - double fQ1 = ( static_cast<double>(aPrefSize.Width()) / static_cast<double>(aPrefSize.Height()) ); - double fQ2 = ( static_cast<double>(rGraphicSize.Width()) / static_cast<double>(rGraphicSize.Height()) ); + double fQ1 = static_cast<double>(aPrefSize.Width()) / static_cast<double>(aPrefSize.Height()); + double fQ2 = static_cast<double>(rGraphicSize.Width()) / static_cast<double>(rGraphicSize.Height()); double fXScale = 1; double fYScale = 1; diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index 31693f3885a0..da0bdd77023f 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -226,7 +226,7 @@ bool ButtonSetImpl::getPreview( int nSet, const std::vector< OUString >& rButton std::vector< Graphic >::iterator aGraphIter( aGraphics.begin() ); while( aGraphIter != aGraphics.end() ) { - Graphic aGraphic( (*aGraphIter++) ); + Graphic aGraphic( *aGraphIter++ ); aGraphic.Draw( pDev, aPos ); diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index c99b660735db..b41707a6d370 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -929,7 +929,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) for( std::vector< PropertyValue >::iterator i = aProps.begin(); i != aProps.end(); ++i ) { - *pParams++ = (*i); + *pParams++ = *i; } } diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 6c1c5a2ee9a8..d69f77188eac 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -734,7 +734,7 @@ void CustomAnimationPane::updateControls() const EffectSequence::iterator aRebuildEnd( maListSelection.end() ); while( aRebuildIter != aRebuildEnd ) { - CustomAnimationEffectPtr pEffect = (*aRebuildIter++); + CustomAnimationEffectPtr pEffect = *aRebuildIter++; if( pEffect.get() ) { @@ -770,7 +770,7 @@ static bool updateMotionPathImpl( CustomAnimationPane& rPane, ::sd::View& rView, bool bChanges = false; while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect( (*aIter++) ); + CustomAnimationEffectPtr pEffect( *aIter++ ); if( pEffect.get() && pEffect->getPresetClass() == css::presentation::EffectPresetClass::MOTIONPATH ) { rtl::Reference< MotionPathTag > xMotionPathTag; @@ -778,7 +778,7 @@ static bool updateMotionPathImpl( CustomAnimationPane& rPane, ::sd::View& rView, MotionPathTagVector::iterator aMIter( rOldTags.begin() ); for( ; aMIter != rOldTags.end(); ++aMIter ) { - rtl::Reference< MotionPathTag > xTag( (*aMIter) ); + rtl::Reference< MotionPathTag > xTag( *aMIter ); if( xTag->getEffect() == pEffect ) { if( !xTag->isDisposed() ) @@ -838,7 +838,7 @@ void CustomAnimationPane::updateMotionPathTags() MotionPathTagVector::iterator aIter( aTags.begin() ); while( aIter != aTags.end() ) { - rtl::Reference< MotionPathTag > xTag( (*aIter++) ); + rtl::Reference< MotionPathTag > xTag( *aIter++ ); xTag->Dispose(); } } @@ -1132,7 +1132,7 @@ std::unique_ptr<STLPropertySet> CustomAnimationPane::createSelectionSet() const CustomAnimationPresets& rPresets (getPresets()); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; EffectSequenceHelper* pEffectSequence = pEffect->getEffectSequence(); if( !pEffectSequence ) @@ -1249,7 +1249,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet const * pResultSet, ST const EffectSequence::iterator aEnd( maListSelection.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; DBG_ASSERT( pEffect->getEffectSequence(), "sd::CustomAnimationPane::changeSelection(), dead effect in selection!" ); if( !pEffect->getEffectSequence() ) @@ -1520,7 +1520,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet const * pResultSet, ST const EffectSequence::const_iterator iEnd( aSelectedEffects.end() ); while( iter != iEnd ) { - CustomAnimationEffectPtr const& pEffect = (*iter++); + CustomAnimationEffectPtr const& pEffect = *iter++; EffectSequenceHelper* pEffectSequence = pEffect->getEffectSequence(); if( !pEffectSequence ) @@ -1897,7 +1897,7 @@ void CustomAnimationPane::onRemove() const EffectSequence::iterator aEnd( aList.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; if( pEffect->getEffectSequence() ) pEffect->getEffectSequence()->remove( pEffect ); } @@ -1947,7 +1947,7 @@ void CustomAnimationPane::onChangeStart( sal_Int16 nNodeType ) const EffectSequence::iterator aEnd( maListSelection.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; if( pEffect->getNodeType() != nNodeType ) { pEffect->setNodeType( nNodeType ); @@ -1980,7 +1980,7 @@ void CustomAnimationPane::onChangeSpeed() const EffectSequence::iterator aEnd( maListSelection.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; pEffect->setDuration( fDuration ); } @@ -2077,7 +2077,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, implPropertyHdl, LinkParamNone*, void) const EffectSequence::iterator aEnd( maListSelection.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; if( setProperty1Value( mnPropertyType, pEffect, aValue ) ) bNeedUpdate = true; @@ -2111,7 +2111,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, DelayLoseFocusHdl, Control&, void) const EffectSequence::iterator aEnd( maListSelection.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; pEffect->setBegin( fBegin/10.0 ); } @@ -2145,7 +2145,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void) while( aIter != aEnd ) { aTargets.push_back( (*aIter)->getTarget() ); - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; EffectSequenceHelper* pEffectSequence = pEffect->getEffectSequence(); if( !pEffectSequence ) @@ -2169,7 +2169,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void) // get selected effect while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; // Dispose the deprecated motion path tag. It will be rebuilt later. if (pEffect->getPresetClass() == css::presentation::EffectPresetClass::MOTIONPATH) @@ -2256,7 +2256,7 @@ sal_uInt32 CustomAnimationPane::fillAnimationLB( bool bHasText ) const std::vector< CustomAnimationPresetPtr >::const_iterator aEnd( aSortedVector.end() ); while( aIter != aEnd ) { - CustomAnimationPresetPtr pDescriptor = (*aIter++); + CustomAnimationPresetPtr pDescriptor = *aIter++; // ( !isTextOnly || ( isTextOnly && bHasText ) ) <=> !isTextOnly || bHasText if( pDescriptor.get() && ( !pDescriptor->isTextOnly() || bHasText ) ) { @@ -2339,7 +2339,7 @@ void CustomAnimationPane::moveSelection( bool bUp ) while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; EffectSequence::iterator aUpEffectPos( pSequence->find( pEffect ) ); // coverity[copy_paste_error : FALSE] - this is correct, checking if it exists @@ -2370,7 +2370,7 @@ void CustomAnimationPane::moveSelection( bool bUp ) while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; EffectSequence::iterator aDownEffectPos( pSequence->find( pEffect ) ); // coverity[copy_paste_error : FALSE] - this is correct, checking if it exists @@ -2421,7 +2421,7 @@ void CustomAnimationPane::onPreview( bool bForcePreview ) { if( (*aIter)->isSelected() ) { - xMotionPathTag = (*aIter); + xMotionPathTag = *aIter; break; } } @@ -2450,7 +2450,7 @@ void CustomAnimationPane::onPreview( bool bForcePreview ) while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; pSequence->append( pEffect->clone() ); } @@ -2497,7 +2497,7 @@ void CustomAnimationPane::onSelect() const EffectSequence::iterator aEnd( maListSelection.end() ); while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; Reference< XShape > xShape( pEffect->getTargetShape() ); SdrObject* pObj = GetSdrObjectFromXShape( xShape ); @@ -2524,7 +2524,7 @@ void CustomAnimationPane::onDragNDropComplete(CustomAnimationEffectPtr pEffectDr while( aIter != aEnd ) { - CustomAnimationEffectPtr pEffect = (*aIter++); + CustomAnimationEffectPtr pEffect = *aIter++; // Update model with new location (function triggers a rebuild) // target may be null, which will insert at the end. diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index c2fc2fb8f498..b5de0743c336 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -77,7 +77,7 @@ void SlideShowViewListeners::notify( const lang::EventObject& _rEvent ) ViewListenerVector::iterator aIter( maListeners.begin() ); while( aIter != maListeners.end() ) { - Reference< util::XModifyListener > xListener( (*aIter) ); + Reference< util::XModifyListener > xListener( *aIter ); if( xListener.is() ) { xListener->modified( _rEvent ); @@ -97,7 +97,7 @@ void SlideShowViewListeners::disposing( const lang::EventObject& _rEventSource ) ViewListenerVector::iterator aIter( maListeners.begin() ); while( aIter != maListeners.end() ) { - Reference< util::XModifyListener > xListener( (*aIter++) ); + Reference< util::XModifyListener > xListener( *aIter++ ); if( xListener.is() ) xListener->disposing( _rEventSource ); } diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index ba9090c58173..c2332a69c56e 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -41,8 +41,8 @@ public: sal_Int32 mnRightBorder; sal_Int32 mnTopBorder; sal_Int32 mnBottomBorder; - static const sal_Int32 gnVerticalGap = (10 - 2*Theme_FocusIndicatorWidth); - static const sal_Int32 gnHorizontalGap = (10 - 2*Theme_FocusIndicatorWidth); + static const sal_Int32 gnVerticalGap = 10 - 2*Theme_FocusIndicatorWidth; + static const sal_Int32 gnHorizontalGap = 10 - 2*Theme_FocusIndicatorWidth; Size const maMinimalSize; Size const maPreferredSize; Size const maMaximalSize; diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 7eea541fe2fc..27ae9bb8afbf 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -228,7 +228,7 @@ sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection ) const ::std::vector<SdrObject*>::iterator aEnd( aObjects.end() ); while( aIter != aEnd ) { - SdrObject* pObj = (*aIter++); + SdrObject* pObj = *aIter++; mrView.MarkObj( pObj, pPV ); } } diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 7f4772425528..c76303f338c4 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -962,7 +962,7 @@ namespace { if (*iPageIndex >= rDocument.GetSdPageCount(PageKind::Standard)) continue; - SdrPageObj* pPageObj = (*aPageObjIter++); + SdrPageObj* pPageObj = *aPageObjIter++; pPageObj->SetReferencedPage(rDocument.GetSdPage(*iPageIndex, PageKind::Standard)); } @@ -1509,7 +1509,7 @@ private: if( bDrawLines && (iter != aAreas.end()) ) { - ::tools::Rectangle aRect( (*iter++) ); + ::tools::Rectangle aRect( *iter++ ); basegfx::B2DPolygon aPoly; aPoly.insert(0, basegfx::B2DPoint( aRect.Left(), aRect.Top() ) ); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index d9fe8fb46367..05b5f242f5ea 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -656,7 +656,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, maDropPos.setY( pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ) ); // delete pages, that are not of any interest for us - for( long i = ( pWorkModel->GetPageCount() - 1 ); i >= 0; i-- ) + for( long i = pWorkModel->GetPageCount() - 1; i >= 0; i-- ) { SdPage* pP = static_cast< SdPage* >( pWorkModel->GetPage( static_cast<sal_uInt16>(i) ) ); @@ -903,7 +903,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, } // delete pages, that are not of any interest for us - for( long i = ( pModel->GetPageCount() - 1 ); i >= 0; i-- ) + for( long i = pModel->GetPageCount() - 1; i >= 0; i-- ) { SdPage* pP = static_cast< SdPage* >( pModel->GetPage( static_cast<sal_uInt16>(i) ) ); |