X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtextclass.C;h=cdda271a71d942a40660e246fcc891867197cc9d;hb=e7f4618bcce770369cf46335c2c7f0164b4b8857;hp=924fae7cc360c3cf760f183dd98c0fd7c8767770;hpb=8e6e970d7ba017dba14bdb821f4c4489665d947c;p=lyx.git diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C index 924fae7cc3..cdda271a71 100644 --- a/src/lyxtextclass.C +++ b/src/lyxtextclass.C @@ -65,7 +65,7 @@ private: }; -int const FORMAT = 2; +int const FORMAT = 3; bool layout2layout(FileName const & filename, FileName const & tempfile) @@ -822,12 +822,12 @@ void LyXTextClass::readCounter(LyXLex & lexrc) switch (static_cast(le)) { case CT_NAME: lexrc.next(); - name = lyx::from_ascii(lexrc.getString()); + name = from_ascii(lexrc.getString()); break; case CT_WITHIN: lexrc.next(); - within = lyx::from_ascii(lexrc.getString()); - if (within == lyx::from_ascii("none")) + within = from_ascii(lexrc.getString()); + if (within == "none") within.erase(); break; case CT_END: