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

Tor Lillqvist tml at collabora.com
Thu Jun 29 12:54:19 UTC 2017


 sc/inc/table.hxx               |    4 ++--
 sc/source/core/data/table1.cxx |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 328bfe965ef40d740ffc25a3e2b98974d5dde783
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jun 29 15:44:27 2017 +0300

    ScTable::VisibleDataCellIterator::ROW_NOT_FOUND can be constexpr and private
    
    Change-Id: Iee866c10dad9e401b5c507849efa11d877177357

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index c936a38db0f4..38b958478824 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -1183,9 +1183,9 @@ private:
      */
     class VisibleDataCellIterator
     {
-    public:
-        static SCROW ROW_NOT_FOUND;
+        static constexpr SCROW ROW_NOT_FOUND = -1;
 
+    public:
         explicit VisibleDataCellIterator(ScFlatBoolRowSegments& rRowSegs, ScColumn& rColumn);
         ~VisibleDataCellIterator();
 
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 1e9a50e05ac4..3009f8ee62b4 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -2088,8 +2088,6 @@ void ScTable::RestorePrintRanges( const ScPrintSaverTab& rSaveTab )
     UpdatePageBreaks(nullptr);
 }
 
-SCROW ScTable::VisibleDataCellIterator::ROW_NOT_FOUND = -1;
-
 ScTable::VisibleDataCellIterator::VisibleDataCellIterator(ScFlatBoolRowSegments& rRowSegs, ScColumn& rColumn) :
     mrRowSegs(rRowSegs),
     mrColumn(rColumn),


More information about the Libreoffice-commits mailing list