#include "support/ExceptionMessage.h"
#include "support/FileZipListDir.h"
-#include <boost/assert.hpp>
+#include "support/assert.h"
#include <sstream>
#include <fstream>
return;
// an enabled EmbeededFile should have this problem handled
- BOOST_ASSERT(!isEnabled());
+ LASSERT(!isEnabled(), /**/);
// file will be synced when it is enabled
inzip_name_ = name;
}
string EmbeddedFile::embeddedFile() const
{
- BOOST_ASSERT(isEnabled());
+ LASSERT(isEnabled(), /**/);
return temp_path_ + inzip_name_;
}
{
if (isEnabled() && embedded())
return FileName(embeddedFile());
- else
- return *this;
+ return *this;
}
void EmbeddedFile::addInset(Inset const * inset)
{
- if (inset != NULL)
+ if (inset)
inset_list_.push_back(inset);
}
}
-void EmbeddedFile::enable(bool enabled, Buffer const * buf, bool updateFile)
+void EmbeddedFile::enable(bool enabled, Buffer const & buf, bool updateFile)
{
// This function will be called when
// 1. through EmbeddedFiles::enable() when a file is read. Files
<< (updateFile ? " (update file)." : " (no update)."));
if (enabled) {
- temp_path_ = buf->temppath();
+ temp_path_ = buf.temppath();
if (!suffixIs(temp_path_, '/'))
temp_path_ += '/';
if (embedded() && updateFile)
bool EmbeddedFile::extract() const
{
- BOOST_ASSERT(isEnabled());
+ LASSERT(isEnabled(), /**/);
string ext_file = absFilename();
string emb_file = embeddedFile();
bool EmbeddedFile::updateFromExternalFile() const
{
- BOOST_ASSERT(isEnabled());
+ LASSERT(isEnabled(), /**/);
string ext_file = absFilename();
string emb_file = embeddedFile();
}
-EmbeddedFile EmbeddedFile::copyTo(Buffer const * buf)
+EmbeddedFile EmbeddedFile::copyTo(Buffer const & buf)
{
- EmbeddedFile file = EmbeddedFile(absFilename(), buf->filePath());
+ EmbeddedFile file = EmbeddedFile(absFilename(), buf.filePath());
file.setEmbed(embedded());
- file.enable(buf->embedded(), buf, false);
+ file.enable(buf.embedded(), buf, false);
// use external file.
if (!embedded())
void EmbeddedFile::syncInzipFile(std::string const & buffer_path)
{
- BOOST_ASSERT(isEnabled());
+ LASSERT(isEnabled(), /**/);
string old_emb_file = temp_path_ + '/' + inzip_name_;
FileName old_emb(old_emb_file);
iterator it_end = end();
// an exception may be thrown
for (; it != it_end; ++it) {
- it->enable(enabled, &buffer, updateFile);
+ it->enable(enabled, buffer, updateFile);
if (it->embedded())
++count_embedded;
else
void EmbeddedFileList::registerFile(EmbeddedFile const & file,
Inset const * inset, Buffer const & buffer)
{
- BOOST_ASSERT(!buffer.embedded() || file.isEnabled());
+ LASSERT(!buffer.embedded() || file.isEnabled(), /**/);
string newfile = file.absFilename();
iterator efp = findFile(newfile);
for (; e_it != e_end; ++e_it) {
EmbeddedFile file = EmbeddedFile(*e_it, buffer.filePath());
// do not update from external file
- file.enable(true, &buffer, false);
+ file.enable(true, buffer, false);
// but we do need to check file existence.
if (!FileName(file.embeddedFile()).exists())
throw ExceptionMessage(ErrorException, _("Failed to open file"),
for (; it != it_end; ++it) {
EmbeddedFile file = EmbeddedFile(*it, buffer.filePath());
file.setEmbed(true);
- file.enable(buffer.embedded(), &buffer, false);
+ file.enable(buffer.embedded(), buffer, false);
insert(end(), file);
}
}