fix crash due to invalidated iterator

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

diff --git a/src/frontends/controllers/ControlBibtex.C b/src/frontends/controllers/ControlBibtex.C
index e29ff0bc2019c6d0f55e90cf8a970acfee4287fa..0573d240042379777aeb64ffba5574fa0dcd3f5f 100644 (file)
--- a/src/frontends/controllers/ControlBibtex.C
+++ b/src/frontends/controllers/ControlBibtex.C
@@ -5,86 +5,102 @@
  *
  * \author John Levon
  * \author Angus Leeming
- * \author Herbert Voss
+ * \author Herbert Voß
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-
 #include "ControlBibtex.h"
+
 #include "buffer.h"
-#include "BufferView.h"
+#include "bufferparams.h"
+
 #include "lyxrc.h"
 #include "helper_funcs.h"
 #include "tex_helpers.h"
 #include "gettext.h"
-#include "support/lstrings.h"
 
+#include "support/filefilterlist.h"
+#include "support/filetools.h"
 
 using std::pair;
+using std::string;
+using std::vector;
 
 
-ControlBibtex::ControlBibtex(LyXView & lv, Dialogs & d)
-       : ControlCommand(lv, d)
-{}
+namespace lyx {
 
+using support::FileFilterList;
+using support::OnlyFilename;
 
+namespace frontend {
 
-void ControlBibtex::applyParamsToInset()
-{
-       if (params().getContents() != inset()->params().getContents())
-               bufferview()->ChangeCitationsIfUnique(inset()->params().getContents(),
-                                                   params().getContents());
-
-       inset()->setParams(params());
-       bufferview()->updateInset(inset(), true);
-
-       // We need to do a redraw because the maximum
-       // InsetBibKey width could have changed
-#warning are you sure you need this repaint() ?
-       bufferview()->repaint();
-       bufferview()->fitCursor();
-}
 
-
-void ControlBibtex::applyParamsNoInset()
+ControlBibtex::ControlBibtex(Dialog & d)
+       : ControlCommand(d, "bibtex")
 {}
 
 
-string const ControlBibtex::Browse(string const & in_name,
-                                  string const & title,
-                                  string const & pattern)
+string const ControlBibtex::browseBib(string const & in_name) const
+{
+       pair<string, string> dir1(_("Documents|#o#O"),
+                                 string(lyxrc.document_path));
+       FileFilterList const filter(_("BibTeX Databases (*.bib)"));
+       return browseRelFile(in_name, kernel().bufferFilepath(),
+                            _("Select a BibTeX database to add"),
+                            filter, false, dir1);
+}
+
+
+string const ControlBibtex::browseBst(string const & in_name) const
 {
        pair<string, string> dir1(_("Documents|#o#O"),
                                  string(lyxrc.document_path));
-       return browseRelFile(in_name, buffer()->filePath(),
-                            title, pattern, false, dir1);
+       FileFilterList const filter(_("BibTeX Styles (*.bst)"));
+       return browseRelFile(in_name, kernel().bufferFilepath(),
+                            _("Select a BibTeX style"), filter, false, dir1);
 }
 
 
-string const ControlBibtex::getBibStyles() const
+void ControlBibtex::getBibStyles(vector<string> & data) const
 {
-       string list = getTexFileList("bstFiles.lst", false);
+       data.clear();
+
+       getTexFileList("bstFiles.lst", data);
        // test, if we have a valid list, otherwise run rescan
-       if (list.empty()) {
+       if (data.empty()) {
                rescanBibStyles();
-               list = getTexFileList("bstFiles.lst", false);
+               getTexFileList("bstFiles.lst", data);
        }
-       return list;
+       vector<string>::iterator it  = data.begin();
+       vector<string>::iterator end = data.end();
+       for (; it != end; ++it) {
+               *it = OnlyFilename(*it);
+       }
+       // sort on filename only (no path)
+       std::sort(data.begin(), data.end());
 }
 
 
-string const ControlBibtex::getBibFiles() const
+void ControlBibtex::getBibFiles(vector<string> & data) const
 {
-       string list = getTexFileList("bibFiles.lst", false);
+       data.clear();
+
+       getTexFileList("bibFiles.lst", data);
        // test, if we have a valid list, otherwise run rescan
-       if (list.empty()) {
+       if (data.empty()) {
                rescanBibStyles();
-               list = getTexFileList("bibFiles.lst", false);
+               getTexFileList("bibFiles.lst", data);
+       }
+       vector<string>::iterator it  = data.begin();
+       vector<string>::iterator end = data.end();
+       for (; it != end; ++it) {
+               *it = OnlyFilename(*it);
        }
-       return list;
+       // sort on filename only (no path)
+       std::sort(data.begin(), data.end());
 }
 
 
@@ -92,3 +108,12 @@ void ControlBibtex::rescanBibStyles() const
 {
        rescanTexStyles();
 }
+
+
+bool ControlBibtex::usingBibtopic() const
+{
+    return kernel().buffer().params().use_bibtopic;
+}
+
+} // namespace frontend
+} // namespace lyx