From 561bf82e7a19b492b7079ec58745b3e1bb1176a8 Mon Sep 17 00:00:00 2001 From: John Levon Date: Tue, 18 Mar 2003 21:26:52 +0000 Subject: [PATCH] fix so it works on show. Angus, please check. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6531 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/controllers/ChangeLog | 4 ++++ src/frontends/controllers/ControlParagraph.C | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index ee12c777b3..7e31e130df 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,7 @@ +2003-03-18 John Levon + + * ControlParagraph.C: make reading of params succeed + 2003-03-13 Rob Lahaye * ControlChanges.[Ch]: ControlChanges::find() returns the bool diff --git a/src/frontends/controllers/ControlParagraph.C b/src/frontends/controllers/ControlParagraph.C index 05e9f3cadd..5d817d31e1 100644 --- a/src/frontends/controllers/ControlParagraph.C +++ b/src/frontends/controllers/ControlParagraph.C @@ -48,7 +48,7 @@ bool ControlParagraph::initialiseParams(string const & data) lex.next(); bool const accept = lex.getBool(); action = accept ? 1 : 2; - } else { + } else if (!token.empty()) { // Unrecognised token return false; } @@ -71,6 +71,9 @@ bool ControlParagraph::initialiseParams(string const & data) lex.next(); string const token = lex.getString(); + if (token.empty()) + continue; + int Int = 0; if (token == "\\alignpossible" || token == "\\aligndefault" || @@ -92,8 +95,9 @@ bool ControlParagraph::initialiseParams(string const & data) ininset_ = Int; } } - if (nset != 3) + if (nset != 3) { return false; + } // If "update", then set the activation status of the button controller if (action > 0) { -- 2.39.2