[Libreoffice-commits] .: binfilter/bf_sc

[Caolán McNamara]

 binfilter/bf_sc/source/filter/xml/sc_XMLConsolidationContext.cxx |    3 +--
 binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx                |    8 +-------
 2 files changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 4ce3d8fc61996a59d25925bf69522ad78cd1ec18
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 23 18:41:03 2011 +0000

    WaE: unused varibles

diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLConsolidationContext.cxx b/binfilter/bf_sc/source/filter/xml/sc_XMLConsolidationContext.cxx
index 280ff4d..440d2ab 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLConsolidationContext.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLConsolidationContext.cxx
@@ -119,7 +119,6 @@ void ScXMLConsolidationContext::EndElement()
         aConsParam.nTab = aTargetAddr.Tab();
         aConsParam.eFunction = eFunction;
 
-        sal_Bool bError = sal_False;
         USHORT nCount = (USHORT) Min( ScXMLConverter::GetTokenCount( sSourceList ), (sal_Int32)0xFFFF );
         ScArea** ppAreas = nCount ? new ScArea*[ nCount ] : NULL;
         if( ppAreas )
@@ -132,7 +131,7 @@ void ScXMLConsolidationContext::EndElement()
                 if ( !ScXMLConverter::GetAreaFromString(
                     *ppAreas[ nIndex ], sSourceList, GetScImport().GetDocument(), nOffset ) )
                 {
-                    bError = sal_True;		//! handle error
+                    //! handle error
                 }
             }
 
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx b/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx
index cd9597c..bf65124 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlexprt.cxx
@@ -735,7 +735,6 @@ void ScXMLExport::ExportColumns(const sal_uInt16 nTable, const table::CellRangeA
     sal_Bool bWasHeader (sal_False);
     sal_Bool bIsHeader (sal_False);
     sal_Bool bIsClosed (sal_True);
-    sal_Bool bIsFirst (sal_False);
     sal_Int32 nPrevIndex (-1);
     sal_Int32 nColumn;
 
@@ -750,7 +749,6 @@ void ScXMLExport::ExportColumns(const sal_uInt16 nTable, const table::CellRangeA
         {
             if (bIsHeader)
             {
-                bIsFirst = sal_False;
                 if (nColumn > 0)
                 {
                     WriteColumn(nPrevColumn, nColsRepeated, nPrevIndex, bPrevIsVisible);
@@ -761,7 +759,6 @@ void ScXMLExport::ExportColumns(const sal_uInt16 nTable, const table::CellRangeA
                 nPrevIndex = nIndex;
                 nPrevColumn = nColumn;
                 nColsRepeated = 1;
-                bIsFirst = sal_True;
                 if(pGroupColumns->IsGroupStart(nColumn))
                     pGroupColumns->OpenGroups(nColumn);
                 OpenHeaderColumn();
@@ -790,14 +787,12 @@ void ScXMLExport::ExportColumns(const sal_uInt16 nTable, const table::CellRangeA
                 pGroupColumns->OpenGroups(nColumn);
             bPrevIsVisible = bIsVisible;
             nPrevIndex = nIndex;
-            bIsFirst = sal_True;
         }
         else if ((bIsVisible == bPrevIsVisible) && (nIndex == nPrevIndex) &&
             !pGroupColumns->IsGroupStart(nColumn) && !pGroupColumns->IsGroupEnd(nColumn - 1))
             nColsRepeated++;
         else
         {
-            bIsFirst = sal_False;
             WriteColumn(nPrevColumn, nColsRepeated, nPrevIndex, bPrevIsVisible);
             if (pGroupColumns->IsGroupEnd(nColumn - 1))
             {
@@ -821,8 +816,7 @@ void ScXMLExport::ExportColumns(const sal_uInt16 nTable, const table::CellRangeA
             nColsRepeated = 1;
         }
     }
-    //if (nColsRepeated > 1 || bIsFirst)
-        WriteColumn(nPrevColumn, nColsRepeated, nPrevIndex, bPrevIsVisible);
+    WriteColumn(nPrevColumn, nColsRepeated, nPrevIndex, bPrevIsVisible);
     if (!bIsClosed)
         CloseHeaderColumn();
     if (pGroupColumns->IsGroupEnd(nColumn - 1))