[Libreoffice-commits] .: sc/source

Julien Nabet serval2412 at kemper.freedesktop.org
Sat Jun 18 09:16:41 PDT 2011


 sc/source/filter/excel/excform.cxx             |    2 +-
 sc/source/filter/lotus/lotform.cxx             |    2 --
 sc/source/filter/xml/XMLStylesExportHelper.cxx |    4 +++-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9037e84e429081928490454ffcaa84b8dfed2851
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Jun 13 21:37:59 2011 +0200

    Some cppcheck cleaning

diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 5e1f53d..7ac6cf3 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -1564,7 +1564,6 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz )
     if( nAnz > 0 )
     {
         // attention: 0 = last parameter, nAnz-1 = first parameter
-        sal_Int16 nNull = -1;		// skip this parameter
         sal_Int16 nSkipEnd = -1;	// skip all parameters <= nSkipEnd
 
         sal_Int16 nLast = nAnz - 1;
@@ -1591,6 +1590,7 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz )
         // [Parameter{;Parameter}]
         if( nLast > nSkipEnd )
         {
+            sal_Int16 nNull = -1;		// skip this parameter
             aPool << eParam[ nLast ];
             for( nLauf = nLast - 1 ; nLauf > nSkipEnd ; nLauf-- )
             {
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 413c9d3..c05439c 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -2034,8 +2034,6 @@ DefTokenId lcl_KnownAddIn( const ByteString& sTest )
             eId=ocArcCot;
     else if(sTest== "COT")
             eId=ocCot;
-    else if(sTest== "ACOT")
-            eId=ocArcCot;
     else if(sTest== "TRUNC")
             eId=ocTrunc;
     else if(sTest== "GEOMEAN")
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 7083ca6..f9cc845 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -798,7 +798,9 @@ sal_Bool ScMyFormatRange::operator<(const ScMyFormatRange& rRange) const
 ScFormatRangeStyles::ScFormatRangeStyles()
     : aTables(),
     aStyleNames(),
-    aAutoStyleNames()
+    aAutoStyleNames(),
+    pRowDefaults(0),
+    pColDefaults(0)
 {
 }
 


More information about the Libreoffice-commits mailing list