Further to r26743, add CustomPars and ForcePlain layout tags to InsetLayout,

[lyx.git] / src / ConverterCache.cpp

diff --git a/src/ConverterCache.cpp b/src/ConverterCache.cpp
index 2f0a946fd32a212deef34b73091ca2cf2ea6ce4b..335de9de241ffb98c796bb3a39d4a1fc43294d9b 100644 (file)
--- a/src/ConverterCache.cpp
+++ b/src/ConverterCache.cpp
@@ -25,7 +25,7 @@
 #include "support/lyxtime.h"
 #include "support/Package.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 #include <boost/crc.hpp>
 
 #include <algorithm>
@@ -287,8 +287,7 @@ void ConverterCache::add(FileName const & orig_from, string const & to_format,
                        return;
                }
                item->checksum = checksum;
-               if (!mover.copy(converted_file, item->cache_name,
-                             onlyFilename(item->cache_name.absFilename()))) {
+               if (!mover.copy(converted_file, item->cache_name)) {
                        LYXERR(Debug::FILES, "Could not copy file " << orig_from << " to "
                                << item->cache_name);
                } else if (!item->cache_name.changePermission(0600)) {
@@ -298,8 +297,7 @@ void ConverterCache::add(FileName const & orig_from, string const & to_format,
        } else {
                CacheItem new_item(orig_from, to_format, timestamp,
                                orig_from.checksum());
-               if (mover.copy(converted_file, new_item.cache_name,
-                             onlyFilename(new_item.cache_name.absFilename()))) {
+               if (mover.copy(converted_file, new_item.cache_name)) {
                        if (!new_item.cache_name.changePermission(0600)) {
                                LYXERR(Debug::FILES, "Could not change file mode"
                                        << new_item.cache_name);
@@ -409,7 +407,7 @@ FileName const & ConverterCache::cacheName(FileName const & orig_from,
        LYXERR(Debug::FILES, orig_from << ' ' << to_format);
 
        CacheItem * const item = pimpl_->find(orig_from, to_format);
-       BOOST_ASSERT(item);
+       LASSERT(item, /**/);
        return item->cache_name;
 }
 
@@ -433,10 +431,9 @@ bool ConverterCache::copy(FileName const & orig_from, string const & to_format,
        }
 
        CacheItem * const item = pimpl_->find(orig_from, to_format);
-       BOOST_ASSERT(item);
+       LASSERT(item, /**/);
        Mover const & mover = getMover(to_format);
-       return mover.copy(item->cache_name, dest,
-                         onlyFilename(dest.absFilename()));
+       return mover.copy(item->cache_name, dest);
 }
 
 } // namespace lyx