#include "support/filefilterlist.h"
#include "support/filetools.h"
-#include "support/fontutils.h"
#include "support/forkedcall.h"
#include "support/fs_extras.h"
#include "support/lyxlib.h"
namespace lyx {
-using support::addName;
using support::bformat;
using support::FileFilterList;
using support::FileName;
return false;
// Make sure the absolute filename ends with appropriate suffix
- fname = makeAbsPath(fname);
+ fname = makeAbsPath(fname).absFilename();
if (!isLyXFilename(fname))
fname += ".lyx";
} else
// anyway.
bool failed = false;
- FileName const tmp_ret(tempName(string(), "lyxauto"));
+ FileName const tmp_ret(tempName(FileName(), "lyxauto"));
if (!tmp_ret.empty()) {
bv_.buffer()->writeFile(tmp_ret);
// assume successful write of tmp_ret
}
-// Insert ascii file (if filename is empty, prompt for one)
-void insertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
+// Insert plain text file (if filename is empty, prompt for one)
+void insertPlaintextFile(BufferView * bv, string const & f, bool asParagraph)
{
if (!bv->buffer())
return;
// FIXME: We don't know the encoding of the file
- docstring const tmpstr = from_utf8(getContentsOfAsciiFile(bv, f, asParagraph));
+ docstring const tmpstr = from_utf8(getContentsOfPlaintextFile(bv, f, asParagraph));
if (tmpstr.empty())
return;
}
-// Insert ascii file (if filename is empty, prompt for one)
-string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagraph)
+// Insert plain text file (if filename is empty, prompt for one)
+string getContentsOfPlaintextFile(BufferView * bv, string const & f, bool asParagraph)
{
FileName fname(f);
if (fname.empty()) {
FileDialog fileDlg(_("Select file to insert"),
- (asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII);
+ (asParagraph) ? LFUN_FILE_INSERT_PLAINTEXT_PARA : LFUN_FILE_INSERT_PLAINTEXT);
FileDialog::Result result =
fileDlg.open(from_utf8(bv->buffer()->filePath()),
if (result.first == FileDialog::Later)
return string();
- fname = FileName(makeAbsPath(to_utf8(result.second)));
+ fname = makeAbsPath(to_utf8(result.second));
if (fname.empty())
return string();