anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix layout-related warning

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8835 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2004-07-05 14:34:50 +00:00
parent 2e0b9cd78d
commit db3c256d2a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BufferView_pimpl.C
View File

@ -338,7 +338,6 @@ void BufferView::Pimpl::setBuffer(Buffer * b)
// hidden. This should go here because some dialogs (eg ToC) // hidden. This should go here because some dialogs (eg ToC)
// require bv_->text. // require bv_->text.
owner_->getDialogs().updateBufferDependent(true); owner_->getDialogs().updateBufferDependent(true);
owner_->setLayout(bv_->text()->getPar(0).layout()->name());
} else { } else {
lyxerr[Debug::INFO] << " No Buffer!" << endl; lyxerr[Debug::INFO] << " No Buffer!" << endl;
// we are closing the buffer, use the first buffer as current // we are closing the buffer, use the first buffer as current
@ -353,6 +352,11 @@ void BufferView::Pimpl::setBuffer(Buffer * b)
owner_->updateLayoutChoice(); owner_->updateLayoutChoice();
owner_->updateWindowTitle(); owner_->updateWindowTitle();
// This is done after the layout combox has been populated
if (buffer_)
owner_->setLayout(cursor_.paragraph().layout()->name());
if (buffer_ && lyx::graphics::Previews::status() != LyXRC::PREVIEW_OFF) if (buffer_ && lyx::graphics::Previews::status() != LyXRC::PREVIEW_OFF)
lyx::graphics::Previews::get().generateBufferPreviews(*buffer_); lyx::graphics::Previews::get().generateBufferPreviews(*buffer_);
} }

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2004-07-05 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* BufferView_pimpl.C (setBuffer): set the layout combox value only
after it has been populated
2004-06-29 Jean-Marc Lasgouttes <lasgouttes@lyx.org> 2004-06-29 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* text2.C (insertInset): move cursor when inserting inset. * text2.C (insertInset): move cursor when inserting inset.