this we don't need anymore

[lyx.git] / src / BiblioInfo.cpp

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 2c21aa9d4492926cb6f291b2415d5680f2900396..198a4a11ff543232b2cffedb93899e05a5fafb9d 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -24,6 +24,7 @@
 #include "insets/InsetBibtex.h"
 #include "insets/InsetInclude.h"
 
+#include "support/assert.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
@@ -286,7 +287,7 @@ docstring const BiblioInfo::getInfo(docstring const & key) const
 vector<docstring> const BiblioInfo::getCiteStrings(
        docstring const & key, Buffer const & buf) const
 {
-       biblio::CiteEngine const engine = buf.params().getEngine();
+       biblio::CiteEngine const engine = buf.params().citeEngine();
        if (engine == biblio::ENGINE_BASIC || 
            engine == biblio::ENGINE_NATBIB_NUMERICAL)
                return getNumericalStrings(key, buf);
@@ -307,7 +308,7 @@ vector<docstring> const BiblioInfo::getNumericalStrings(
                return vector<docstring>();
 
        vector<biblio::CiteStyle> const & styles = 
-               biblio::getCiteStyles(buf.params().getEngine());
+               biblio::getCiteStyles(buf.params().citeEngine());
        
        vector<docstring> vec(styles.size());
        for (vector<docstring>::size_type i = 0; i != vec.size(); ++i) {
@@ -367,7 +368,7 @@ vector<docstring> const BiblioInfo::getAuthorYearStrings(
                return vector<docstring>();
 
        vector<biblio::CiteStyle> const & styles = 
-               getCiteStyles(buf.params().getEngine());
+               getCiteStyles(buf.params().citeEngine());
        
        vector<docstring> vec(styles.size());
        for (vector<docstring>::size_type i = 0; i != vec.size(); ++i) {
@@ -423,17 +424,14 @@ void BiblioInfo::fillWithBibKeys(Buffer const * const buf)
        /// if this is a child document and the parent is already loaded
        /// use the parent's list instead  [ale990412]
        Buffer const * const tmp = buf->masterBuffer();
-       BOOST_ASSERT(tmp);
+       LASSERT(tmp, /**/);
        if (tmp != buf) {
                this->fillWithBibKeys(tmp);
                return;
        }
 
-       // Pre-load all child documents.
-       buf->loadChildDocuments();
-
        for (InsetIterator it = inset_iterator_begin(buf->inset()); it; ++it)
-               it->fillWithBibKeys(*buf, *this, it);
+               it->fillWithBibKeys(*this, it);
 }