Change the "empty layout" to the "plain layout", to try to avoid confusion.

[lyx.git] / src / graphics / GraphicsConverter.cpp

diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp
index 1f00028ce7a9b2561cb98187083c70c73cc45409..6242ed91cb8e4b14e436cffbe4665ff5afc0a559 100644 (file)
--- a/src/graphics/GraphicsConverter.cpp
+++ b/src/graphics/GraphicsConverter.cpp
@@ -15,12 +15,13 @@
 #include "Converter.h"
 #include "Format.h"
 
+#include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/ForkedCalls.h"
 #include "support/lstrings.h"
-#include "support/lyxlib.h"
 #include "support/os.h"
 
 #include <boost/bind.hpp>
@@ -257,7 +258,7 @@ static void build_script(FileName const & from_file,
                  string const & to_format,
                  ostream & script)
 {
-       BOOST_ASSERT(from_format != to_format);
+       LASSERT(from_format != to_format, /**/);
        LYXERR(Debug::GRAPHICS, "build_script ... ");
        typedef Converters::EdgePath EdgePath;
 
@@ -293,8 +294,7 @@ static void build_script(FileName const & from_file,
        // Remember to remove the temp file because we only want the name...
        static int counter = 0;
        string const tmp = "gconvert" + convert<string>(counter++);
-       FileName const to_base(tempName(FileName(), tmp));
-       to_base.removeFile();
+       FileName const to_base = FileName::tempName(tmp);
 
        // Create a copy of the file in case the original name contains
        // problematic characters like ' or ". We can work around that problem