Cosmetics.

[lyx.git] / src / insets / InsetBibtex.cpp

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 5313b1d4778ae76e64f54cd844e134063f569405..a74be8e1f0ac9f67d010cf8b827fc5eb4db82d05 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -27,8 +27,8 @@
 #include "frontends/alert.h"
 
 #include "support/debug.h"
-#include "support/ExceptionMessage.h"
 #include "support/docstream.h"
+#include "support/ExceptionMessage.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
@@ -52,6 +52,25 @@ InsetBibtex::InsetBibtex(InsetCommandParams const & p)
 {}
 
 
+void InsetBibtex::setBuffer(Buffer & buffer)
+{
+       if (buffer_) {
+               EmbeddedFileList::iterator it = bibfiles_.begin();
+               EmbeddedFileList::iterator it_end = bibfiles_.end();
+               for (; it != it_end; ++it) {
+                       try {
+                               *it = it->copyTo(&buffer);
+                       } catch (ExceptionMessage const & message) {
+                               Alert::error(message.title_, message.details_);
+                               // failed to embed
+                               it->setEmbed(false);
+                       }               
+               }
+       }
+       Inset::setBuffer(buffer);
+}
+
+
 ParamInfo const & InsetBibtex::findInfo(string const & /* cmdName */)
 {
        static ParamInfo param_info_;
@@ -86,17 +105,8 @@ void InsetBibtex::doDispatch(Cursor & cur, FuncRequest & cmd)
                        break;
                }
                //
-               InsetCommandParams orig = params();
-               try {
-                       // returned "embed" is composed of "true" or "false", which needs to be adjusted
-                       createBibFiles(p["bibfiles"], p["embed"], true, true);
-                       updateParam();
-               } catch (ExceptionMessage const & message) {
-                       Alert::error(message.title_, message.details_);
-                       // do not set parameter if an error happens
-                       setParams(orig);
-                       break;
-               }
+               createBibFiles(p["bibfiles"], p["embed"]);
+               updateParam();
                buffer().updateBibfilesCache();
                break;
        }
@@ -736,7 +746,7 @@ void InsetBibtex::validate(LaTeXFeatures & features) const
 
 
 void InsetBibtex::createBibFiles(docstring const & bibParam,
-       docstring const & embedParam, bool boolStatus, bool updateFile) const
+       docstring const & embedParam) const
 {
        bibfiles_.clear();
        
@@ -755,14 +765,9 @@ void InsetBibtex::createBibFiles(docstring const & bibParam,
        while (!tmp.empty()) {
                EmbeddedFile file(changeExtension(tmp, "bib"), buffer().filePath());
                
-               if (boolStatus) {
-                       BOOST_ASSERT(emb == "true" || emb == "false");
-                       file.setEmbed(emb == "true");
-               } else {
-                       file.setInzipName(emb);
-                       file.setEmbed(emb != "");
-               }
-               file.enable(buffer().embedded(), &buffer(), updateFile);
+               file.setInzipName(emb);
+               file.setEmbed(!emb.empty());
+               file.enable(buffer().embedded(), &buffer(), false);
                bibfiles_.push_back(file);
                // Get next file name
                bibfiles = split(bibfiles, tmp, ',');
@@ -796,7 +801,7 @@ void InsetBibtex::updateParam()
 void InsetBibtex::registerEmbeddedFiles(EmbeddedFileList & files) const
 {
        if (bibfiles_.empty())
-               createBibFiles(params()["bibfiles"], params()["embed"], false, false);
+               createBibFiles(params()["bibfiles"], params()["embed"]);
 
        EmbeddedFileList::const_iterator it = bibfiles_.begin();
        EmbeddedFileList::const_iterator it_end = bibfiles_.end();