Fixed bug #36181

2854151c · Ilya Kirillov · a19d7821 · 2854151c
Commit 2854151c authored Oct 27, 2017 by Ilya Kirillov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

word/Editor/Search.js word/Editor/Search.js +2 -2

No files found.
--- a/word/Editor/Search.js
+++ b/word/Editor/Search.js
@@ -1243,7 +1243,7 @@ ParaRun.prototype.Search_GetId = function(bNext, bUseContentPos, ContentPos, Dep
            var Mark = this.SearchMarks[SPos];
            var MarkPos = Mark.SearchResult.StartPos.Get(Mark.Depth);

-            if ( MarkPos >= StartPos && MarkPos < NearPos )
+            if (Mark.SearchResult.ClassesS.length > 0 && this === Mark.SearchResult.ClassesS[Mark.SearchResult.ClassesS.length - 1] && MarkPos >= StartPos && MarkPos < NearPos)
            {
                NearElementId = Mark.SearchResult.Id;
                NearPos       = MarkPos;
@@ -1271,7 +1271,7 @@ ParaRun.prototype.Search_GetId = function(bNext, bUseContentPos, ContentPos, Dep
            var Mark = this.SearchMarks[SPos];
            var MarkPos = Mark.SearchResult.StartPos.Get(Mark.Depth);

-            if ( MarkPos < StartPos && MarkPos > NearPos )
+            if (Mark.SearchResult.ClassesS.length > 0 && this === Mark.SearchResult.ClassesS[Mark.SearchResult.ClassesS.length - 1] && MarkPos < StartPos && MarkPos > NearPos)
            {
                NearElementId = Mark.SearchResult.Id;
                NearPos       = MarkPos;