[Libreoffice-commits] .: filter/source package/source stoc/source svl/source sw/source unotools/source

[Julien Nabet]

 filter/source/flash/swfwriter.cxx         |    2 +-
 package/source/xstor/owriteablestream.cxx |    4 ++--
 stoc/source/tdmanager/tdmgr.cxx           |    2 +-
 svl/source/items/stylepool.cxx            |    2 +-
 sw/source/filter/html/htmltab.cxx         |    2 +-
 unotools/source/config/xmlaccelcfg.cxx    |    4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 5cbb76d6c4e4d8de7304e75ca922d92320954d5a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Aug 11 23:21:58 2011 +0200

    Some cppcheck cleaning

diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx
index 980146c..2ba73bb 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -216,7 +216,7 @@ void Writer::endSprite()
         mpSprite->write( *mpMovieStream );
         delete mpSprite;
 
-        if (mvSpriteStack.size() > 0)
+        if (!mvSpriteStack.empty())
         {
             mpSprite = mvSpriteStack.top();
             mvSpriteStack.pop();
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index d4af5ee..56b308b 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -73,7 +73,7 @@ bool PackageEncryptionDatasEqual( const ::comphelper::SequenceAsHashMap& aHash1,
     bool bResult = ( aHash1.size() && aHash1.size() == aHash2.size() );
     for ( ::comphelper::SequenceAsHashMap::const_iterator aIter = aHash1.begin();
           bResult && aIter != aHash1.end();
-          aIter++ )
+          ++aIter )
     {
         uno::Sequence< sal_Int8 > aKey1;
         bResult = ( ( aIter->second >>= aKey1 ) && aKey1.getLength() );
@@ -540,7 +540,7 @@ void OWriteStream_Impl::DisposeWrappers()
     if ( !m_aInputStreamsList.empty() )
     {
         for ( InputStreamsList_Impl::iterator pStreamIter = m_aInputStreamsList.begin();
-              pStreamIter != m_aInputStreamsList.end(); pStreamIter++ )
+              pStreamIter != m_aInputStreamsList.end(); ++pStreamIter )
         {
             if ( (*pStreamIter) )
             {
diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx
index 6c6e897..04e7896 100644
--- a/stoc/source/tdmanager/tdmgr.cxx
+++ b/stoc/source/tdmanager/tdmgr.cxx
@@ -374,7 +374,7 @@ sal_Bool ManagerImpl::hasElements()
     throw(::com::sun::star::uno::RuntimeException)
 {
     MutexGuard aGuard( _aComponentMutex );
-    return (_aProviders.size() > 0);
+    return (!_aProviders.empty());
 }
 
 // XEnumerationAccess
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 1873ffd..26910a3 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -117,7 +117,7 @@ namespace {
     {
         bool bHasItemSet = false;
 
-        if ( maItemSet.size() > 0 )
+        if ( !maItemSet.empty())
         {
             if ( bCheckUsage )
             {
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 1552660..17b5498 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2390,7 +2390,7 @@ void HTMLTable::CloseTable()
         HTMLTableRow *pPrevRow = (*pRows)[nCurRow-1];
         HTMLTableCell *pCell;
         for( i=0; i<nCols; i++ )
-            if( ( pCell=pPrevRow->GetCell(i), pCell->GetRowSpan() > 1 ) )
+            if( ( (pCell=(pPrevRow->GetCell(i))), (pCell->GetRowSpan()) > 1 ) )
             {
                 FixRowSpan( nCurRow-1, i, pCell->GetContents() );
                 ProtectRowSpan( nCurRow, i, (*pRows)[nCurRow]->GetCell(i)->GetRowSpan() );
diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx
index fbf33a8..dfb0e29 100644
--- a/unotools/source/config/xmlaccelcfg.cxx
+++ b/unotools/source/config/xmlaccelcfg.cxx
@@ -147,7 +147,7 @@ OUString AttributeListImpl::getTypeByName( const OUString& sName ) throw (Runtim
 {
     ::std::vector<struct TagAttribute>::iterator ii = m_pImpl->vecAttribute.begin();
 
-    for( ; ii != m_pImpl->vecAttribute.end() ; ii ++ ) {
+    for( ; ii != m_pImpl->vecAttribute.end() ; ++ii  ) {
         if( (*ii).sName == sName ) {
             return (*ii).sType;
         }
@@ -159,7 +159,7 @@ OUString AttributeListImpl::getValueByName(const OUString& sName) throw (Runtime
 {
     ::std::vector<struct TagAttribute>::iterator ii = m_pImpl->vecAttribute.begin();
 
-    for( ; ii != m_pImpl->vecAttribute.end() ; ii ++ ) {
+    for( ; ii != m_pImpl->vecAttribute.end() ; ++ii ) {
         if( (*ii).sName == sName ) {
             return (*ii).sValue;
         }