fix width of unconstrained cells in insettabular

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

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index fb7c0e01be72fb421f0db0b16bf45e7303e9007f..c95c23cfbd4a42facaac2176ff3409bc0684658c 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-14  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
+       * insettabular.C (metrics): when the width of a cell is zero(),
+       let it use as much space as it can
+
        * insettext.C (editXY): compilation fix
 
        * insetinclude.C (priv_dispatch): fix showing dialog on mouse

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 09c47927ecc00e97dc7922b90148de367fc21a16..ff0d19144b99097dc9e162d719cdae11829c3544 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -235,8 +235,10 @@ void InsetTabular::metrics(MetricsInfo & mi, Dimension & dim) const
                        ++cell;
                        Dimension dim;
                        MetricsInfo m = mi;
-                       m.base.textwidth =
-                               tabular.column_info[j].p_width.inPixels(mi.base.textwidth);
+                       LyXLength p_width = tabular.column_info[j].p_width;
+                       if (!p_width.zero()) {
+                               m.base.textwidth = p_width.inPixels(mi.base.textwidth);
+                       }
                        tabular.getCellInset(cell).metrics(m, dim);
                        maxAsc  = max(maxAsc, dim.asc);
                        maxDesc = max(maxDesc, dim.des);