From c79cc07cbc75488de48a7d4d0a1dcd674fd29e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Mon, 24 Sep 2007 11:55:16 +0000 Subject: [PATCH] QBox.cpp: fix bug 4233 http://bugzilla.lyx.org/show_bug.cgi?id=4233 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@20461 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/QBox.cpp | 5 ++++- status.15x | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/frontends/qt4/QBox.cpp b/src/frontends/qt4/QBox.cpp index 18653245ab..d58155ecb0 100644 --- a/src/frontends/qt4/QBox.cpp +++ b/src/frontends/qt4/QBox.cpp @@ -376,7 +376,10 @@ void QBox::setInnerType(bool frameless, int i) dialog_->innerBoxCO->clear(); dialog_->innerBoxCO->addItem(qt_("Parbox")); dialog_->innerBoxCO->addItem(qt_("Minipage")); - dialog_->innerBoxCO->setCurrentIndex(i - 1); + if (i != 0) + dialog_->innerBoxCO->setCurrentIndex(i - 1); + else + dialog_->innerBoxCO->setCurrentIndex(i); } else { if (dialog_->innerBoxCO->count() == 2) i += 1; diff --git a/status.15x b/status.15x index 57ba771220..482aef7e0f 100644 --- a/status.15x +++ b/status.15x @@ -159,6 +159,9 @@ What's new typing a space after switching between 2 documents with the file->Open dialog (bug 4211). +- Fix bug in box dialog where the inner box was empty when switching + the box decoration (bug 4233). + * DOCUMENTATION