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
This commit is contained in:
José Matox 2005-07-17 15:27:49 +00:00
parent 6768d3a148
commit 1de2bc6d79
4 changed files with 11 additions and 2 deletions

View File

@ -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> 2005-07-17 Martin Vermeer <martin.vermeer@hut.fi>
* text2.C: fix counter update for DEPM problem reported by * text2.C: fix counter update for DEPM problem reported by

View File

@ -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> 2005-07-17 Michael Schmitt <michqel.schmitt@teststep.org>
* ui/QBibtexDialogBase.ui: fix typo * ui/QBibtexDialogBase.ui: fix typo

View File

@ -261,7 +261,8 @@ void QGraphics::update_contents()
dialog_->widthUnit->insertItem(unit_name_gui[i], -1); dialog_->widthUnit->insertItem(unit_name_gui[i], -1);
if (!igp.scale.empty() 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_->width->setText(toqstr(igp.scale));
dialog_->widthUnit->setCurrentItem(0); dialog_->widthUnit->setCurrentItem(0);
} else { } else {

View File

@ -180,7 +180,7 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
if (!hasLayout) { if (!hasLayout) {
buf.error(ErrorItem(_("Unknown layout"), 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.name()), par.id(), 0, par.size()));
layoutname = tclass.defaultLayoutName(); layoutname = tclass.defaultLayoutName();
} }