The Cursor argument here was not being used, so there is no need

[lyx.git] / src / frontends / qt4 / FindAndReplace.cpp

diff --git a/src/frontends/qt4/FindAndReplace.cpp b/src/frontends/qt4/FindAndReplace.cpp
index f0b73d753227e8b6175df3c70cc00f1e948a9774..9f7f567d21abf9f9136cc010cf59cce43e9b9bf4 100644 (file)
--- a/src/frontends/qt4/FindAndReplace.cpp
+++ b/src/frontends/qt4/FindAndReplace.cpp
@@ -21,6 +21,7 @@
 
 #include "BufferParams.h"
 #include "BufferList.h"
+#include "TextClass.h"
 #include "Cursor.h"
 #include "FuncRequest.h"
 #include "lyxfind.h"
@@ -45,22 +46,8 @@ namespace lyx {
 namespace frontend {
 
 
-/// Apply to buf the parameters supplied through bp
-static void ApplyParams(Buffer &buf, BufferParams const & bp) {
-       ostringstream ss;
-       ss << "\\begin_header\n";
-       bp.writeFile(ss);
-       ss << "\\end_header\n";
-       istringstream iss(ss.str());
-       Lexer lex;
-       lex.setStream(iss);
-       int unknown_tokens = buf.readHeader(lex);
-       LASSERT(unknown_tokens == 0, /* */);
-}
-
-
 FindAndReplaceWidget::FindAndReplaceWidget(GuiView & view)
-       :       view_(view)
+       : QTabWidget(&view), view_(view)
 {
        setupUi(this);
        find_work_area_->setGuiView(view_);
@@ -318,6 +305,11 @@ bool FindAndReplaceWidget::findAndReplaceScope(FindAndReplaceOptions & opt, bool
                                guiApp->currentView()->setBusy(true);
                        }
                        buf = theBufferList().getBuffer(fname);
+                       if (!buf) {
+                               view_.setBusy(false);
+                               return false;
+                       }
+
                        lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
                                                  buf->absFileName()));
                        bv = view_.documentBufferView();
@@ -340,7 +332,9 @@ bool FindAndReplaceWidget::findAndReplaceScope(FindAndReplaceOptions & opt, bool
 
                // No match found in current buffer (however old selection might have been replaced)
                // select next buffer in scope, if any
-               bool prompt = nextPrevBuffer(buf, opt);
+               bool const prompt = nextPrevBuffer(buf, opt);
+               if (!buf)
+                       break;
                if (prompt) {
                        if (wrap_answer != -1)
                                break;
@@ -482,25 +476,28 @@ void FindAndReplaceWidget::on_replaceallPB_clicked()
 }
 
 
+/** Copy selected elements from bv's BufferParams to the dest_bv's one
+ ** We don't want to copy'em all, e.g., not the default master **/
+static void copy_params(BufferView const & bv, BufferView & dest_bv) {
+       Buffer const & doc_buf = bv.buffer();
+       BufferParams const & doc_bp = doc_buf.params();
+       string const & lang = doc_bp.language->lang();
+       string const & doc_class = doc_bp.documentClass().name();
+       Buffer & dest_buf = dest_bv.buffer();
+       dest_buf.params().setLanguage(lang);
+       dest_buf.params().setBaseClass(doc_class);
+       dest_buf.params().makeDocumentClass();
+       dest_bv.cursor().current_font.setLanguage(doc_bp.language);
+}
+
+
 void FindAndReplaceWidget::showEvent(QShowEvent * /* ev */)
 {
        LYXERR(Debug::DEBUG, "showEvent()" << endl);
        BufferView * bv = view_.documentBufferView();
        if (bv) {
-               Buffer & doc_buf = bv->buffer();
-               BufferParams & doc_bp = doc_buf.params();
-               Buffer & find_buf = find_work_area_->bufferView().buffer();
-               LYXERR(Debug::FIND, "Applying document params to find buffer");
-               ApplyParams(find_buf, doc_bp);
-               Buffer & replace_buf = replace_work_area_->bufferView().buffer();
-               LYXERR(Debug::FIND, "Applying document params to replace buffer");
-               ApplyParams(replace_buf, doc_bp);
-
-               string lang = doc_bp.language->lang();
-               LYXERR(Debug::FIND, "Setting current editing language to " << lang << endl);
-               FuncRequest cmd(LFUN_LANGUAGE, lang);
-               find_buf.text().dispatch(find_work_area_->bufferView().cursor(), cmd);
-               replace_buf.text().dispatch(replace_work_area_->bufferView().cursor(), cmd);
+               copy_params(*bv, find_work_area_->bufferView());
+               copy_params(*bv, replace_work_area_->bufferView());
        }
 
        find_work_area_->installEventFilter(this);