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

'Default'-->'Empty' in Bo's recent commit. Default means something else in the code.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25556 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2008-07-11 03:41:56 +00:00
parent 763ef015ce
commit f854295dab
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BufferParams.cpp
View File

@ -1425,7 +1425,7 @@ bool BufferParams::setBaseClass(string const & classname)
"textclass is selected from the document settings dialog."),
from_utf8(classname));
frontend::Alert::error(_("Document class not found"), s);
bcl.addDefaultClass(classname);
bcl.addEmptyClass(classname);
}
if (bcl[classname].load()) {

2
src/LayoutFile.cpp
View File

@ -194,7 +194,7 @@ void LayoutFileList::reset(LayoutFileIndex const & classname) {
}
LayoutFileIndex LayoutFileList::addDefaultClass(string const & textclass)
LayoutFileIndex LayoutFileList::addEmptyClass(string const & textclass)
{
if (haveClass(textclass))
return textclass;

2
src/LayoutFile.h
View File

@ -99,7 +99,7 @@ public:
void reset(LayoutFileIndex const & tc);
/// add a default textclass with all standard layouts.
LayoutFileIndex addDefaultClass(std::string const & textclass);
LayoutFileIndex addEmptyClass(std::string const & textclass);
/// add a textclass from user local directory.
/// \return the identifier for the loaded file, or else an

6
src/TextClass.cpp
View File

@ -245,7 +245,7 @@ bool TextClass::read(FileName const & filename, ReadType rt)
// we do this before loading any layout file, so that classes can
// override features of this layout if they should choose to do so.
if (rt == BASECLASS && !hasLayout(emptylayout_))
layoutlist_.push_back(createDefaultLayout(emptylayout_));
layoutlist_.push_back(createEmptyLayout(emptylayout_));
Lexer lexrc(textClassTags);
lexrc.setFile(filename);
@ -906,7 +906,7 @@ bool TextClass::hasLayout(docstring const & n) const
void TextClass::addLayoutIfNeeded(docstring const & n) const
{
if (!hasLayout(n))
layoutlist_.push_back(createDefaultLayout(n, true));
layoutlist_.push_back(createEmptyLayout(n, true));
}
@ -1037,7 +1037,7 @@ bool TextClass::isPlainLayout(Layout const & layout) const
}
Layout TextClass::createDefaultLayout(docstring const & name, bool unknown) const
Layout TextClass::createEmptyLayout(docstring const & name, bool unknown) const
{
static Layout * defaultLayout = NULL;

2
src/TextClass.h
View File

@ -131,7 +131,7 @@ public:
/** \param unknown Set to true if this layout is a default layout used to
* represent an unknown layout
*/
Layout createDefaultLayout(docstring const & name, bool unknown = false) const;
Layout createEmptyLayout(docstring const & name, bool unknown = false) const;
/// returns a special layout for use when we don't really want one,
/// e.g., in table cells
Layout const & emptyLayout() const