* GuiToolbar.cpp:

[lyx.git] / src / TextClass.cpp

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 88b23487b7bc9a7dc84e79eb69beed2d862e9cde..3f756bdd4997c30373f37461e9b715d06ba9b4cd 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -222,7 +222,7 @@ namespace {
 bool TextClass::convertLayoutFormat(support::FileName const & filename, ReadType rt)
 {
        LYXERR(Debug::TCLASS, "Converting layout file to " << FORMAT);
-               FileName const tempfile = FileName::tempName();
+               FileName const tempfile = FileName::tempName("convert_layout");
                bool success = layout2layout(filename, tempfile);
                if (success)
                        success = read(tempfile, rt);
@@ -285,10 +285,10 @@ bool TextClass::read(std::string const & str, ReadType rt)
                return retval == OK;
 
        // write the layout string to a temporary file
-       FileName const tempfile = FileName::tempName();
+       FileName const tempfile = FileName::tempName("TextClass_read");
        ofstream os(tempfile.toFilesystemEncoding().c_str());
        if (!os) {
-               LYXERR0("Unable to create tempoary file");
+               LYXERR0("Unable to create temporary file");
                return false;
        }
        os << str;
@@ -997,6 +997,8 @@ void DocumentClass::addLayoutIfNeeded(docstring const & n) const
 
 InsetLayout const & DocumentClass::insetLayout(docstring const & name) const 
 {
+       // FIXME The fix for the InsetLayout part of 4812 would be here:
+       // Add the InsetLayout to the document class if it is not found.
        docstring n = name;
        InsetLayouts::const_iterator cen = insetlayoutlist_.end();
        while (!n.empty()) {