Protect our data.

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

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 1f76e55af391e411556a1c17fb9dd63f7de0f6f1..cd309090526bed07430361f3578ba0196f6f6b37 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -232,8 +232,8 @@ vector<docstring> const BiblioInfo::getKeys() const
 vector<docstring> const BiblioInfo::getFields() const
 {
        vector<docstring> bibfields;
-       set<docstring>::const_iterator it = fieldNames.begin();
-       set<docstring>::const_iterator end = fieldNames.end();
+       set<docstring>::const_iterator it = fieldNames_.begin();
+       set<docstring>::const_iterator end = fieldNames_.end();
        for (; it != end; ++it)
                bibfields.push_back(*it);
        sort(bibfields.begin(), bibfields.end());
@@ -244,8 +244,8 @@ vector<docstring> const BiblioInfo::getFields() const
 vector<docstring> const BiblioInfo::getEntries() const
 {
        vector<docstring> bibentries;
-       set<docstring>::const_iterator it = entryTypes.begin();
-       set<docstring>::const_iterator end = entryTypes.end();
+       set<docstring>::const_iterator it = entryTypes_.begin();
+       set<docstring>::const_iterator end = entryTypes_.end();
        for (; it != end; ++it)
                bibentries.push_back(*it);
        sort(bibentries.begin(), bibentries.end());

diff --git a/src/BiblioInfo.h b/src/BiblioInfo.h
index 837681fa385de3ffd002e2719f09a895b1ce587a..25d86616fc160bd20d0d821cd964ebb3ac3bac6f 100644 (file)
--- a/src/BiblioInfo.h
+++ b/src/BiblioInfo.h
@@ -192,11 +192,16 @@ public:
        ///
        BibTeXInfo & operator[](docstring const & f) { return bimap_[f]; }
        ///
-       std::set<docstring> fieldNames;
+       void addFieldName(docstring const & f) { fieldNames_.insert(f); }
        ///
-       std::set<docstring> entryTypes;
+       void addEntryType(docstring const & f) { entryTypes_.insert(f); }
 private:
-        std::map<docstring, BibTeXInfo> bimap_;
+       ///
+       std::set<docstring> fieldNames_;
+       ///
+       std::set<docstring> entryTypes_;
+       /// our map: keys --> BibTeXInfo
+       std::map<docstring, BibTeXInfo> bimap_;
 };
 
 } // namespace lyx

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 7d017204cee39baaf11364fea7fc901b5a1c932d..999781b26b95354f5e251e012d14801867af9f1e 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -766,12 +766,12 @@ void InsetBibtex::fillWithBibKeys(Buffer const & buffer,
 
                                        keyvalmap[name] = value;
                                        data += "\n\n" + value;
-                                       keylist.fieldNames.insert(name);
+                                       keylist.addFieldName(name);
                                        readNext = removeWSAndComma(ifs);
                                }
 
                                // add the new entry
-                               keylist.entryTypes.insert(entryType);
+                               keylist.addEntryType(entryType);
                                keyvalmap.allData(data);
                                keylist[key] = keyvalmap;
                        }