[Libreoffice-commits] .: desktop/source sfx2/source xmloff/source

[Caolán McNamara]

 desktop/source/deployment/gui/dp_gui_updatedialog.cxx |    4 ++--
 desktop/source/deployment/manager/dp_manager.cxx      |    4 ++--
 sfx2/source/dialog/filtergrouping.cxx                 |   10 +++++-----
 xmloff/source/draw/sdxmlexp.cxx                       |   10 +++++-----
 4 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 66ad3a6ff862d3954a7a0068ee402dd629cce846
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 7 11:08:40 2011 +0000

    cppcheck: prefer prefix variant

diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 7d4ba30..b500880 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -338,10 +338,10 @@ void UpdateDialog::Thread::execute()
 
     typedef std::vector<std::pair<css::uno::Reference<css::deployment::XPackage>,
         css::uno::Any> >::const_iterator ITERROR;
-    for (ITERROR ite = errors.begin(); ite != errors.end(); ite ++)
+    for (ITERROR ite = errors.begin(); ite != errors.end(); ++ite )
         handleSpecificError(ite->first, ite->second);
 
-    for (dp_misc::UpdateInfoMap::iterator i(updateInfoMap.begin()); i != updateInfoMap.end(); i++)
+    for (dp_misc::UpdateInfoMap::iterator i(updateInfoMap.begin()); i != updateInfoMap.end(); ++i)
     {
         dp_misc::UpdateInfo const & info = i->second;
         UpdateData updateData(info.extension);
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 3b7432a..15de46d 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -1261,7 +1261,7 @@ bool PackageManagerImpl::synchronizeRemovedExtensions(
     typedef ActivePackages::Entries::const_iterator ITActive;
     bool bShared = m_context.equals(OUSTR("shared"));
 
-    for (ITActive i = id2temp.begin(); i != id2temp.end(); i++)
+    for (ITActive i = id2temp.begin(); i != id2temp.end(); ++i)
     {
         try
         {
@@ -1497,7 +1497,7 @@ Sequence< Reference<deployment::XPackage> > PackageManagerImpl::getExtensionsWit
         ActivePackages::Entries::const_iterator i = id2temp.begin();
         bool bShared = m_context.equals(OUSTR("shared"));
 
-        for (; i != id2temp.end(); i++ )
+        for (; i != id2temp.end(); ++i )
         {
             //Get the database entry
             ActivePackages::Data const & dbData = i->second;
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index 9bf1307..4b8501d 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -1074,9 +1074,9 @@ namespace sfx2
             {
                 std::vector< ExportFilter >::iterator aIter = aImportantFilterGroup.begin();
                 if ( nHTMLIndex != -1 )
-                    aIter++;
+                    ++aIter;
                 if ( nXHTMLIndex != -1 )
-                    aIter++;
+                    ++aIter;
                 aImportantFilterGroup.insert( aIter, aExportFilter );
                 nPDFIndex = 0;
             }
@@ -1084,11 +1084,11 @@ namespace sfx2
             {
                 std::vector< ExportFilter >::iterator aIter = aImportantFilterGroup.begin();
                 if ( nHTMLIndex != -1 )
-                    aIter++;
+                    ++aIter;
                 if ( nXHTMLIndex != -1 )
-                    aIter++;
+                    ++aIter;
                 if ( nPDFIndex != -1 )
-                    aIter++;
+                    ++aIter;
                 aImportantFilterGroup.insert( aIter, aExportFilter );
                 nFlashIndex = 0;
             }
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 75df970..5b5f0e4 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1534,7 +1534,7 @@ static OUString findOrAppendImpl( std::vector< OUString >& rVector, const OUStri
     // search rVector if there is already a string that equals rText
     std::vector< OUString >::iterator aIter;
     sal_Int32 nIndex;
-    for( nIndex = 1, aIter = rVector.begin(); aIter != rVector.end(); aIter++, nIndex++ )
+    for( nIndex = 1, aIter = rVector.begin(); aIter != rVector.end(); ++aIter, ++nIndex )
     {
         if( (*aIter) == rText )
             break;
@@ -1556,7 +1556,7 @@ static OUString findOrAppendImpl( std::vector< DateTimeDeclImpl >& rVector, cons
     // search rVector if there is already a DateTimeDeclImpl with rText,bFixed and nFormat
     std::vector< DateTimeDeclImpl >::iterator aIter;
     sal_Int32 nIndex;
-    for( nIndex = 1, aIter = rVector.begin(); aIter != rVector.end(); aIter++, nIndex++ )
+    for( nIndex = 1, aIter = rVector.begin(); aIter != rVector.end(); ++aIter, ++nIndex )
     {
         const DateTimeDeclImpl& rDecl = (*aIter);
         if( (rDecl.mbFixed == bFixed ) &&
@@ -1652,7 +1652,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls()
         const OUString aPrefix( OUString::createFromAscii( gpStrHeaderTextPrefix ) );
         std::vector< OUString >::iterator aIter;
         sal_Int32 nIndex;
-        for( nIndex = 1, aIter = maHeaderDeclsVector.begin(); aIter != maHeaderDeclsVector.end(); aIter++, nIndex++ )
+        for( nIndex = 1, aIter = maHeaderDeclsVector.begin(); aIter != maHeaderDeclsVector.end(); ++aIter, ++nIndex )
         {
             sBuffer.append( aPrefix );
             sBuffer.append( nIndex );
@@ -1669,7 +1669,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls()
         const OUString aPrefix( OUString::createFromAscii( gpStrFooterTextPrefix ) );
         std::vector< OUString >::iterator aIter;
         sal_Int32 nIndex;
-        for( nIndex = 1, aIter = maFooterDeclsVector.begin(); aIter != maFooterDeclsVector.end(); aIter++, nIndex++ )
+        for( nIndex = 1, aIter = maFooterDeclsVector.begin(); aIter != maFooterDeclsVector.end(); ++aIter, ++nIndex )
         {
             sBuffer.append( aPrefix );
             sBuffer.append( nIndex );
@@ -1686,7 +1686,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls()
         const OUString aPrefix( OUString::createFromAscii( gpStrDateTimeTextPrefix ) );
         std::vector< DateTimeDeclImpl >::iterator aIter;
         sal_Int32 nIndex;
-        for( nIndex = 1, aIter = maDateTimeDeclsVector.begin(); aIter != maDateTimeDeclsVector.end(); aIter++, nIndex++ )
+        for( nIndex = 1, aIter = maDateTimeDeclsVector.begin(); aIter != maDateTimeDeclsVector.end(); ++aIter, ++nIndex )
         {
             const DateTimeDeclImpl& rDecl = (*aIter);