diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2011-08-10 23:04:54 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2011-08-10 23:05:50 +0200 |
| commit | 0410bbafafb4880c9ab5f399c6c5801a4ce93619 (patch) | |
| tree | a2bb5fd58c497ab91ca0487c882f78d2f6d0b7ef | |
| parent | check bitmap size before creating canvas action (diff) | |
| download | core-0410bbafafb4880c9ab5f399c6c5801a4ce93619.tar.gz core-0410bbafafb4880c9ab5f399c6c5801a4ce93619.zip | |
Some cppcheck cleaning
| -rw-r--r-- | slideshow/source/engine/shapes/drawinglayeranimation.cxx | 2 | ||||
| -rw-r--r-- | stoc/source/invocation/invocation.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/control/ctrlbox.cxx | 2 | ||||
| -rw-r--r-- | svx/source/engine3d/helperhittest3d.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index 323f16849123..1adea92a8eab 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -591,7 +591,7 @@ sal_uInt32 ActivityImpl::ImpRegisterAgainScrollTextMixerState(sal_uInt32 nTime) sal_uInt32 nRetval(0L); ImpForceScrollTextAnimNodes(); - if(maVector.size()) + if(!maVector.empty()) { sal_uInt32 nRelativeTime; ScrollTextAnimNode* pNode = ImpGetScrollTextAnimNode(nTime, nRelativeTime); diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index 4359d25e67e6..2b6151fe0f4f 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -702,7 +702,7 @@ Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>& catch( CannotConvertException& rExc ) { rExc.ArgumentIndex = nPos; // optionalen Parameter Index hinzufuegen - throw rExc; + throw; } } diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index e185705806be..7e606bbbf472 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -387,7 +387,7 @@ long BorderWidthImpl::GuessWidth( long nLine1, long nLine2, long nGap ) bInvalid = true; double nWidth = 0.0; - if ( !bInvalid && aToCompare.size() > 0 ) + if ( (!bInvalid) && (!aToCompare.empty()) ) { nWidth = *aToCompare.begin(); std::vector< double >::iterator pIt = aToCompare.begin(); diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx index e526061175c0..46eecfa0356d 100644 --- a/svx/source/engine3d/helperhittest3d.cxx +++ b/svx/source/engine3d/helperhittest3d.cxx @@ -237,7 +237,7 @@ SVX_DLLPUBLIC void getAllHit3DObjectsSortedFrontToBack( // copy SdrObject pointers to return result set ::std::vector< ImplPairDephAndObject >::iterator aIterator2(aDepthAndObjectResults.begin()); - for(;aIterator2 != aDepthAndObjectResults.end(); aIterator2++) + for(;aIterator2 != aDepthAndObjectResults.end(); ++aIterator2) { o_rResult.push_back(aIterator2->getObject()); } |