couple of small fixes (they are not even mine).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10291 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index ef1b893c71beb9bb5ce9c14c009476ac7dff12a2..32ccda9556be63a3547aa5c62719e98a1e948ea8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-17  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * text.C (readParToken): fix spelling.
+
 2005-07-17  Martin Vermeer  <martin.vermeer@hut.fi>
 
        * text2.C: fix counter update for DEPM problem reported by

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 87c15c0d39992e07bba44f33559b9231f3226e21..5e1761bedb451dda6a470b664bcfa225aaedacf0 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-17  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * QGraphics.C (update_contents): fix out of range access.
+
 2005-07-17  Michael Schmitt  <michqel.schmitt@teststep.org>
 
        * ui/QBibtexDialogBase.ui: fix typo

diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C
index 0efb4f76b3c7f62f70ae08f9b2533c9e96b03b17..4f6730c3c7282fd9e3f38be20247a13bc5e978b9 100644 (file)
--- a/src/frontends/qt2/QGraphics.C
+++ b/src/frontends/qt2/QGraphics.C
@@ -261,7 +261,8 @@ void QGraphics::update_contents()
                dialog_->widthUnit->insertItem(unit_name_gui[i], -1);
 
        if (!igp.scale.empty()
-               && !float_equal(convert<double>(igp.scale), 0.0, 0.05)) {
+           && !float_equal(convert<double>(igp.scale), 0.0, 0.05)
+           || igp.width.empty()) {
                dialog_->width->setText(toqstr(igp.scale));
                dialog_->widthUnit->setCurrentItem(0);
        } else {

diff --git a/src/text.C b/src/text.C
index 12a1985c121106c10fd8b52774979a3171a95322..b047b618e0667339bbecadd377aa2bc4790cdc73 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -180,7 +180,7 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
 
                if (!hasLayout) {
                        buf.error(ErrorItem(_("Unknown layout"),
-                       bformat(_("Layout '%1$s' does not exists in textclass '%2$s'\nTrying to use the default instead.\n"),
+                       bformat(_("Layout '%1$s' does not exist in textclass '%2$s'\nTrying to use the default instead.\n"),
                                layoutname, tclass.name()), par.id(), 0, par.size()));
                        layoutname = tclass.defaultLayoutName();
                }