fix crash due to invalidated iterator

[lyx.git] / src / frontends / controllers / ControlCitation.C

diff --git a/src/frontends/controllers/ControlCitation.C b/src/frontends/controllers/ControlCitation.C
index 3b22dd7c98bd26110fbcf7c9e281cf2567b9a2a1..e7d599f2ee66f9cbda43f46a34ae7aa86dd157ff 100644 (file)
--- a/src/frontends/controllers/ControlCitation.C
+++ b/src/frontends/controllers/ControlCitation.C
@@ -1,77 +1,74 @@
-/* This file is part of
- * ======================================================
- *
- *           LyX, The Document Processor
- *
- *           Copyright 2001 The LyX Team.
+/**
+ * \file ControlCitation.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ======================================================
+ * \author Angus Leeming
  *
- * \file ControlCitation.C
- * \author Angus Leeming <a.leeming@ic.ac.uk>
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
-#include <algorithm>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "ViewBase.h"
-#include "ButtonControllerBase.h"
 #include "ControlCitation.h"
-#include "buffer.h"
-#include "Dialogs.h"
-#include "frontends/LyXView.h"
 
-// need to #include this in _one_ of the ControlCommand-derived classses in
-// order to instantiate
-// ControlInset<InsetCommand, InsetCommandParams>::showInset
-// ControlInset<InsetCommand, InsetCommandParams>::createInset
-#include "ControlInset.tmpl"
+#include "buffer.h"
+#include "bufferparams.h"
+#include "debug.h" // temporary
 
 
-using std::pair;
+using std::string;
 using std::vector;
-using SigC::slot;
+using std::pair;
+
+namespace lyx {
+namespace frontend {
 
 vector<biblio::CiteStyle> ControlCitation::citeStyles_;
 
-ControlCitation::ControlCitation(LyXView & lv, Dialogs & d)
-       : ControlCommand(lv, d, LFUN_CITATION_INSERT)
-{
-       // These are permanent connections so we won't bother
-       // storing a copy because we won't be disconnecting.
-       d_.showCitation.connect(slot(this, &ControlCitation::showInset));
-       d_.createCitation.connect(slot(this, &ControlCitation::createInset));
-}
+
+ControlCitation::ControlCitation(Dialog & d)
+       : ControlCommand(d, "citation")
+{}
 
 
-void ControlCitation::clearDaughterParams()
+bool ControlCitation::initialiseParams(string const & data)
 {
-       bibkeysInfo_.clear();
-}
+       lyxerr << "ControlCitation::initialiseParams\n\t" << data << std::endl;
+       ControlCommand::initialiseParams(data);
 
+       vector<pair<string, string> > blist;
+       kernel().buffer().fillWithBibKeys(blist);
 
-void ControlCitation::setDaughterParams()
-{
-       vector<pair<string,string> > blist = lv_.buffer()->getBibkeyList();
+       biblio::CiteEngine const engine = biblio::getEngine(kernel().buffer());
+
+       bool use_styles = engine != biblio::ENGINE_BASIC;
 
        typedef std::map<string, string>::value_type InfoMapValue;
 
-       for (vector<pair<string,string> >::size_type i=0; i<blist.size(); ++i) {
+       for (vector<pair<string,string> >::size_type i = 0;
+            i < blist.size(); ++i) {
                bibkeysInfo_.insert(InfoMapValue(blist[i].first,
                                                 blist[i].second));
        }
 
        if (citeStyles_.empty())
-               citeStyles_ = biblio::getCiteStyles(usingNatbib());
+               citeStyles_ = biblio::getCiteStyles(engine);
        else {
-               if ((usingNatbib() && citeStyles_.size() == 1) ||
-                   (!usingNatbib() && citeStyles_.size() != 1))
-                       citeStyles_ = biblio::getCiteStyles(usingNatbib());
+               if ((use_styles && citeStyles_.size() == 1) ||
+                   (!use_styles && citeStyles_.size() != 1))
+                       citeStyles_ = biblio::getCiteStyles(engine);
        }
+
+       return true;
+}
+
+
+
+void ControlCitation::clearParams()
+{
+       ControlCommand::clearParams();
+       bibkeysInfo_.clear();
 }
 
 
@@ -81,9 +78,9 @@ biblio::InfoMap const & ControlCitation::bibkeysInfo() const
 }
 
 
-bool ControlCitation::usingNatbib() const
+biblio::CiteEngine_enum ControlCitation::getEngine() const
 {
-    return lv_.buffer()->params.use_natbib;
+       return biblio::getEngine(kernel().buffer());
 }
 
 
@@ -91,13 +88,16 @@ vector<string> const ControlCitation::getCiteStrings(string const & key) const
 {
        vector<string> styles;
 
-       vector<biblio::CiteStyle> const cs =
-               biblio::getCiteStyles(usingNatbib());
+       biblio::CiteEngine const engine = biblio::getEngine(kernel().buffer());
+       vector<biblio::CiteStyle> const cs = biblio::getCiteStyles(engine);
 
-       if (lv_.buffer()->params.use_numerical_citations)
+       if (engine == biblio::ENGINE_NATBIB_NUMERICAL)
                styles = biblio::getNumericalStrings(key, bibkeysInfo_, cs);
        else
                styles = biblio::getAuthorYearStrings(key, bibkeysInfo_, cs);
 
        return styles;
 }
+
+} // namespace frontend
+} // namespace lyx