anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid crash on exiting LyX while Adv Search is shown in full-screen mode.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37115 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Tommaso Cucinotta 2011-01-05 15:08:08 +00:00
parent 079d159c87
commit 78eecdabf8
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/frontends/qt4/FindAndReplace.cpp
View File

@ -315,17 +315,18 @@ docstring getQuestionString(FindAndReplaceOptions const & opt)
void FindAndReplaceWidget::findAndReplaceScope(FindAndReplaceOptions & opt)
{
view_.setBusy(true);
BufferView * bv = view_.documentBufferView();
if (!bv)
return;
Buffer * buf = &bv->buffer();
Buffer * buf_orig = &bv->buffer();
DocIterator cur_orig(bv->cursor());
int wrap_answer = -1;
ostringstream oss;
oss << opt;
FuncRequest cmd(LFUN_WORD_FINDADV, from_utf8(oss.str()));
BufferView * bv = view_.documentBufferView();
Buffer * buf = &bv->buffer();
Buffer * buf_orig = &bv->buffer();
DocIterator cur_orig(bv->cursor());
view_.setBusy(true);
if (opt.scope == FindAndReplaceOptions::S_ALL_MANUALS) {
vector<string> const & v = allManualsFiles();
if (std::find(v.begin(), v.end(), buf->absFileName()) == v.end()) {
@ -524,25 +525,28 @@ void FindAndReplaceWidget::on_replaceallPB_clicked()
void FindAndReplaceWidget::showEvent(QShowEvent * /* ev */)
{
Buffer & doc_buf = view_.documentBufferView()->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);
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);
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);
view_.setCurrentWorkArea(find_work_area_);
LYXERR(Debug::FIND, "Selecting entire find buffer");
dispatch(FuncRequest(LFUN_BUFFER_BEGIN));
dispatch(FuncRequest(LFUN_BUFFER_END_SELECT));
view_.setCurrentWorkArea(find_work_area_);
LYXERR(Debug::FIND, "Selecting entire find buffer");
dispatch(FuncRequest(LFUN_BUFFER_BEGIN));
dispatch(FuncRequest(LFUN_BUFFER_END_SELECT));
}
find_work_area_->installEventFilter(this);
replace_work_area_->installEventFilter(this);
}