#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)
}
-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) {
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;
}
// 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)
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;
}
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 =