[Libreoffice-commits] .: 2 commits - binfilter/bf_sc

[Caolán McNamara]

 binfilter/bf_sc/source/filter/xml/sc_xmlcelli.cxx |    2 -
 binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx |   30 +++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 38309574821fdeeadaea377f378e71a68d3c460a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Nov 27 18:58:49 2010 +0000

    cppcheck: use prefix variants

diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx b/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx
index 3f28816..df28554 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx
@@ -531,7 +531,7 @@ void ScXMLExport::CollectShapesAutoStyles(const sal_Int32 nTableCount)
                     {
                         GetShapeExport()->collectShapeAutoStyles(*aItr);
                         GetProgressBarHelper()->Increment();
-                        aItr++;
+                        ++aItr;
                     }
                 }
                 if (pShapeList)
@@ -540,7 +540,7 @@ void ScXMLExport::CollectShapesAutoStyles(const sal_Int32 nTableCount)
                     {
                         GetShapeExport()->collectShapeAutoStyles(aShapeItr->xShape);
                         GetProgressBarHelper()->Increment();
-                        aShapeItr++;
+                        ++aShapeItr;
                     }
                 }
             }
@@ -1557,30 +1557,30 @@ void ScXMLExport::_ExportAutoStyles()
                                                             {
                                                                 aItr->maValue >>= sStyleName;
                                                                 aItr->mnIndex = -1;
-                                                                aItr++;
-                                                                nCount++;
+                                                                ++aItr;
+                                                                ++nCount;
                                                             }
                                                             break;
                                                             case CTF_SC_NUMBERFORMAT :
                                                             {
                                                                 if (aItr->maValue >>= nNumberFormat)
                                                                     addDataStyle(nNumberFormat);
-                                                                aItr++;
-                                                                nCount++;
+                                                                ++aItr;
+                                                                ++nCount;
                                                             }
                                                             break;
                                                             default:
                                                             {
-                                                                aItr++;
-                                                                nCount++;
+                                                                ++aItr;
+                                                                ++nCount;
                                                             }
                                                             break;
                                                         }
                                                     }
                                                     else
                                                     {
-                                                        aItr++;
-                                                        nCount++;
+                                                        ++aItr;
+                                                        ++nCount;
                                                     }
                                                 }
                                                 if (nCount == 1) // this is the CellStyle and should be removed if alone
@@ -1691,7 +1691,7 @@ void ScXMLExport::_ExportAutoStyles()
                                                                 aItr->maValue >>= bIsVisible;
                                                                 break;
                                                             }
-                                                            aItr++;
+                                                            ++aItr;
                                                         }
                                                         ::rtl::OUString sParent;
                                                         ::rtl::OUString sName;
@@ -2265,7 +2265,7 @@ void ScXMLExport::WriteShapes(const ScMyCell& rMyCell)
                 }
                 ExportShape(aItr->xShape, pPoint);
             }
-            aItr++;
+            ++aItr;
         }
     }
 }
@@ -2377,7 +2377,7 @@ void ScXMLExport::WriteDetective( const ScMyCell& rMyCell )
         {
             SvXMLElementExport aDetElem( *this, XML_NAMESPACE_TABLE, XML_DETECTIVE, sal_True, sal_True );
             OUString sString;
-            for( ScMyDetectiveObjVec::const_iterator aObjItr = rObjVec.begin(); aObjItr != rObjVec.end(); aObjItr++ )
+            for( ScMyDetectiveObjVec::const_iterator aObjItr = rObjVec.begin(); aObjItr != rObjVec.end(); ++aObjItr )
             {
                 if (aObjItr->eObjType != SC_DETOBJ_CIRCLE)
                 {
@@ -2396,7 +2396,7 @@ void ScXMLExport::WriteDetective( const ScMyCell& rMyCell )
                 SvXMLElementExport aRangeElem( *this, XML_NAMESPACE_TABLE, XML_HIGHLIGHTED_RANGE, sal_True, sal_True );
             }
             OUStringBuffer aBuffer;
-            for( ScMyDetectiveOpVec::const_iterator aOpItr = rOpVec.begin(); aOpItr != rOpVec.end(); aOpItr++ )
+            for( ScMyDetectiveOpVec::const_iterator aOpItr = rOpVec.begin(); aOpItr != rOpVec.end(); ++aOpItr )
             {
                 OUString sString;
                 ScXMLConverter::GetStringFromDetOpType( sString, aOpItr->eOpType );
@@ -2589,7 +2589,7 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference <sheet::XSpreads
         sal_Int32 nIterationCount(100);
         aAny >>= nIterationCount;
         aAny = xPropertySet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ITEREPSILON)));
-        double fIterationEpsilon;
+        double fIterationEpsilon(0.0);
         aAny >>= fIterationEpsilon;
         aAny = xPropertySet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_NULLDATE)));
         util::Date aNullDate;
commit 14cc5765e7755b1747a3ca129b844b6500f73e74
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Nov 27 16:49:48 2010 +0000

    cppcheck: use prefix form

diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlcelli.cxx b/binfilter/bf_sc/source/filter/xml/sc_xmlcelli.cxx
index d2da7b6..a9a7945 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlcelli.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlcelli.cxx
@@ -702,7 +702,7 @@ void ScXMLTableRowCellContext::SetDetectiveObj( const table::CellAddress& rPosit
         LockSolarMutex();
         ScDetectiveFunc	aDetFunc( rXMLImport.GetDocument(), rPosition.Sheet );
         uno::Reference < drawing::XShapes > xShapes (rXMLImport.GetTables().GetCurrentXShapes());	// make draw page
-        for( ScMyImpDetectiveObjVec::iterator aItr = pDetectiveObjVec->begin(); aItr != pDetectiveObjVec->end(); aItr++ )
+        for( ScMyImpDetectiveObjVec::iterator aItr = pDetectiveObjVec->begin(); aItr != pDetectiveObjVec->end(); ++aItr )
         {
             ScAddress aScAddress;
             ScUnoConversion::FillScAddress( aScAddress, rPosition );