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

Cosmetic repairs to my updateLabels() changes, thanks to Andre's

Browse Source 
comments. Added comments per Pavel's suggestion.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32453 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-12-10 13:25:31 +00:00
parent 28ce123a18
commit 69666056ca
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Buffer.cpp
View File

@ -1417,9 +1417,7 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
{ {
LaTeXFeatures features(*this, params(), runparams); LaTeXFeatures features(*this, params(), runparams);
validate(features); validate(features);
// We are going to use some of this stuff ourselves, updateLabels(UpdateMaster, true);
// so make sure it is up to date.
updateLabels();
d->texrow.reset(); d->texrow.reset();
@ -3442,7 +3440,7 @@ void Buffer::setBuffersForInsets() const
} }
void Buffer::updateLabels(bool out, UpdateScope scope) const void Buffer::updateLabels(UpdateScope scope, bool out) const
{ {
// Use the master text class also for child documents // Use the master text class also for child documents
Buffer const * const master = masterBuffer(); Buffer const * const master = masterBuffer();
@ -3456,7 +3454,7 @@ void Buffer::updateLabels(bool out, UpdateScope scope) const
// If this is a child document start with the master // If this is a child document start with the master
if (master != this) { if (master != this) {
bufToUpdate.insert(this); bufToUpdate.insert(this);
master->updateLabels(out); master->updateLabels(UpdateMaster, out);
// Do this here in case the master has no gui associated with it. Then, // Do this here in case the master has no gui associated with it. Then,
// the TocModel is not updated and TocModel::toc_ is invalid (bug 5699). // the TocModel is not updated and TocModel::toc_ is invalid (bug 5699).
if (!master->gui_) if (!master->gui_)

12
src/Buffer.h
View File

@ -525,10 +525,16 @@ public:
// FIXME This really shouldn't be needed, but at the moment it's not // FIXME This really shouldn't be needed, but at the moment it's not
// clear how to do it just for the individual pieces we need. // clear how to do it just for the individual pieces we need.
void setBuffersForInsets() const; void setBuffersForInsets() const;
/// Updates screen labels and some other information associated with
/// insets and paragraphs. Actually, it's more like a general "recurse
/// through the Buffer" routine, that visits all the insets and paragraphs.
void updateLabels() const { updateLabels(UpdateMaster, false); }
/// \param scope: whether to start with the master document or just
/// do this one.
/// \param output: whether we are preparing for output.
void updateLabels(UpdateScope scope, bool output) const;
/// ///
void updateLabels(bool output = false, UpdateScope = UpdateMaster) const; void updateLabels(ParIterator & parit, bool output) const;
///
void updateLabels(ParIterator & parit, bool output = false) const;
/// Spellcheck starting from \p from. /// Spellcheck starting from \p from.
/// \p from initial position, will then points to the next misspelled /// \p from initial position, will then points to the next misspelled

2
src/insets/InsetInclude.cpp
View File

@ -1025,7 +1025,7 @@ void InsetInclude::updateLabels(ParIterator const & it, bool out)
{ {
Buffer const * const childbuffer = getChildBuffer(); Buffer const * const childbuffer = getChildBuffer();
if (childbuffer) { if (childbuffer) {
childbuffer->updateLabels(out, Buffer::UpdateChildOnly); childbuffer->updateLabels(Buffer::UpdateChildOnly, out);
return; return;
} }
if (!isListings(params())) if (!isListings(params()))