From 41f754c9752093d43ebd99268226c336bc27b7f7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Thu, 11 Nov 2004 12:32:53 +0000 Subject: [PATCH] A more general fix for bug 1682, also fixes off-by-one-errors in the frontend (combos) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9229 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 3 +++ src/lengthcommon.C | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 06a3694601..45ff4fa22a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,6 @@ +2004-11-11 Jürgen Spitzmüller + + * lengthcommon.C: a more general fix for bug 1682 2004-11-11 Alfredo Braunstein diff --git a/src/lengthcommon.C b/src/lengthcommon.C index ffb01bc566..fc1ea7017c 100644 --- a/src/lengthcommon.C +++ b/src/lengthcommon.C @@ -29,7 +29,7 @@ char const * const unit_name[] = { "text%", "col%", "page%", "line%", "theight%", "pheight%", "" }; -int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0])); +int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]) - 1); // the latex units char const * const unit_name_ltx[] = { @@ -61,7 +61,7 @@ char const * const unit_name_gui[] = { LyXLength::UNIT unitFromString(string const & data) { int i = 0; - while (i < num_units - 1 && data != unit_name[i]) + while (i < num_units && data != unit_name[i]) ++i; return static_cast(i); } -- 2.39.5