X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FExporter.cpp;h=85d5eb3d5551862f7791fc21897651da4124a5bc;hb=ce2e071cdfde88864c1524818d66cbae52273502;hp=2c9e4e6e455b1eebac5fa44f53b88ff931e0aea7;hpb=4dc976497f7c384b2e399662ae6a9b19bc98d978;p=lyx.git diff --git a/src/Exporter.cpp b/src/Exporter.cpp index 2c9e4e6e45..85d5eb3d55 100644 --- a/src/Exporter.cpp +++ b/src/Exporter.cpp @@ -5,11 +5,11 @@ * * \author unknown * \author Alfredo Braunstein - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean Marc Lasgouttes * \author Angus Leeming * \author John Levon - * \author André Pönitz + * \author André Pönitz * * Full author contact details are available in file CREDITS. */ @@ -86,7 +86,7 @@ CopyStatus copyFile(string const & format, } Mover const & mover = getMover(format); - if (!mover.copy(sourceFile, destFile)) + if (!mover.copy(sourceFile, destFile, latexFile)) Alert::error(_("Couldn't copy file"), bformat(_("Copying %1$s to %2$s failed."), makeDisplayPath(sourceFile.absFilename()), @@ -115,7 +115,7 @@ void ExportData::addExternalFile(string const & format, { // Make sure that we have every file only once, otherwise copyFile() // would ask several times if it should overwrite a file. - vector & files = externalfiles[format]; + vector & files = externalfiles_[format]; ExportedFile file(sourceName, exportName); if (find(files.begin(), files.end(), file) == files.end()) files.push_back(file); @@ -132,8 +132,8 @@ void ExportData::addExternalFile(string const & format, vector const ExportData::externalFiles(string const & format) const { - FileMap::const_iterator cit = externalfiles.find(format); - if (cit != externalfiles.end()) + FileMap::const_iterator cit = externalfiles_.find(format); + if (cit != externalfiles_.end()) return cit->second; return vector(); }