r38866 - lyx-devel/trunk/src/frontends/qt4

[tommaso]

Author: tommaso
Date: Fri May 27 23:54:23 2011
New Revision: 38866
URL: http://www.lyx.org/trac/changeset/38866

Log:
We use the main document's buffer() instead of the current buffer(), so as to 
catch the citations
defined there, also while using the dialog from the Adv F&R WAs.

Modified:
   lyx-devel/trunk/src/frontends/qt4/GuiCitation.cpp
   lyx-devel/trunk/src/frontends/qt4/GuiCitation.h

Modified: lyx-devel/trunk/src/frontends/qt4/GuiCitation.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiCitation.cpp   Fri May 27 23:53:23 
2011        (r38865)
+++ lyx-devel/trunk/src/frontends/qt4/GuiCitation.cpp   Fri May 27 23:54:23 
2011        (r38866)
@@ -367,7 +367,7 @@
        }
 
        QString const keytxt = toqstr(
-               bi.getInfo(qstring_to_ucs4(idx.data().toString()), buffer(), 
true));
+               bi.getInfo(qstring_to_ucs4(idx.data().toString()), 
documentBuffer(), true));
        infoML->document()->setHtml(keytxt);
 }
 
@@ -613,7 +613,7 @@
 QStringList GuiCitation::citationStyles(BiblioInfo const & bi, int sel)
 {
        docstring const key = qstring_to_ucs4(cited_keys_[sel]);
-       return to_qstring_list(bi.getCiteStrings(key, buffer()));
+       return to_qstring_list(bi.getCiteStrings(key, documentBuffer()));
 }
 
 
@@ -663,7 +663,7 @@
 
 CiteEngine GuiCitation::citeEngine() const
 {
-       return buffer().params().citeEngine();
+       return documentBuffer().params().citeEngine();
 }
 
 
@@ -758,21 +758,12 @@
 
 BiblioInfo const & GuiCitation::bibInfo() const
 {
-       Buffer const & buf = buffer();
+       Buffer const & buf = documentBuffer();
        buf.reloadBibInfoCache();
        return buf.masterBibInfo();
 }
 
 
-Buffer const & GuiCitation::buffer() const
-{
-       if (lyxview().documentBufferView())
-               return lyxview().documentBufferView()->buffer();
-       else
-               return lyxview().currentBufferView()->buffer();
-}
-
-
 void GuiCitation::saveSession() const
 {
        Dialog::saveSession();

Modified: lyx-devel/trunk/src/frontends/qt4/GuiCitation.h
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiCitation.h     Fri May 27 23:53:23 
2011        (r38865)
+++ lyx-devel/trunk/src/frontends/qt4/GuiCitation.h     Fri May 27 23:54:23 
2011        (r38866)
@@ -42,9 +42,6 @@
        GuiCitation(GuiView & lv);
        ///
        ~GuiCitation();
-       /// We use the main document's buffer() so to catch the citations
-       /// defined there, also while using the dialog from the Adv F&R.
-       Buffer const & buffer() const;
 
 private Q_SLOTS:
        void on_okPB_clicked();