Fix bug 2744:

[features.git] / src / buffer.C

diff --git a/src/buffer.C b/src/buffer.C
index 59677959ca2ce303b5485882597e182a63b4d436..aab0435001bf49d21304de46593753307d282598 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -68,9 +68,9 @@
 #include "support/lyxalgo.h"
 #include "support/filetools.h"
 #include "support/fs_extras.h"
-# include <boost/iostreams/filtering_stream.hpp>
-# include <boost/iostreams/filter/gzip.hpp>
-# include <boost/iostreams/device/file.hpp>
+#include <boost/iostreams/filtering_stream.hpp>
+#include <boost/iostreams/filter/gzip.hpp>
+#include <boost/iostreams/device/file.hpp>
 namespace io = boost::iostreams;
 #include "support/lyxlib.h"
 #include "support/os.h"
@@ -83,9 +83,9 @@ namespace io = boost::iostreams;
 #include <boost/filesystem/operations.hpp>
 
 #if defined (HAVE_UTIME_H)
-# include <utime.h>
+#include <utime.h>
 #elif defined (HAVE_SYS_UTIME_H)
-# include <sys/utime.h>
+#include <sys/utime.h>
 #endif
 
 #include <iomanip>
@@ -1556,31 +1556,31 @@ void Buffer::saveCursor(StableDocIterator cur, StableDocIterator anc)
 }
 
 
-void Buffer::changeRefsIfUnique(string const & from, string const & to)
+void Buffer::changeRefsIfUnique(string const & from, string const & to, InsetBase::Code code)
 {
+       //FIXME: This does not work for child documents yet.
+       BOOST_ASSERT(code == InsetBase::CITE_CODE || code == InsetBase::REF_CODE);
        // Check if the label 'from' appears more than once
        vector<string> labels;
-       getLabelList(labels);
+
+       if (code == InsetBase::CITE_CODE) {
+               vector<pair<string, string> > keys;
+               fillWithBibKeys(keys);
+               vector<pair<string, string> >::const_iterator bit  = keys.begin();
+               vector<pair<string, string> >::const_iterator bend = keys.end();
+
+               for (; bit != bend; ++bit)
+                       labels.push_back(bit->first);
+       } else
+               getLabelList(labels);
 
        if (lyx::count(labels.begin(), labels.end(), from) > 1)
                return;
 
-       InsetBase::Code code = InsetBase::REF_CODE;
-
-       ParIterator it = par_iterator_begin();
-       ParIterator end = par_iterator_end();
-       for ( ; it != end; ++it) {
-               bool changed_inset = false;
-               for (InsetList::iterator it2 = it->insetlist.begin();
-                    it2 != it->insetlist.end(); ++it2) {
-                       if (it2->inset->lyxCode() == code) {
-                               InsetCommand * inset = static_cast<InsetCommand *>(it2->inset);
-                               if (inset->getContents() == from) {
-                                       inset->setContents(to);
-                                       //inset->setButtonLabel();
-                                       changed_inset = true;
-                               }
-                       }
+       for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
+               if (it->lyxCode() == code) {
+                       InsetCommand & inset = dynamic_cast<InsetCommand &>(*it);
+                       inset.replaceContents(from, to);
                }
        }
 }