[Libreoffice-commits] core.git: 4 commits - sc/source sd/source starmath/source svtools/source
Julien Nabet
serval2412 at yahoo.fr
Sat Mar 30 10:25:49 PDT 2013
sc/source/core/data/dpdimsave.cxx | 2 +-
sd/source/filter/eppt/eppt.cxx | 5 ++---
sd/source/filter/eppt/pptexanimations.cxx | 11 ++++-------
starmath/source/unomodel.cxx | 2 +-
svtools/source/control/toolbarmenuacc.cxx | 21 +++++++--------------
svtools/source/control/valueacc.cxx | 11 ++++-------
6 files changed, 19 insertions(+), 33 deletions(-)
New commits:
commit 3e0ff98f5371db2270a607306ae498f8d0d02d1d
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat Mar 30 18:22:01 2013 +0100
Prefer prefix ++/-- operators for non-primitive types
Change-Id: I7db719ab118ff1003594bc481e11a5dbf7946b57
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index b564b2b..ae36524 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -94,7 +94,7 @@ void ScDPSaveGroupItem::RemoveElementsFromGroups( ScDPSaveGroupDimension& rDimen
// remove this group's elements from their groups in rDimension
// (rDimension must be a different dimension from the one which contains this)
- for ( std::vector<rtl::OUString>::const_iterator aIter(aElements.begin()); aIter != aElements.end(); aIter++ )
+ for ( std::vector<rtl::OUString>::const_iterator aIter(aElements.begin()); aIter != aElements.end(); ++aIter )
rDimension.RemoveFromGroups( *aIter );
}
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index aa10f33..8068caf 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -113,15 +113,14 @@ void PPTWriter::exportPPTPre( const std::vector< com::sun::star::beans::Property
if ( !mpPicStrm )
mpPicStrm = mrStg->OpenSotStream( rtl::OUString( "Pictures" ) );
- std::vector< com::sun::star::beans::PropertyValue >::const_iterator aIter( rMediaData.begin() );
- while( aIter != rMediaData.end() )
+ for (std::vector< com::sun::star::beans::PropertyValue >::const_iterator aIter( rMediaData.begin() ), aEnd( rMediaData.end() );
+ aIter != aEnd ; ++aIter)
{
if ( (*aIter).Name == "BaseURI" )
{
(*aIter).Value >>= maBaseURI;
break;
}
- aIter++;
}
mpPptEscherEx = new PptEscherEx( *mpStrm, maBaseURI );
}
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 96053ed..6efe36f 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -887,7 +887,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
SymbolDescriptor * pDescriptor = aSequence.getArray();
vector < const SmSym * >::const_iterator aIter = aVector.begin(), aEnd = aVector.end();
- for(; aIter != aEnd; pDescriptor++, aIter++)
+ for(; aIter != aEnd; pDescriptor++, ++aIter)
{
pDescriptor->sName = (*aIter)->GetName();
pDescriptor->sExportName = (*aIter)->GetExportName();
commit a6aaee2e39426cea7daa3df6c75feaebd6a8c869
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat Mar 30 18:09:43 2013 +0100
Prefer prefix ++/-- operators for non-primitive types
Change-Id: I7b3fb6f5c8b4dfed5ff225edecfe41d85a6f621d
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 0df398e..0a7273f 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -91,7 +91,6 @@ void ValueSetAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue
if( nEventId )
{
::std::vector< uno::Reference< accessibility::XAccessibleEventListener > > aTmpListeners( mxEventListeners );
- ::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::const_iterator aIter( aTmpListeners.begin() );
accessibility::AccessibleEventObject aEvtObject;
aEvtObject.EventId = nEventId;
@@ -99,7 +98,8 @@ void ValueSetAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue
aEvtObject.NewValue = rNewValue;
aEvtObject.OldValue = rOldValue;
- while( aIter != aTmpListeners.end() )
+ for (::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::const_iterator aIter( aTmpListeners.begin() );
+ aIter != aTmpListeners.end() ; ++aIter)
{
try
{
@@ -108,8 +108,6 @@ void ValueSetAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue
catch(const uno::Exception&)
{
}
-
- aIter++;
}
}
}
@@ -790,7 +788,6 @@ void ValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValu
if( nEventId )
{
::std::vector< uno::Reference< accessibility::XAccessibleEventListener > > aTmpListeners( mxEventListeners );
- ::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::const_iterator aIter( aTmpListeners.begin() );
accessibility::AccessibleEventObject aEvtObject;
aEvtObject.EventId = nEventId;
@@ -798,10 +795,10 @@ void ValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValu
aEvtObject.NewValue = rNewValue;
aEvtObject.OldValue = rOldValue;
- while( aIter != aTmpListeners.end() )
+ for (::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::const_iterator aIter( aTmpListeners.begin() );
+ aIter != aTmpListeners.end() ; ++aIter)
{
(*aIter)->notifyEvent( aEvtObject );
- aIter++;
}
}
}
commit 0a7c31d2a296ae8898c73777d2edbfb4e8772c7d
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat Mar 30 18:07:16 2013 +0100
Prefer prefix ++/-- operators for non-primitive types
Change-Id: I947709235e714a208eff6b57a7eba2f7dd386893
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index 56537b9..7694838 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -126,7 +126,6 @@ void ToolbarMenuAcc::FireAccessibleEvent( short nEventId, const Any& rOldValue,
if( nEventId )
{
EventListenerVector aTmpListeners( mxEventListeners );
- EventListenerVector::const_iterator aIter( aTmpListeners.begin() );
AccessibleEventObject aEvtObject;
aEvtObject.EventId = nEventId;
@@ -134,7 +133,8 @@ void ToolbarMenuAcc::FireAccessibleEvent( short nEventId, const Any& rOldValue,
aEvtObject.NewValue = rNewValue;
aEvtObject.OldValue = rOldValue;
- while( aIter != aTmpListeners.end() )
+ for (EventListenerVector::const_iterator aIter( aTmpListeners.begin() ), aEnd( aTmpListeners.end() );
+ aIter != aEnd ; ++aIter)
{
try
{
@@ -143,8 +143,6 @@ void ToolbarMenuAcc::FireAccessibleEvent( short nEventId, const Any& rOldValue,
catch( Exception& )
{
}
-
- aIter++;
}
}
}
@@ -816,19 +814,14 @@ void SAL_CALL ToolbarMenuEntryAcc::addAccessibleEventListener( const Reference<
if( rxListener.is() )
{
- EventListenerVector::const_iterator aIter( mxEventListeners.begin() );
- bool bFound = false;
-
- while( !bFound && ( aIter != mxEventListeners.end() ) )
+ for (EventListenerVector::const_iterator aIter( mxEventListeners.begin() ), aEnd( mxEventListeners.end() );
+ aIter != aEnd; ++aIter )
{
if( *aIter == rxListener )
- bFound = true;
- else
- aIter++;
+ return;
}
-
- if (!bFound)
- mxEventListeners.push_back( rxListener );
+ // listener not found so add it
+ mxEventListeners.push_back( rxListener );
}
}
commit 6d8416c8b4f1deb76a0598842b5c68dd7621ea62
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat Mar 30 18:01:52 2013 +0100
Prefer prefix ++/-- operators for non-primitive types
Change-Id: I98d8c5982b42b2f3283c50cf1da11331040ab884
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 7467d0d..8345a12 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -411,30 +411,27 @@ void AnimationExporter::processAfterEffectNodes( const Reference< XAnimationNode
bool AnimationExporter::isAfterEffectNode( const Reference< XAnimationNode >& xNode ) const
{
- std::list< AfterEffectNodePtr >::const_iterator aIter( maAfterEffectNodes.begin() );
const std::list< AfterEffectNodePtr >::const_iterator aEnd( maAfterEffectNodes.end() );
- while( aIter != aEnd )
+ for (std::list< AfterEffectNodePtr >::const_iterator aIter( maAfterEffectNodes.begin() );
+ aIter != aEnd ; ++aIter)
{
if( (*aIter)->mxNode == xNode )
return true;
- aIter++;
}
-
return false;
}
bool AnimationExporter::hasAfterEffectNode( const Reference< XAnimationNode >& xNode, Reference< XAnimationNode >& xAfterEffectNode ) const
{
- std::list< AfterEffectNodePtr >::const_iterator aIter( maAfterEffectNodes.begin() );
const std::list< AfterEffectNodePtr >::const_iterator aEnd( maAfterEffectNodes.end() );
- while( aIter != aEnd )
+ for (std::list< AfterEffectNodePtr >::const_iterator aIter( maAfterEffectNodes.begin() );
+ aIter != aEnd ; ++aIter)
{
if( (*aIter)->mxMaster == xNode )
{
xAfterEffectNode = (*aIter)->mxNode;
return true;
}
- aIter++;
}
return false;
More information about the Libreoffice-commits
mailing list