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

Noel Grandin noel at peralex.com
Thu Mar 10 08:52:36 UTC 2016


 sc/inc/segmenttree.hxx              |    4 ++--
 sc/source/core/data/segmenttree.cxx |   12 ++++++------
 sc/source/core/data/table2.cxx      |    6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 0f0c7d55f5ca96d1fdfe55b722bd272f95aa3ebd
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Mar 10 10:45:25 2016 +0200

    rename findLastNotOf -> findLastTrue
    
    Change-Id: I7b74c7f947e9bbca8c663cacf027712621511ea6

diff --git a/sc/inc/segmenttree.hxx b/sc/inc/segmenttree.hxx
index 4e64a53..7e8025c 100644
--- a/sc/inc/segmenttree.hxx
+++ b/sc/inc/segmenttree.hxx
@@ -73,7 +73,7 @@ public:
     void removeSegment(SCROW nRow1, SCROW nRow2);
     void insertSegment(SCROW nRow, SCROW nSize, bool bSkipStartBoundary);
 
-    SCROW findLastNotOf() const;
+    SCROW findLastTrue() const;
 
 private:
     ::std::unique_ptr<ScFlatBoolSegmentsImpl> mpImpl;
@@ -141,7 +141,7 @@ public:
     void removeSegment(SCROW nRow1, SCROW nRow2);
     void insertSegment(SCROW nRow, SCROW nSize, bool bSkipStartBoundary);
 
-    SCROW findLastNotOf(sal_uInt16 nValue) const;
+    SCROW findLastTrue(sal_uInt16 nValue) const;
 
     void enableTreeSearch(bool bEnable);
 
diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx
index 288a8dc..563689a 100644
--- a/sc/source/core/data/segmenttree.cxx
+++ b/sc/source/core/data/segmenttree.cxx
@@ -52,7 +52,7 @@ public:
     void removeSegment(SCCOLROW nPos1, SCCOLROW nPos2);
     void insertSegment(SCCOLROW nPos, SCCOLROW nSize, bool bSkipStartBoundary);
 
-    SCROW findLastNotOf(ValueType nValue) const;
+    SCROW findLastTrue(ValueType nValue) const;
 
     // range iteration
     bool getFirst(RangeData& rData);
@@ -192,7 +192,7 @@ void ScFlatSegmentsImpl<_ValueType, _ExtValueType>::insertSegment(SCCOLROW nPos,
 }
 
 template<typename _ValueType, typename _ExtValueType>
-SCCOLROW ScFlatSegmentsImpl<_ValueType, _ExtValueType>::findLastNotOf(ValueType nValue) const
+SCCOLROW ScFlatSegmentsImpl<_ValueType, _ExtValueType>::findLastTrue(ValueType nValue) const
 {
     SCCOLROW nPos = numeric_limits<SCCOLROW>::max(); // position not found.
     typename fst_type::const_reverse_iterator itr = maSegments.rbegin(), itrEnd = maSegments.rend();
@@ -378,9 +378,9 @@ void ScFlatBoolRowSegments::insertSegment(SCROW nRow, SCROW nSize, bool bSkipSta
     mpImpl->insertSegment(static_cast<SCCOLROW>(nRow), static_cast<SCCOLROW>(nSize), bSkipStartBoundary);
 }
 
-SCROW ScFlatBoolRowSegments::findLastNotOf() const
+SCROW ScFlatBoolRowSegments::findLastTrue() const
 {
-    return static_cast<SCROW>(mpImpl->findLastNotOf(false));
+    return static_cast<SCROW>(mpImpl->findLastTrue(false));
 }
 
 ScFlatBoolColSegments::ScFlatBoolColSegments() :
@@ -506,9 +506,9 @@ void ScFlatUInt16RowSegments::insertSegment(SCROW nRow, SCROW nSize, bool bSkipS
     mpImpl->insertSegment(static_cast<SCCOLROW>(nRow), static_cast<SCCOLROW>(nSize), bSkipStartBoundary);
 }
 
-SCROW ScFlatUInt16RowSegments::findLastNotOf(sal_uInt16 nValue) const
+SCROW ScFlatUInt16RowSegments::findLastTrue(sal_uInt16 nValue) const
 {
-    return static_cast<SCROW>(mpImpl->findLastNotOf(nValue));
+    return static_cast<SCROW>(mpImpl->findLastTrue(nValue));
 }
 
 void ScFlatUInt16RowSegments::enableTreeSearch(bool bEnable)
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index fd3d02c..e5e7aef 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -3273,14 +3273,14 @@ SCROW ScTable::GetLastFlaggedRow() const
 
     if (mpHiddenRows)
     {
-        SCROW nRow = mpHiddenRows->findLastNotOf();
+        SCROW nRow = mpHiddenRows->findLastTrue();
         if (ValidRow(nRow))
             nLastFound = ::std::max(nLastFound, nRow);
     }
 
     if (mpFilteredRows)
     {
-        SCROW nRow = mpFilteredRows->findLastNotOf();
+        SCROW nRow = mpFilteredRows->findLastTrue();
         if (ValidRow(nRow))
             nLastFound = ::std::max(nLastFound, nRow);
     }
@@ -3311,7 +3311,7 @@ SCROW ScTable::GetLastChangedRow() const
     // Find the last row position where the height is NOT the standard row
     // height.
     // KOHEI: Test this to make sure it does what it's supposed to.
-    SCROW nLastHeight = mpRowHeights->findLastNotOf(ScGlobal::nStdRowHeight);
+    SCROW nLastHeight = mpRowHeights->findLastTrue(ScGlobal::nStdRowHeight);
     if (!ValidRow(nLastHeight))
         nLastHeight = 0;
 


More information about the Libreoffice-commits mailing list