* src/tex2lyx/text.cpp

	(parse_box): Fix default height value (from Micha Feigin)

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

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index ade15f3f1818868de4ba216e345587ddfa4ad52b..c713ab1307989e5b0101484bb4f942cf13469348 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -591,9 +591,11 @@ void parse_box(Parser & p, ostream & os, unsigned flags, bool outer,
 {
        string position;
        string inner_pos;
-       string height_value = "0";
-       string height_unit = "pt";
-       string height_special = "none";
+       // We need to set the height to the LaTeX default of 1\\totalheight
+       // for the case when no height argument is given
+       string height_value = "1";
+       string height_unit = "in";
+       string height_special = "totalheight";
        string latex_height;
        if (p.next_token().asInput() == "[") {
                position = p.getArg('[', ']');