[Libreoffice-commits] .: 2 commits - package/source

[Caolán McNamara]

 package/source/zippackage/ZipPackage.cxx    |    4 ++--
 package/source/zippackage/zipfileaccess.cxx |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5a64624a0af3a2a4f437f08ebe41a215d70dee4b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 26 21:40:46 2010 +0000

    cppcheck: use prefix variant

diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 05933ca..a69cb83 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1017,7 +1017,7 @@ void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, const vector< Sequence
         Sequence < PropertyValue > * pSequence = aManifestSequence.getArray();
         for (vector < Sequence < PropertyValue > >::const_iterator aIter = aManList.begin(), aEnd = aManList.end();
              aIter != aEnd;
-             aIter++, pSequence++)
+             ++aIter, ++pSequence)
             *pSequence= (*aIter);
         xWriter->writeManifestSequence ( xManOutStream,  aManifestSequence );
 
@@ -1063,7 +1063,7 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< Sequ
     for ( vector< uno::Sequence< beans::PropertyValue > >::const_iterator aIter = aManList.begin(),
             aEnd = aManList.end();
          aIter != aEnd;
-         aIter++)
+         ++aIter)
     {
         ::rtl::OUString aPath;
         ::rtl::OUString aType;
commit f503f3afb0b4f02700b1be0618c4c584a5857c7e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 26 21:36:40 2010 +0000

    cppcheck: use prefix variant

diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index 7932df2..9ab9184 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -277,7 +277,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL OZipFileAccess::getElementNames()
     uno::Sequence< ::rtl::OUString > aNames( m_pZipFile->GetEntryHash().size() );
     sal_Int32 nLen = 0;
 
-    for ( EntryHash::iterator aIter = m_pZipFile->GetEntryHash().begin(); aIter != m_pZipFile->GetEntryHash().end(); aIter++ )
+    for ( EntryHash::iterator aIter = m_pZipFile->GetEntryHash().begin(); aIter != m_pZipFile->GetEntryHash().end(); ++aIter )
     {
         if ( aNames.getLength() < ++nLen )
         {
@@ -362,7 +362,7 @@ uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern(
     // Code to compare strings by patterns
     uno::Sequence< ::rtl::OUString > aPattern = GetPatternsFromString_Impl( aPatternString );
 
-    for ( EntryHash::iterator aIter = m_pZipFile->GetEntryHash().begin(); aIter != m_pZipFile->GetEntryHash().end(); aIter++ )
+    for ( EntryHash::iterator aIter = m_pZipFile->GetEntryHash().begin(); aIter != m_pZipFile->GetEntryHash().end(); ++aIter )
     {
         if ( StringGoodForPattern_Impl( (*aIter).second.sPath, aPattern ) )
         {