sw/inc/IMark.hxx | 2 --
sw/source/core/crsr/crbm.cxx | 2 +-
sw/source/core/doc/docbm.cxx | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 2c94c6b4ad5416a62ce3a77d6e882aa4121fa1a6
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun May 26 15:55:43 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun May 26 22:14:31 2019 +0200
inline IMark::EndsBefore
Change-Id: Ia71a6c8758c08f6824588308dde4a581cf52030b
Reviewed-on: https://gerrit.libreoffice.org/72985
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 7c0a51f8427d..e9d00588bc27 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -64,8 +64,6 @@ namespace sw { namespace mark
{ return GetMarkStart() < rOther.GetMarkStart(); }
bool operator==(const IMark& rOther) const
{ return GetMarkStart() == rOther.GetMarkStart(); }
- bool EndsBefore(const SwPosition& rPos) const
- { return GetMarkEnd() < rPos; }
virtual OUString ToString( ) const =0;
virtual void dumpAsXml(xmlTextWriterPtr pWriter) const = 0;
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index 5aed657911e7..543ecabb3f3f 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -257,7 +257,7 @@ bool SwCursorShell::GoPrevBookmark()
// (we were only able to eliminate those starting
// behind the Cursor by the upper_bound(..)
// above)
- if(!(**ppMark).EndsBefore(*GetCursor()->GetPoint()))
+ if(!((**ppMark).GetMarkEnd() < *GetCursor()->GetPoint()))
continue;
if (sw::IsMarkHidden(*GetLayout(), **ppMark))
{
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 7c27f481232e..8f0dc5b90749 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -207,7 +207,7 @@ namespace
rMarks.begin(),
pCandidatesEnd,
back_inserter(vCandidates),
- [&rPos] (IDocumentMarkAccess::pMark_t const& rpMark) { return
!rpMark->EndsBefore(rPos); } );
+ [&rPos] (IDocumentMarkAccess::pMark_t const& rpMark) { return
!(rpMark->GetMarkEnd() < rPos); } );
// no candidate left => we are in front of the first mark or there are
none
if(vCandidates.empty()) return nullptr;
// return the highest (last) candidate using mark end ordering
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
