anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Buffer.cpp:

Browse Source 
- rewrite getUsedBranches() with an InsetIterator approach.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30465 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2009-07-11 08:29:30 +00:00
parent 808dfaabea
commit c650dcd540
1 changed files with 20 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/Buffer.cpp
View File

@ -2390,51 +2390,27 @@ void Buffer::updateMacros() const
void Buffer::getUsedBranches(std::list<docstring> & result, bool const from_master) const
{
// Iterate over buffer, starting with first paragraph
// The scope must be bigger than any lookup DocIterator
// later. For the global lookup, lastpit+1 is used, hence
// we use lastpit+2 here.
DocIterator it = par_iterator_begin();
DocIterator scope = it;
scope.pit() = scope.lastpit() + 2;
pit_type lastpit = it.lastpit();
while (it.pit() <= lastpit) {
Paragraph & par = it.paragraph();
// iterate over the insets of the current paragraph
InsetList const & insets = par.insetList();
InsetList::const_iterator iit = insets.begin();
InsetList::const_iterator end = insets.end();
for (; iit != end; ++iit) {
it.pos() = iit->pos;
if (iit->inset->lyxCode() == BRANCH_CODE) {
// get buffer of external file
InsetBranch const & br =
static_cast<InsetBranch const &>(*iit->inset);
docstring const name = br.branch();
if (!from_master && !params().branchlist().find(name))
result.push_back(name);
else if (from_master && !masterBuffer()->params().branchlist().find(name))
result.push_back(name);
continue;
}
// is it an external file?
if (iit->inset->lyxCode() == INCLUDE_CODE) {
// get buffer of external file
InsetInclude const & inset =
static_cast<InsetInclude const &>(*iit->inset);
Buffer * child = inset.getChildBuffer();
if (!child)
continue;
child->getUsedBranches(result, true);
}
InsetIterator it = inset_iterator_begin(inset());
InsetIterator const end = inset_iterator_end(inset());
for (; it != end; ++it) {
if (it->lyxCode() == BRANCH_CODE) {
InsetBranch & br = static_cast<InsetBranch &>(*it);
docstring const name = br.branch();
if (!from_master && !params().branchlist().find(name))
result.push_back(name);
else if (from_master && !masterBuffer()->params().branchlist().find(name))
result.push_back(name);
continue;
}
if (it->lyxCode() == INCLUDE_CODE) {
// get buffer of external file
InsetInclude const & ins =
static_cast<InsetInclude const &>(*it);
Buffer * child = ins.getChildBuffer();
if (!child)
continue;
child->getUsedBranches(result, true);
}
// next paragraph
it.pit()++;
it.pos() = 0;
}
// remove duplicates
result.unique();