[Libreoffice-commits] core.git: 6 commits - sc/inc sc/source

[Tor Lillqvist]

 sc/inc/dociter.hxx              |    1 -
 sc/source/core/data/column.cxx  |    5 ++---
 sc/source/core/data/column3.cxx |    5 +----
 sc/source/core/data/dociter.cxx |    2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit bfe4ea0d11d3ca83eed00b71394072c6049d7566
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 25 07:20:56 2013 +0300

    WaE: private field 'mnIndex' is not used
    
    Change-Id: If8c9b4bf1041881bb8fb92c51e2bce22909147c5

diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 9458aae..23e310d 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -198,7 +198,6 @@ class ScCellIterator
     ScAddress maCurPos;
 
     PositionType maCurColPos;
-    SCSIZE mnIndex;
     bool mbSubTotal;
 
     ScRefCellValue maCurCell;
commit 022c54742e7997bf46a608f1ab0b500f2537f7f5
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 25 07:19:41 2013 +0300

    WaE: private field 'mrCells' is not used
    
    Change-Id: I0ab3fabb82c839f5194b0e20eb834dd86635a609

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 1aae1e5..11c4474 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1831,13 +1831,12 @@ namespace {
 class StrCellIterator
 {
     typedef std::pair<sc::CellStoreType::const_iterator,size_t> PosType;
-    const sc::CellStoreType& mrCells;
     PosType maPos;
     sc::CellStoreType::const_iterator miBeg;
     sc::CellStoreType::const_iterator miEnd;
 public:
     StrCellIterator(const sc::CellStoreType& rCells, SCROW nStart) :
-        mrCells(rCells), maPos(rCells.position(nStart)), miBeg(rCells.begin()), miEnd(rCells.end()) {}
+        maPos(rCells.position(nStart)), miBeg(rCells.begin()), miEnd(rCells.end()) {}
 
     bool valid() const { return (maPos.first != miEnd); }
 
commit ab86388c85f085adfe1edfe21a8ee8500a68449f
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 25 07:18:21 2013 +0300

    WaE: private field 'mbDateTime' is not used
    
    Change-Id: I29967aa15b879cc96cccb686814e594526b200d5

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index c85f914..1aae1e5 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -502,7 +502,6 @@ class DeleteAreaHandler
     sc::SingleColumnSpanSet maDeleteRanges;
 
     bool mbNumeric:1;
-    bool mbDateTime:1;
     bool mbString:1;
     bool mbFormula:1;
 
@@ -510,7 +509,6 @@ public:
     DeleteAreaHandler(ScDocument& rDoc, sal_uInt16 nDelFlag) :
         mrDoc(rDoc),
         mbNumeric(nDelFlag & IDF_VALUE),
-        mbDateTime(nDelFlag & IDF_DATETIME),
         mbString(nDelFlag & IDF_STRING),
         mbFormula(nDelFlag & IDF_FORMULA) {}
 
commit a31cea1be6bcad3d823ebecd7456ecb76368ed10
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 25 07:17:05 2013 +0300

    WaE: implicit conversion of NULL constant to 'bool'
    
    Change-Id: I1cbfa318e75ac5c86c0c7d2dbc033601fec3d46c

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 3fa15cf..b5c36b8 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1132,7 +1132,7 @@ bool ScQueryCellIterator::GetThis()
             do
             {
                 if ( ++nCol > mpParam->nCol2 )
-                    return NULL; // Over and out
+                    return false; // Over and out
                 if ( bAdvanceQuery )
                 {
                     AdvanceQueryParamEntryField();
commit 88d953565b44ccc4b3c00e1d0e343a91cb879313
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 25 07:15:56 2013 +0300

    WaE: private field 'mrAttrs' is not used
    
    Change-Id: I3b87820eee8182e6c4b36d62acfe90cabd830c86

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 9dc41b1..8cc4786 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2499,12 +2499,11 @@ struct ResetChangedHandler
 class FindEditCellsHandler
 {
     ScColumn& mrColumn;
-    sc::CellTextAttrStoreType& mrAttrs;
     sc::CellTextAttrStoreType::iterator miAttrPos;
 
 public:
     FindEditCellsHandler(ScColumn& rColumn, sc::CellTextAttrStoreType& rAttrs) :
-        mrColumn(rColumn), mrAttrs(rAttrs), miAttrPos(rAttrs.begin()) {}
+        mrColumn(rColumn), miAttrPos(rAttrs.begin()) {}
 
     bool operator() (size_t, const EditTextObject*)
     {
commit 3c87f574f7487d94f05cd95ac1cc26a4953dc6ec
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 25 07:14:42 2013 +0300

    WaE: unused variable 'itEnd'
    
    Change-Id: Idec79adce1f4bbb4003b3e8fb76a1f4a40fcc13f

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index bd1eeae..9dc41b1 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1174,7 +1174,7 @@ bool ScColumn::TestInsertRow( SCROW nStartRow, SCSIZE nSize ) const
 
     // Find the position of the last non-empty cell below nStartRow.
     size_t nLastNonEmptyRow = MAXROW;
-    sc::CellStoreType::const_reverse_iterator it = maCells.rbegin(), itEnd = maCells.rend();
+    sc::CellStoreType::const_reverse_iterator it = maCells.rbegin();
     if (it->type == sc::element_type_empty)
         nLastNonEmptyRow -= it->size;