Enable the external inset to handle unknown templates gracefully.

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

diff --git a/src/insets/insetbibitem.C b/src/insets/insetbibitem.C
index 5a91ffd8d5c108ed4dcc8384d1de8b57b8576dae..24da31f2d5b28a2ccf5324059a43fb22f8524736 100644 (file)
--- a/src/insets/insetbibitem.C
+++ b/src/insets/insetbibitem.C
@@ -17,6 +17,7 @@
 
 #include "frontends/font_metrics.h"
 
+#include "support/tostr.h"
 #include "support/lstrings.h"
 
 
@@ -26,6 +27,7 @@ using std::max;
 int InsetBibitem::key_counter = 0;
 const string key_prefix = "key-";
 
+
 InsetBibitem::InsetBibitem(InsetCommandParams const & p)
        : InsetCommand(p), counter(1)
 {
@@ -41,7 +43,7 @@ InsetBibitem::~InsetBibitem()
 }
 
 
-Inset * InsetBibitem::clone(Buffer const &, bool) const
+Inset * InsetBibitem::clone() const
 {
        InsetBibitem * b = new InsetBibitem(params());
        b->setCounter(counter);
@@ -51,14 +53,17 @@ Inset * InsetBibitem::clone(Buffer const &, bool) const
 
 dispatch_result InsetBibitem::localDispatch(FuncRequest const & cmd)
 {
-       Inset::RESULT result = UNDISPATCHED;
-
        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())
-                       break;
+                       return DISPATCHED;
 
                if (view() && p.getContents() != params().getContents()) {
                        view()->ChangeCitationsIfUnique(params().getContents(),
@@ -74,15 +79,12 @@ dispatch_result InsetBibitem::localDispatch(FuncRequest const & cmd)
 #warning and whether the repaint() is needed at all
                cmd.view()->repaint();
                cmd.view()->fitCursor();
-
-               result = DISPATCHED;
+               return DISPATCHED;
        }
-       break;
+
        default:
-               result = InsetCommand::localDispatch(cmd);
+               return InsetCommand::localDispatch(cmd);
        }
-
-       return result;
 }
 
 
@@ -134,19 +136,6 @@ string const InsetBibitem::getScreenLabel(Buffer const *) const
 }
 
 
-void InsetBibitem::edit(BufferView * bv, int, int, mouse_button::state)
-{
-       InsetCommandMailer mailer("bibitem", *this);
-       mailer.showDialog(bv);
-}
-
-
-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)
 {
@@ -172,11 +161,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 =