anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 13:48:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change updateLayout() to updateDocumentClass(), since that is what it

Browse Source 
does.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33682 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-03-08 20:37:11 +00:00
parent 2cb20b211c
commit 6f624ab79b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BufferView.cpp
View File

@ -899,14 +899,14 @@ bool BufferView::scrollToCursor(DocIterator const & dit, bool recenter)
} }
void BufferView::updateLayout(DocumentClass const * const oldlayout) void BufferView::updateDocumentClass(DocumentClass const * const olddc)
{ {
message(_("Converting document to new document class...")); message(_("Converting document to new document class..."));
StableDocIterator backcur(d->cursor_); StableDocIterator backcur(d->cursor_);
ErrorList & el = buffer_.errorList("Class Switch"); ErrorList & el = buffer_.errorList("Class Switch");
cap::switchBetweenClasses( cap::switchBetweenClasses(
oldlayout, buffer_.params().documentClassPtr(), olddc, buffer_.params().documentClassPtr(),
static_cast<InsetText &>(buffer_.inset()), el); static_cast<InsetText &>(buffer_.inset()), el);
setCursor(backcur.asDocIterator(&buffer_)); setCursor(backcur.asDocIterator(&buffer_));
@ -1179,7 +1179,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
<< unknown_tokens << " unknown token" << unknown_tokens << " unknown token"
<< (unknown_tokens == 1 ? "" : "s")); << (unknown_tokens == 1 ? "" : "s"));
} }
updateLayout(oldClass); updateDocumentClass(oldClass);
// We are most certainly here because of a change in the document // We are most certainly here because of a change in the document
// It is then better to make sure that all dialogs are in sync with // It is then better to make sure that all dialogs are in sync with
@ -1194,7 +1194,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
cur.recordUndoFullDocument(); cur.recordUndoFullDocument();
buffer_.params().clearLayoutModules(); buffer_.params().clearLayoutModules();
buffer_.params().makeDocumentClass(); buffer_.params().makeDocumentClass();
updateLayout(oldClass); updateDocumentClass(oldClass);
dr.update(Update::Force | Update::FitCursor); dr.update(Update::Force | Update::FitCursor);
break; break;
} }
@ -1211,7 +1211,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
cur.recordUndoFullDocument(); cur.recordUndoFullDocument();
buffer_.params().addLayoutModule(argument); buffer_.params().addLayoutModule(argument);
buffer_.params().makeDocumentClass(); buffer_.params().makeDocumentClass();
updateLayout(oldClass); updateDocumentClass(oldClass);
dr.update(Update::Force | Update::FitCursor); dr.update(Update::Force | Update::FitCursor);
break; break;
} }
@ -1234,7 +1234,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
cur.recordUndoFullDocument(); cur.recordUndoFullDocument();
buffer_.params().setBaseClass(argument); buffer_.params().setBaseClass(argument);
buffer_.params().makeDocumentClass(); buffer_.params().makeDocumentClass();
updateLayout(oldDocClass); updateDocumentClass(oldDocClass);
dr.update(Update::Force | Update::FitCursor); dr.update(Update::Force | Update::FitCursor);
break; break;
} }
@ -1250,7 +1250,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
LayoutFileList::get().reset(bc); LayoutFileList::get().reset(bc);
buffer_.params().setBaseClass(bc); buffer_.params().setBaseClass(bc);
buffer_.params().makeDocumentClass(); buffer_.params().makeDocumentClass();
updateLayout(oldClass); updateDocumentClass(oldClass);
dr.update(Update::Force | Update::FitCursor); dr.update(Update::Force | Update::FitCursor);
break; break;
} }

2
src/BufferView.h
View File

@ -333,7 +333,7 @@ private:
) const; ) const;
/// ///
void updateLayout(DocumentClass const * const oldlayout); void updateDocumentClass(DocumentClass const * const olddc);
/// ///
int width_; int width_;
/// ///