[Libreoffice-commits] .: sc/source

Caolán McNamara caolan at kemper.freedesktop.org
Thu Feb 3 06:22:00 PST 2011


 sc/source/filter/excel/excform.cxx  |    3 +--
 sc/source/filter/excel/excform8.cxx |    3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit b19e8c9e95d8aaf71867aac7393ccc154b368fd6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 3 13:16:16 2011 +0000

    gcc 4.6.0 various warnings

diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 5568b4c..9c9ed79 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -57,7 +57,7 @@ void ImportExcel::Formula25()
     XclAddress aXclPos;
     UINT16  nXF = 0, nFormLen;
     double	fCurVal;
-    BYTE	nAttr0, nFlag0;
+    BYTE	nFlag0;
     BOOL	bShrFmla;
 
     aIn >> aXclPos;
@@ -73,7 +73,6 @@ void ImportExcel::Formula25()
         aIn >> nDummy;
         nFormLen = nDummy;
         bShrFmla = FALSE;
-        nAttr0 = 0x01;	// Always calculate
     }
     else
     {//						BIFF5
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx
index de6d259..fac3285 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -874,7 +874,6 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
 {
     BYTE					nOp, nLen;//, nByte;
     BOOL					bError = FALSE;
-    BOOL					bArrayFormula = FALSE;
     const BOOL				bRangeName = eFT == FT_RangeName;
     const BOOL				bSharedFormula = eFT == FT_SharedFormula;
     const BOOL				bRNorSF = bRangeName || bSharedFormula;
@@ -908,8 +907,6 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
             case 0x01: // Array Formula							[325    ]
                        // Array Formula or Shared Formula		[    277]
                 aIn.Ignore( 4 );
-
-                bArrayFormula = TRUE;
                 break;
             case 0x02: // Data Table							[325 277]
                 aIn.Ignore( 4 );


More information about the Libreoffice-commits mailing list