[Libreoffice-commits] core.git: sc/inc sc/source
Tor Lillqvist
tml at collabora.com
Thu Jun 29 12:16:36 UTC 2017
sc/inc/dociter.hxx | 2 +-
sc/source/core/data/dociter.cxx | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 68c1a7ba05c4a86fd85679e1c38a23eeba653bcc
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Jun 29 14:30:26 2017 +0300
ScRowBreakIterator::NOT_FOUND can be constexpr
Change-Id: I33310e400ba8cdb15669704d96de8a3dbbe43be1
Reviewed-on: https://gerrit.libreoffice.org/39386
Reviewed-by: Tor Lillqvist <tml at collabora.com>
Tested-by: Tor Lillqvist <tml at collabora.com>
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 04d04b60e29f..b0270c44f907 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -546,7 +546,7 @@ public:
class ScRowBreakIterator
{
public:
- static SCROW NOT_FOUND;
+ static constexpr SCROW NOT_FOUND = -1;
explicit ScRowBreakIterator(::std::set<SCROW>& rBreaks);
SCROW first();
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 989534a67527..11290eb1d94c 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -2692,8 +2692,6 @@ const ScPatternAttr* ScAttrRectIterator::GetNext( SCCOL& rCol1, SCCOL& rCol2,
return nullptr; // Nothing anymore
}
-SCROW ScRowBreakIterator::NOT_FOUND = -1;
-
ScRowBreakIterator::ScRowBreakIterator(set<SCROW>& rBreaks) :
mrBreaks(rBreaks),
maItr(rBreaks.begin()), maEnd(rBreaks.end())
More information about the Libreoffice-commits
mailing list