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 eb22763941cbd5f033c84d2ce3b3a08cac9af448..95b0f089ac6d672a2971f7ce4763e119a97d1547 100644 (file)
--- a/src/insets/insetbibitem.C
+++ b/src/insets/insetbibitem.C
@@ -20,12 +20,14 @@
 #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)
@@ -43,22 +45,14 @@ InsetBibitem::~InsetBibitem()
 }
 
 
-Inset * InsetBibitem::clone(Buffer const &) const
+auto_ptr<InsetBase> InsetBibitem::clone() const
 {
        InsetBibitem * b = new InsetBibitem(params());
        b->setCounter(counter);
-       return b;
+       return auto_ptr<InsetBase>(b);
 }
 
 
-// Inset * InsetBibitem::clone(Buffer const &, bool) const
-// {
-//     InsetBibitem * b = new InsetBibitem(params());
-//     b->setCounter(counter);
-//     return b;
-// }
-
-
 dispatch_result InsetBibitem::localDispatch(FuncRequest const & cmd)
 {
        switch (cmd.action) {
@@ -72,20 +66,8 @@ dispatch_result InsetBibitem::localDispatch(FuncRequest const & cmd)
                InsetCommandMailer::string2params(cmd.argument, p);
                if (p.getCmdName().empty())
                        return DISPATCHED;
-
-               if (view() && p.getContents() != params().getContents()) {
-                       view()->ChangeCitationsIfUnique(params().getContents(),
-                                                       p.getContents());
-               }
-
                setParams(p);
                cmd.view()->updateInset(this);
-
-               // We need to do a redraw because the maximum
-               // InsetBibitem width could have changed
-#warning please check you mean repaint() not update(),
-#warning and whether the repaint() is needed at all
-               cmd.view()->repaint();
                cmd.view()->fitCursor();
                return DISPATCHED;
        }
@@ -145,7 +127,7 @@ string const InsetBibitem::getScreenLabel(Buffer const *) const
 
 
 // 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)
@@ -154,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;
                }
@@ -169,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 =