[Libreoffice-commits] .: slideshow/source stoc/source svtools/source svx/source

[Julien Nabet]

 slideshow/source/engine/shapes/drawinglayeranimation.cxx |    2 +-
 stoc/source/invocation/invocation.cxx                    |    2 +-
 svtools/source/control/ctrlbox.cxx                       |    2 +-
 svx/source/engine3d/helperhittest3d.cxx                  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0410bbafafb4880c9ab5f399c6c5801a4ce93619
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Aug 10 23:04:54 2011 +0200

    Some cppcheck cleaning

diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 323f168..1adea92 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 4359d25..2b6151f 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 e185705..7e606bb 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 e526061..46eecfa 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());
                 }