- InsetTabular.cpp: floats must not be inserted to tables, fixes #6844

- InsetCaption.cpp: margin notes and footnotes are not allowed in captions

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

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 10471841c727ece08e26e91f484decc2d93c54b3..c8b774c0bcfde857b7e3adb58ef39b6d0b80dc10 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -176,12 +176,14 @@ bool InsetCaption::insetAllowed(InsetCode code) const
 {
        switch (code) {
        // code that is not allowed in a caption
-       case FLOAT_CODE:
-       case TABULAR_CODE:
-       case WRAP_CODE:
        case CAPTION_CODE:
+       case FLOAT_CODE:
+       case FOOT_CODE:
        case NEWPAGE_CODE:
+       case MARGIN_CODE:
        case MATHMACRO_CODE:
+       case TABULAR_CODE:
+       case WRAP_CODE:
                return false;
        default:
                return InsetText::insetAllowed(code);

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 5712fb46544be606f5502e8ad47190e6fbe4ddba..806d8256f29f7c96a2e7d481f9983ce936e1e514 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3245,10 +3245,11 @@ void InsetTabular::setBuffer(Buffer & buf)
 
 bool InsetTabular::insetAllowed(InsetCode code) const
 {
-       switch (code)
-       {
+       switch (code) {
+       case FLOAT_CODE:
        case MARGIN_CODE:
        case MATHMACRO_CODE:
+       case WRAP_CODE:
                return false;
 
        case CAPTION_CODE: