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

A couple things noticed by Andre.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28578 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-02-21 21:49:56 +00:00
parent bf730bda7c
commit 90c64a5f5e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/LayoutModuleList.cpp
View File

@ -35,7 +35,7 @@ namespace lyx {
// moment. (Thanks to Philippe Charpentier for helping work out all
// the bugs---rgh.)
bool LayoutModuleList::adaptToBaseClass(LayoutFile const * const lay,
std::list<string> removedModules)
std::list<string> const & removedModules)
{
// first, we remove any modules the new document class itself provides,
// those it excludes, and those that conflict with ones it excludes.
@ -48,7 +48,7 @@ bool LayoutModuleList::adaptToBaseClass(LayoutFile const * const lay,
// loaded modules. it's a hassle that we have to do this now, since
// we just went through them a bit ago, but things might have changed
// with the loading of the default modules.
retval |= checkModuleConsistency(lay);
retval = (checkModuleConsistency(lay) || retval);
return retval;
}
@ -208,7 +208,8 @@ bool LayoutModuleList::removeBadModules(LayoutFile const * const lay)
// Perform a consistency check on the set of modules. We need to make
// sure that none of the modules exclude each other and that requires
// are satisfied.
bool LayoutModuleList::checkModuleConsistency(LayoutFile const * const lay) {
bool LayoutModuleList::checkModuleConsistency(LayoutFile const * const lay)
{
bool consistent = true;
LayoutModuleList oldModules = *this;
clear();

2
src/LayoutModuleList.h
View File

@ -65,7 +65,7 @@ public:
/// \return true if no changes had to be made, false if some did have
/// to be made.
bool adaptToBaseClass(LayoutFile const * const lay,
std::list<std::string> removedModules);
std::list<std::string> const & removedModules);
private:
/// Removes modules excluded by, provided by, etc, the base class.
/// \param lay The document class against which to check.