[LyX/master] Workaround for #7987: deleted text in change-tracking mode is not found in Advanced F&R any more.

[Richard Heck]

commit cb79658e54e63e6e11417982cd52f8edc1deaa6a
Author: Tommaso Cucinotta <tomm...@lyx.org>
Date:   Fri Mar 28 22:56:20 2014 +0000

    Workaround for #7987: deleted text in change-tracking mode is not found in 
Advanced F&R any more.

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 1b32ae3..0c10e19 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -787,11 +787,11 @@ static docstring stringifySearchBuffer(Buffer & buffer, 
FindAndReplaceOptions co
                        Paragraph const & par = buffer.paragraphs().at(pit);
                        LYXERR(Debug::FIND, "Adding to search string: '"
                               << par.asString(pos_type(0), par.size(),
-                                              AS_STR_INSETS | AS_STR_PLAINTEXT,
+                                              AS_STR_INSETS | 
AS_STR_SKIPDELETE | AS_STR_PLAINTEXT,
                                               &runparams)
                               << "'");
                        str += par.asString(pos_type(0), par.size(),
-                                           AS_STR_INSETS | AS_STR_PLAINTEXT,
+                                           AS_STR_INSETS | AS_STR_SKIPDELETE | 
AS_STR_PLAINTEXT,
                                            &runparams);
                }
        }
@@ -1044,7 +1044,7 @@ docstring stringifyFromCursor(DocIterator const & cur, 
int len)
                LYXERR(Debug::FIND, "Stringifying with cur: "
                       << cur << ", from pos: " << cur.pos() << ", end: " << 
end);
                return par.asString(cur.pos(), end,
-                       AS_STR_INSETS | AS_STR_PLAINTEXT,
+                       AS_STR_INSETS | AS_STR_SKIPDELETE | AS_STR_PLAINTEXT,
                        &runparams);
        } else if (cur.inMathed()) {
                docstring s;