Fix Helge's ERT-in-tabular bug

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

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 96de62db50872b413a12f2c29f625229305c5616..02035aa757fdf1cec92a776ae08ec5b20a4cb378 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-07  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * insettabular.C (getStatus): fix Helge's bug that a number of insets
+       including ERT could not be inserted in tabular.
+
 2005-08-02  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * insetinclude.C (string2params): fix typo in error message (bug 1963).

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 55db9855af21f78cbca0e8d98c3d57d2e4ded6ff..b98f1a32d738ad61d2e0badfc276ef719b8101b7 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -1003,7 +1003,8 @@ bool InsetTabular::getStatus(LCursor & cur, FuncRequest const & cmd,
                if (tablemode(cur)) {
                        status.enabled(false);
                        return true;
-               }
+               } else
+                       return cell(cur.idx())->getStatus(cur, cmd, status);
        }
 
        // disable in non-fixed-width cells
@@ -1014,7 +1015,8 @@ bool InsetTabular::getStatus(LCursor & cur, FuncRequest const & cmd,
                if (tabular.getPWidth(cur.idx()).zero()) {
                        status.enabled(false);
                        return true;
-               }
+               } else
+                       return cell(cur.idx())->getStatus(cur, cmd, status);
        }
 
        case LFUN_INSET_MODIFY: