From 1de2bc6d79cd725fa9b6a6b8c2b7bc0e109e6ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Matox?= Date: Sun, 17 Jul 2005 15:27:49 +0000 Subject: [PATCH] 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 --- src/ChangeLog | 4 ++++ src/frontends/qt2/ChangeLog | 4 ++++ src/frontends/qt2/QGraphics.C | 3 ++- src/text.C | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index ef1b893c71..32ccda9556 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-07-17 Michael Schmitt + + * text.C (readParToken): fix spelling. + 2005-07-17 Martin Vermeer * text2.C: fix counter update for DEPM problem reported by diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 87c15c0d39..5e1761bedb 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2005-07-17 Jean-Marc Lasgouttes + + * QGraphics.C (update_contents): fix out of range access. + 2005-07-17 Michael Schmitt * ui/QBibtexDialogBase.ui: fix typo diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C index 0efb4f76b3..4f6730c3c7 100644 --- 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(igp.scale), 0.0, 0.05)) { + && !float_equal(convert(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 12a1985c12..b047b618e0 100644 --- 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(); }