prevent crash when inserting minipage in table cell,

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

diff --git a/src/insets/insetbibitem.C b/src/insets/insetbibitem.C
index 0bd4e14c0cd1f199d60174912827c456202ff0d7..95b0f089ac6d672a2971f7ce4763e119a97d1547 100644 (file)
--- a/src/insets/insetbibitem.C
+++ b/src/insets/insetbibitem.C
@@ -17,14 +17,18 @@
 
 #include "frontends/font_metrics.h"
 
+#include "support/tostr.h"
 #include "support/lstrings.h"
 
+using namespace lyx::support;
 
 using std::max;
+using std::auto_ptr;
 
 
 int InsetBibitem::key_counter = 0;
-const string key_prefix = "key-";
+string const key_prefix = "key-";
+
 
 InsetBibitem::InsetBibitem(InsetCommandParams const & p)
        : InsetCommand(p), counter(1)
@@ -41,34 +45,36 @@ InsetBibitem::~InsetBibitem()
 }
 
 
-Inset * InsetBibitem::clone(Buffer const &, bool) const
+auto_ptr<InsetBase> InsetBibitem::clone() const
 {
        InsetBibitem * b = new InsetBibitem(params());
        b->setCounter(counter);
-       return b;
+       return auto_ptr<InsetBase>(b);
 }
 
 
 dispatch_result InsetBibitem::localDispatch(FuncRequest const & cmd)
 {
-       if (cmd.action != LFUN_BIBITEM_APPLY)
-               return UNDISPATCHED;
-
-       InsetCommandParams p;
-       InsetCommandMailer::string2params(cmd.argument, p);
-       if (p.getCmdName().empty())
-               return UNDISPATCHED;
-
-       if (view() && p.getContents() != params().getContents()) {
-               view()->ChangeCitationsIfUnique(params().getContents(),
-                                               p.getContents());
+       switch (cmd.action) {
+
+       case LFUN_INSET_EDIT:
+               InsetCommandMailer("bibitem", *this).showDialog(cmd.view());
+               return DISPATCHED;
+
+       case LFUN_INSET_MODIFY: {
+               InsetCommandParams p;
+               InsetCommandMailer::string2params(cmd.argument, p);
+               if (p.getCmdName().empty())
+                       return DISPATCHED;
+               setParams(p);
+               cmd.view()->updateInset(this);
+               cmd.view()->fitCursor();
+               return DISPATCHED;
        }
 
-       setParams(p);
-       if (view())
-               view()->updateInset(this, true);
-
-       return DISPATCHED;
+       default:
+               return InsetCommand::localDispatch(cmd);
+       }
 }
 
 
@@ -120,21 +126,8 @@ string const InsetBibitem::getScreenLabel(Buffer const *) const
 }
 
 
-void InsetBibitem::edit(BufferView *, int, int, mouse_button::state)
-{
-       InsetCommandMailer mailer("bibitem", *this);
-       mailer.showDialog();
-}
-
-
-void InsetBibitem::edit(BufferView * bv, bool)
-{
-       edit(bv, 0, 0, mouse_button::none);
-}
-
-
 // ale070405 This function maybe shouldn't be here. We'll fix this at 0.13.
-int bibitemMaxWidth(BufferView * bv, LyXFont const & font)
+int bibitemMaxWidth(BufferView * bv, LyXFont const &)
 {
        int w = 0;
        // Ha, now we are mainly at 1.2.0 and it is still here (Jug)
@@ -143,7 +136,8 @@ int bibitemMaxWidth(BufferView * bv, LyXFont const & font)
        ParagraphList::iterator end = bv->buffer()->paragraphs.end();
        for (; it != end; ++it) {
                if (it->bibitem()) {
-                       int const wx = it->bibitem()->width(bv, font);
+#warning metrics broken!
+                       int const wx = it->bibitem()->width();
                        if (wx > w)
                                w = wx;
                }
@@ -158,11 +152,12 @@ string const bibitemWidest(Buffer const * buffer)
        int w = 0;
        // Does look like a hack? It is! (but will change at 0.13)
 
-       InsetBibitem * bitem = 0;
+       InsetBibitem const * bitem = 0;
        LyXFont font;
 
-       ParagraphList::iterator it = buffer->paragraphs.begin();
-       ParagraphList::iterator end = buffer->paragraphs.end();
+       ParagraphList::const_iterator it = buffer->paragraphs.begin();
+       ParagraphList::const_iterator end = buffer->paragraphs.end();
+
        for (; it != end; ++it) {
                if (it->bibitem()) {
                        int const wx =