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 50c301b388cf535b30e7a6eff8774783bcfa14a3..e7d599f2ee66f9cbda43f46a34ae7aa86dd157ff 100644 (file)
--- a/src/frontends/controllers/ControlCitation.C
+++ b/src/frontends/controllers/ControlCitation.C
@@ -5,19 +5,24 @@
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "ControlCitation.h"
-#include "Kernel.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
+#include "debug.h" // temporary
 
+
+using std::string;
 using std::vector;
 using std::pair;
 
+namespace lyx {
+namespace frontend {
 
 vector<biblio::CiteStyle> ControlCitation::citeStyles_;
 
@@ -27,12 +32,17 @@ ControlCitation::ControlCitation(Dialog & d)
 {}
 
 
-void ControlCitation::initialiseParams(string const & data)
+bool ControlCitation::initialiseParams(string const & data)
 {
+       lyxerr << "ControlCitation::initialiseParams\n\t" << data << std::endl;
        ControlCommand::initialiseParams(data);
 
-       vector<pair<string,string> > blist;
-       kernel().buffer()->fillWithBibKeys(blist);
+       vector<pair<string, string> > blist;
+       kernel().buffer().fillWithBibKeys(blist);
+
+       biblio::CiteEngine const engine = biblio::getEngine(kernel().buffer());
+
+       bool use_styles = engine != biblio::ENGINE_BASIC;
 
        typedef std::map<string, string>::value_type InfoMapValue;
 
@@ -43,12 +53,14 @@ void ControlCitation::initialiseParams(string const & data)
        }
 
        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;
 }
 
 
@@ -66,9 +78,9 @@ biblio::InfoMap const & ControlCitation::bibkeysInfo() const
 }
 
 
-bool ControlCitation::usingNatbib() const
+biblio::CiteEngine_enum ControlCitation::getEngine() const
 {
-    return kernel().buffer()->params.use_natbib;
+       return biblio::getEngine(kernel().buffer());
 }
 
 
@@ -76,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 (kernel().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