Another buffer pointer fix.

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

diff --git a/src/Text3.cpp b/src/Text3.cpp
index da7b62a95b666f930130037788553c9f030c694d..4f5d3dcf426a277795281bbd5957e2a3934495aa 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1675,7 +1675,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        setLayout(cur, tclass.defaultLayoutName());
                        ParagraphParameters p;
                        setParagraphs(cur, p);
-                       insertInset(cur, new InsetFloatList(to_utf8(cmd.argument())));
+                       // FIXME This should be simplified when InsetFloatList takes a 
+                       // Buffer in its constructor.
+                       InsetFloatList * ifl = new InsetFloatList(to_utf8(cmd.argument()));
+                       ifl->setBuffer(bv->buffer());
+                       insertInset(cur, ifl);
                        cur.posForward();
                } else {
                        lyxerr << "Non-existent float type: "

diff --git a/src/frontends/qt4/ButtonPolicy.cpp b/src/frontends/qt4/ButtonPolicy.cpp
index e2a3431b677332c2d7615d18050fcb069d774bd4..463c1611ea92163d70f43259fbc212666f00e6be 100644 (file)
--- a/src/frontends/qt4/ButtonPolicy.cpp
+++ b/src/frontends/qt4/ButtonPolicy.cpp
@@ -389,6 +389,7 @@ void ButtonPolicy::initNoRepeatedApplyReadOnly()
        state_machine_[VALID][SMI_READ_ONLY] = RO_VALID;
        // State::INVALID
        state_machine_[INVALID][SMI_INVALID] = INVALID;
+       state_machine_[INVALID][SMI_OKAY] = INVALID;
        state_machine_[INVALID][SMI_READ_WRITE] = INVALID;
        state_machine_[INVALID][SMI_VALID] = VALID;
        state_machine_[INVALID][SMI_RESTORE] = INITIAL;