Don't need this argument, since it was only ever called thus:

	it->fillWithBibKeys(d->bibinfo_, it);
This could be useful later, if we decide to try to do the work that
fillWithBibKeys did from updateLabels().

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35106 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 2ced899b47497934323d204a4ccfe632c6463a62..77594912ca89d49d4c54d3a78612fea3ae78553e 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1801,7 +1801,7 @@ void Buffer::checkBibInfoCache() const
        if (!d->bibinfo_cache_valid_) {
                d->bibinfo_.clear();
                for (InsetIterator it = inset_iterator_begin(inset()); it; ++it)
-                       it->fillWithBibKeys(d->bibinfo_, it);
+                       it->fillWithBibKeys(d->bibinfo_);
                d->bibinfo_cache_valid_ = true;
        }       
 }

diff --git a/src/insets/Inset.h b/src/insets/Inset.h
index 3ee807b33352b65362f9c711a002710449057435..6aefde8f7f6bb8e2234658dd50b8801e9004afda 100644 (file)
--- a/src/insets/Inset.h
+++ b/src/insets/Inset.h
@@ -478,7 +478,7 @@ public:
        /// pit is the ParConstIterator of the paragraph containing the inset
        virtual void addToToc(DocIterator const &) {}
        /// Fill keys with BibTeX information
-       virtual void fillWithBibKeys(BiblioInfo &, InsetIterator const &) const {}
+       virtual void fillWithBibKeys(BiblioInfo &) const {}
        /// Update the counters of this inset and of its contents.
        /// The boolean indicates whether we are preparing for output, e.g.,
        /// of XHTML.

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index d650feab0665d43e20ae977f43bf46d1ae7ddff8..162644c85d57fafd88ea5adc58cc0acebb921ac9 100644 (file)
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -258,11 +258,17 @@ docstring bibitemWidest(Buffer const & buffer, OutputParams const & runparams)
 }
 
 
-void InsetBibitem::fillWithBibKeys(BiblioInfo & keys, InsetIterator const & it) const
+void InsetBibitem::fillWithBibKeys(BiblioInfo & keys) const
 {
        docstring const key = getParam("key");
+       // false means it's not BibTeX
        BibTeXInfo keyvalmap(false);
        keyvalmap.label(bibLabel());
+       // The indirection here is a little annoying, but
+       //      DocIterator(Buffer *, Inset *) 
+       // is private.
+       InsetBibitem & me = const_cast<InsetBibitem &>(*this);
+       InsetIterator it(me);
        DocIterator doc_it(it); 
        doc_it.forwardPos();
        keyvalmap[from_ascii("ref")] = doc_it.paragraph().asString();

diff --git a/src/insets/InsetBibitem.h b/src/insets/InsetBibitem.h
index 200630355f7cfd5e319b616943a74d985f5f737b..1508a22c771c63695a8cc1a6348a4d7a37da34cc 100644 (file)
--- a/src/insets/InsetBibitem.h
+++ b/src/insets/InsetBibitem.h
@@ -63,7 +63,7 @@ private:
        ///
        docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
-       virtual void fillWithBibKeys(BiblioInfo &, InsetIterator const &) const;
+       virtual void fillWithBibKeys(BiblioInfo &) const;
        /// Update the counter of this inset
        void updateBuffer(ParIterator const &, UpdateType);
        ///

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 9330feb82d0bc267510bd8ba8596f7eaf157b861..f023665ee1efce2df587dec42e5a46ebef9abd3f 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -662,8 +662,7 @@ namespace {
 
 
 // This method returns a comma separated list of Bibtex entries
-void InsetBibtex::fillWithBibKeys(BiblioInfo & keylist,
-       InsetIterator const & /*di*/) const
+void InsetBibtex::fillWithBibKeys(BiblioInfo & keylist) const
 {
        // This bibtex parser is a first step to parse bibtex files
        // more precisely.

diff --git a/src/insets/InsetBibtex.h b/src/insets/InsetBibtex.h
index efd5a385b13698fd146722b00834c8cb5c853c5f..4b19f0fcfacc44f27977b043fbb330bdc0ff2481 100644 (file)
--- a/src/insets/InsetBibtex.h
+++ b/src/insets/InsetBibtex.h
@@ -42,7 +42,7 @@ public:
        ///
        int latex(odocstream &, OutputParams const &) const;
        ///
-       void fillWithBibKeys(BiblioInfo &, InsetIterator const &) const;
+       void fillWithBibKeys(BiblioInfo &) const;
        ///
        support::FileNameList getBibFiles() const;
        ///

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 9458aba8f2f175ccd3468f22f76e2687e7bf713c..b3e78d7954ce846d17b4405f421b88de62910ade 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -830,12 +830,13 @@ void InsetInclude::validate(LaTeXFeatures & features) const
 }
 
 
-void InsetInclude::fillWithBibKeys(BiblioInfo & keys,
-       InsetIterator const & /*di*/) const
+void InsetInclude::fillWithBibKeys(BiblioInfo & keys) const
 {
        if (loadIfNeeded()) {
-               string const included_file = includedFileName(buffer(), params()).absFileName();
-               Buffer * tmp = theBufferList().getBuffer(FileName(included_file));
+               string const included_file = 
+                       includedFileName(buffer(), params()).absFileName();
+               Buffer * tmp = 
+                       theBufferList().getBuffer(FileName(included_file));
                BiblioInfo const & newkeys = tmp->localBibInfo();
                keys.mergeBiblioInfo(newkeys);
        }

diff --git a/src/insets/InsetInclude.h b/src/insets/InsetInclude.h
index cfc990cbcc40ce854ed800158a2e6b6cb29ed692..94d64d963a55c6aeb1eef2a3c45ebfb415c0aba0 100644 (file)
--- a/src/insets/InsetInclude.h
+++ b/src/insets/InsetInclude.h
@@ -59,7 +59,7 @@ public:
         *  \param keys the list of bibkeys in the child buffer.
         *  \param it not used here
         */
-       void fillWithBibKeys(BiblioInfo & keys, InsetIterator const & it) const;
+       void fillWithBibKeys(BiblioInfo & keys) const;
        
        ///
        bool hasSettings() const { return true; }