From b15a9ade28626b1b2e331ca461d979a8d635bfca Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sat, 27 Jan 2007 17:22:58 +0000 Subject: [PATCH] Fix bug 2182: LyX should default unknown classes to article class * src/bufferparams.C (BufferParams::readToken): If the text class is unknown, use the same code as in the constructor to set a default git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16888 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/bufferparams.C | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/bufferparams.C b/src/bufferparams.C index dff424a9af..a3af1079a8 100644 --- a/src/bufferparams.C +++ b/src/bufferparams.C @@ -236,9 +236,18 @@ SpaceTranslator const & spacetranslator() return translator; } -// ends annonym namespace + +textclass_type defaultTextclass() +{ + // Initialize textclass to point to article. if `first' is + // true in the returned pair, then `second' is the textclass + // number; if it is false, second is 0. In both cases, second + // is what we want. + return textclasslist.numberOfClass("article").second; } +} // anon namespace + class BufferParams::Impl { @@ -282,12 +291,7 @@ void BufferParams::MemoryTraits::destroy(BufferParams::Impl * ptr) BufferParams::BufferParams() - : // Initialize textclass to point to article. if `first' is - // true in the returned pair, then `second' is the textclass - // number; if it is false, second is 0. In both cases, second - // is what we want. - textclass(textclasslist.numberOfClass("article").second), - pimpl_(new Impl) + : textclass(defaultTextclass()), pimpl_(new Impl) { paragraph_separation = PARSEP_INDENT; quotes_language = InsetQuotes::EnglishQ; @@ -422,7 +426,7 @@ string const BufferParams::readToken(LyXLex & lex, string const & token) if (pp.first) { textclass = pp.second; } else { - textclass = 0; + textclass = defaultTextclass(); return classname; } } -- 2.39.5