summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2011-08-09 00:17:54 +0200
committerJulien Nabet <serval2412@yahoo.fr>2011-08-09 00:17:54 +0200
commitda41ba97d3ac0eb751dfc4b716bd594d1670c77e (patch)
tree14e7379e4902fc1af5d5dc499b4d8aa58edfe58a
parentAdd 2 lacking va_end. (diff)
downloadcore-da41ba97d3ac0eb751dfc4b716bd594d1670c77e.tar.gz
core-da41ba97d3ac0eb751dfc4b716bd594d1670c77e.zip
Some cppcheck cleaning
-rw-r--r--basctl/source/dlged/dlgedobj.cxx8
-rw-r--r--forms/source/xforms/binding.cxx2
-rw-r--r--l10ntools/layout/layoutparse.cxx2
-rw-r--r--l10ntools/layout/tralay.cxx6
4 files changed, 9 insertions, 9 deletions
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 315b4a4b7c37..cff3e08bd594 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -1531,7 +1531,7 @@ void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
nPageHeightIn = aPageSize.Height();
if ( TransformSdrToControlCoordinates( nPageXIn, nPageYIn, nPageWidthIn, nPageHeightIn, nPageX, nPageY, nPageWidth, nPageHeight ) )
{
- for ( aIter = aChildList.begin(); aIter != aChildList.end(); aIter++ )
+ for ( aIter = aChildList.begin(); aIter != aChildList.end(); ++aIter )
{
Reference< beans::XPropertySet > xPSet( (*aIter)->GetUnoControlModel(), UNO_QUERY );
if ( xPSet.is() )
@@ -1578,7 +1578,7 @@ void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
}
}
- for ( aIter = aChildList.begin(); aIter != aChildList.end(); aIter++ )
+ for ( aIter = aChildList.begin(); aIter != aChildList.end(); ++aIter )
{
(*aIter)->SetRectFromProps();
}
@@ -1780,7 +1780,7 @@ void DlgEdForm::NbcMove( const Size& rSize )
// set geometry properties of all childs
::std::vector<DlgEdObj*>::iterator aIter;
- for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; aIter++ )
+ for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; ++aIter )
{
(*aIter)->EndListening(sal_False);
(*aIter)->SetPropsFromRect();
@@ -1804,7 +1804,7 @@ void DlgEdForm::NbcResize(const Point& rRef, const Fraction& xFract, const Fract
// set geometry properties of all childs
::std::vector<DlgEdObj*>::iterator aIter;
- for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; aIter++ )
+ for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; ++aIter )
{
(*aIter)->EndListening(sal_False);
(*aIter)->SetPropsFromRect();
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index 7389eabb4409..26287236f3a5 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -661,7 +661,7 @@ void Binding::bind( bool bForceRebind )
::std::vector<EvaluationContext> aMIPContexts = _getMIPEvaluationContexts();
for( ::std::vector<EvaluationContext>::iterator aIter = aMIPContexts.begin();
aIter != aMIPContexts.end();
- aIter++ )
+ ++aIter )
{
EvaluationContext& rContext = *aIter;
diff --git a/l10ntools/layout/layoutparse.cxx b/l10ntools/layout/layoutparse.cxx
index d3d80b6e95af..1d8473c0926b 100644
--- a/l10ntools/layout/layoutparse.cxx
+++ b/l10ntools/layout/layoutparse.cxx
@@ -74,7 +74,7 @@ LayoutXMLFile::HandleElement( XMLElement* element )
{
std::vector<XMLAttribute*> interesting = interestingAttributes( element->GetAttributeList() );
- if ( interesting.size() )
+ if ( !interesting.empty() )
{
std::vector<XMLAttribute*>::iterator i = interesting.begin();
diff --git a/l10ntools/layout/tralay.cxx b/l10ntools/layout/tralay.cxx
index e8c614450ca9..fa3086af4359 100644
--- a/l10ntools/layout/tralay.cxx
+++ b/l10ntools/layout/tralay.cxx
@@ -156,7 +156,7 @@ void TranslateLayout::ParseCommandLine()
else
mFiles.push_back( ConvertSystemPath( aParam ) );
}
- if ( !mFiles.size() )
+ if ( mFiles.empty() )
{
fprintf( stderr, "error: No XML-FILE found\n" );
usage();
@@ -325,7 +325,7 @@ void TranslateLayout::MergeLanguage( ByteString const& language )
void TranslateLayout::Merge()
{
- if ( mLanguages.size() )
+ if (!mLanguages.empty() )
for ( std::vector<ByteString>::iterator i = mLanguages.begin();
i != mLanguages.end(); ++i)
MergeLanguage( *i );
@@ -351,7 +351,7 @@ void TranslateLayout::CreateSDF()
void TranslateLayout::ExceptionalMain()
{
ParseCommandLine();
- if ( mLanguages.size() )
+ if ( !mLanguages.empty() )
mLanguage = mLanguages.front();
if ( mMergeMode )
Merge();