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

[Noel Grandin (via logerrit)]

 sw/inc/IMark.hxx             |    4 ----
 sw/source/core/doc/docbm.cxx |    8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 796676e0a3010ab64f43a799d3fe7e7d1a64867e
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun May 26 15:42:59 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun May 26 22:14:13 2019 +0200

    inline IMark::StartsAfter
    
    Change-Id: I2b7e2df1ad3bfddb3182691720fa3aa1cdf21721
    Reviewed-on: https://gerrit.libreoffice.org/72984
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index ac033d72c61f..7c0a51f8427d 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 StartsAfter(const SwPosition& rPos) const
-                { return GetMarkStart() > rPos; }
             bool EndsBefore(const SwPosition& rPos) const
                 { return GetMarkEnd() < rPos; }
 
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index e242b32d74ea..7c27f481232e 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -175,7 +175,7 @@ namespace
         bool operator()(SwPosition const& rPos,
                         std::shared_ptr<sw::mark::IMark> const& pMark)
         {
-            return pMark->StartsAfter(rPos);
+            return pMark->GetMarkStart() > rPos;
         }
     };
 
@@ -291,7 +291,7 @@ namespace
         {
             // Once we reach a mark starting after the target pos
             // we do not need to continue
-            if(ppCurrentMark->get()->StartsAfter(rPos))
+            if(ppCurrentMark->get()->GetMarkStart() > rPos)
                 break;
             if(IDocumentMarkAccess::GetType(**ppCurrentMark) == eType)
             {
commit 18775b18917ff666260434a19326ab482219ba89
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun May 26 15:32:29 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun May 26 22:14:02 2019 +0200

    inline IMark::StartsBefore
    
    Change-Id: Ia4f4d57899821cf735a3babadd73bbd90e84afb0
    Reviewed-on: https://gerrit.libreoffice.org/72983
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index d4ac261ba5e0..ac033d72c61f 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 StartsBefore(const SwPosition& rPos) const
-                { return GetMarkStart() < rPos; }
             bool StartsAfter(const SwPosition& rPos) const
                 { return GetMarkStart() > rPos; }
             bool EndsBefore(const SwPosition& rPos) const
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 5f856cf4de0c..e242b32d74ea 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -164,7 +164,7 @@ namespace
         bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark,
                         SwPosition const& rPos)
         {
-            return pMark->StartsBefore(rPos);
+            return pMark->GetMarkStart() < rPos;
         }
     };
 
@@ -1045,7 +1045,7 @@ namespace sw { namespace mark
                 pMark->GetMarkStart(),
                 CompareIMarkStartsBefore());
         for ( ; it != m_vAllMarks.end(); ++it)
-            if (pMark->StartsBefore((*it)->GetMarkStart()))
+            if (pMark->GetMarkStart() < (*it)->GetMarkStart())
                 break;
             else if (it->get() == pMark)
             {