The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit 92a2e179035a9c67bb042a3b6eac00a72d1ef862
Merge: 472732f c8000f9
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sat May 25 13:52:38 2013 +0200
Merge branch 'master' of git.lyx.org:lyx
commit 472732f92d7287c47ff1003094df5f6826c15c2e
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sat May 25 13:52:09 2013 +0200
GuiBox.cpp: addendum to [f04c7711/lyxgit]
- this was forgotten to commit;
(without this we would get invalid LaTeX code when changing in the box
dialog a makebox without a width to a minipage and press apply - a makebox
required to specify a width, at least an invisible one like "0cm")
diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp
index 90f5659..afca9ab 100644
--- a/src/frontends/qt4/GuiBox.cpp
+++ b/src/frontends/qt4/GuiBox.cpp
@@ -378,6 +378,9 @@ docstring GuiBox::dialogToParams() const
params.width = Length(value.toDouble(), Length::IN);
} else {
params.special = "none";
+ // we must specify a valid length in this case
+ if (value.isEmpty())
+ widthED->setText("0");
params.width = Length(widgetsToLength(widthED,
widthUnitsLC));
}
} else {
-----------------------------------------------------------------------
Summary of changes:
src/frontends/qt4/GuiBox.cpp | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
hooks/post-receive
--
The LyX Source Repository
