Move \PassOptionsToPackage before the first package loaded

[lyx.git] / src / lyxfind.cpp

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index f4bf76b64f5da25b3ed1260f9e169e7a4a3f1e46..f98f525cbe7f072404e5301771b1aaeca37dcd11 100644 (file)
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -178,7 +178,7 @@ bool parse_bool(docstring & howto)
 }
 
 
-class MatchString : public binary_function<Paragraph, pos_type, int>
+class MatchString
 {
 public:
        MatchString(docstring const & s, bool cs, bool mw)
@@ -3030,9 +3030,9 @@ MatchResult MatchStringAdv::operator()(DocIterator const & cur, int len, bool at
               << ", inTexted=" << cur.inTexted());
        if (res == 0 || !at_begin || !opt.matchword || !cur.inTexted())
                return mres;
-        if ((len > 0) && (res < len)) {
+       if ((len > 0) && (res < len)) {
          mres.match_len = 0;
-          return mres;
+         return mres;
        }
        Paragraph const & par = cur.paragraph();
        bool ws_left = (cur.pos() > 0)
@@ -3044,18 +3044,18 @@ MatchResult MatchStringAdv::operator()(DocIterator const & cur, int len, bool at
        LYXERR(Debug::FIND,
               "cur.pos()=" << cur.pos() << ", res=" << res
               << ", separ: " << ws_left << ", " << ws_right
-               << ", len: " << len
+              << ", len: " << len
               << endl);
        if (ws_left && ws_right) {
-          // Check for word separators inside the found 'word'
-          for (int i = 0; i < len; i++) {
-            if (par.isWordSeparator(cur.pos() + i)) {
+         // Check for word separators inside the found 'word'
+         for (int i = 0; i < len; i++) {
+           if (par.isWordSeparator(cur.pos() + i)) {
              mres.match_len = 0;
-              return mres;
+             return mres;
            }
-          }
-          return mres;
-        }
+         }
+         return mres;
+       }
        mres.match_len = 0;
        return mres;
 }
@@ -3417,9 +3417,9 @@ int findForwardAdv(DocIterator & cur, MatchStringAdv & match)
                                                match_len_zero_count = 0;
                                }
                                else {
-                                        if (++match_len_zero_count > 3) {
-                                                LYXERR(Debug::FIND, "match_len2_zero_count: " << match_len_zero_count << ", match_len was " << match_len);
-                                        }
+                                       if (++match_len_zero_count > 3) {
+                                               LYXERR(Debug::FIND, "match_len2_zero_count: " << match_len_zero_count << ", match_len was " << match_len);
+                                       }
                                        break;
                                }
                        }