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 a1beb05734df3f8c0afb121baee8b909df2c588f..0573d240042379777aeb64ffba5574fa0dcd3f5f 100644 (file)
--- a/src/frontends/controllers/ControlBibtex.C
+++ b/src/frontends/controllers/ControlBibtex.C
@@ -5,42 +5,62 @@
  *
  * \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 "Kernel.h"
+
+#include "buffer.h"
+#include "bufferparams.h"
 
 #include "lyxrc.h"
 #include "helper_funcs.h"
 #include "tex_helpers.h"
 #include "gettext.h"
 
+#include "support/filefilterlist.h"
 #include "support/filetools.h"
 
-using namespace lyx::support;
-
 using std::pair;
+using std::string;
 using std::vector;
 
 
+namespace lyx {
+
+using support::FileFilterList;
+using support::OnlyFilename;
+
+namespace frontend {
+
+
 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));
+       FileFilterList const filter(_("BibTeX Styles (*.bst)"));
        return browseRelFile(in_name, kernel().bufferFilepath(),
-                            title, pattern, false, dir1);
+                            _("Select a BibTeX style"), filter, false, dir1);
 }
 
 
@@ -59,6 +79,8 @@ void ControlBibtex::getBibStyles(vector<string> & data) const
        for (; it != end; ++it) {
                *it = OnlyFilename(*it);
        }
+       // sort on filename only (no path)
+       std::sort(data.begin(), data.end());
 }
 
 
@@ -77,6 +99,8 @@ void ControlBibtex::getBibFiles(vector<string> & data) const
        for (; it != end; ++it) {
                *it = OnlyFilename(*it);
        }
+       // sort on filename only (no path)
+       std::sort(data.begin(), data.end());
 }
 
 
@@ -84,3 +108,12 @@ void ControlBibtex::rescanBibStyles() const
 {
        rescanTexStyles();
 }
+
+
+bool ControlBibtex::usingBibtopic() const
+{
+    return kernel().buffer().params().use_bibtopic;
+}
+
+} // namespace frontend
+} // namespace lyx