prevent crash when inserting minipage in table cell,

[lyx.git] / src / insets / insetfloatlist.C

diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index eea56091cc6e0819b53fb7c11546f263f9f68886..449312d34755c639ae7e9fa9b35a262e99ce04c3 100644 (file)
--- a/src/insets/insetfloatlist.C
+++ b/src/insets/insetfloatlist.C
@@ -7,22 +7,24 @@
  *
  * Full author contact details are available in file CREDITS
  */
-#include <config.h>
 
+#include <config.h>
 
 #include "insetfloatlist.h"
 #include "FloatList.h"
 #include "LaTeXFeatures.h"
 #include "lyxlex.h"
-#include "frontends/Dialogs.h"
-#include "frontends/LyXView.h"
 #include "BufferView.h"
+#include "funcrequest.h"
 #include "buffer.h"
 #include "toc.h"
 #include "gettext.h"
 #include "debug.h"
+#include "Lsstream.h"
+
+#include "support/lstrings.h"
 
-#include "BoostFormat.h"
+using namespace lyx::support;
 
 using std::ostream;
 using std::endl;
@@ -30,8 +32,7 @@ using std::endl;
 
 InsetFloatList::InsetFloatList()
        : InsetCommand(InsetCommandParams())
-{
-}
+{}
 
 
 InsetFloatList::InsetFloatList(string const & type)
@@ -59,9 +60,9 @@ string const InsetFloatList::getScreenLabel(Buffer const * buf) const
 }
 
 
-Inset::Code InsetFloatList::lyxCode() const
+InsetOld::Code InsetFloatList::lyxCode() const
 {
-       return Inset::FLOAT_LIST_CODE;
+       return InsetOld::FLOAT_LIST_CODE;
 }
 
 
@@ -96,20 +97,20 @@ void InsetFloatList::read(Buffer const * buf, LyXLex & lex)
 }
 
 
-void InsetFloatList::edit(BufferView * bv, int, int, mouse_button::state)
-{
-       InsetCommandMailer mailer("toc", *this);
-       mailer.showDialog(bv);
-}
-
-
-void InsetFloatList::edit(BufferView * bv, bool)
+dispatch_result InsetFloatList::localDispatch(FuncRequest const & cmd)
 {
-       edit(bv, 0, 0, mouse_button::none);
+       switch (cmd.action) {
+               case LFUN_INSET_EDIT:
+                       InsetCommandMailer("toc", *this).showDialog(cmd.view());
+                       return DISPATCHED;
+               default:
+                       return InsetCommand::localDispatch(cmd);
+       }
 }
 
 
-int InsetFloatList::latex(Buffer const * buf, ostream & os, bool, bool) const
+int InsetFloatList::latex(Buffer const * buf, ostream & os,
+                         LatexRunParams const &) const
 {
        FloatList const & floats = buf->params.getLyXTextClass().floats();
        FloatList::const_iterator cit = floats[getCmdName()];
@@ -130,19 +131,9 @@ int InsetFloatList::latex(Buffer const * buf, ostream & os, bool, bool) const
                           << cit->second.listName() << "}\n";
                }
        } else {
-#if USE_BOOST_FORMAT
-               os << "%%\\listof{"
-                  << getCmdName()
-                  << "}{"
-                  << boost::format(_("List of %1$s")) % cit->second.name()
-                  << "}\n";
-#else
-               os << "%%\\listof{"
-                  << getCmdName()
-                  << "}{"
-                  << _("List of ") << cit->second.name()
+               os << "%%\\listof{" << getCmdName() << "}{"
+                  << bformat(_("List of %1$s"), cit->second.name())
                   << "}\n";
-#endif
        }
        return 1;
 }
@@ -152,7 +143,7 @@ int InsetFloatList::ascii(Buffer const * buffer, ostream & os, int) const
 {
        os << getScreenLabel(buffer) << "\n\n";
 
-       toc::asciiTocList(getCmdName(), buffer, os);
+       lyx::toc::asciiTocList(getCmdName(), buffer, os);
 
        os << "\n";
        return 0;