X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=ec11ac2c88b3ca433b9d3d04495dec41b4cfc863;hb=b536759c0769dab641993347baeb62400455be04;hp=11241afa4e962b923287935688eb86d9f34db4d8;hpb=d94b708a0fec6ade04fc9d09bd86afd73e72fac7;p=lyx.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 11241afa4e..ec11ac2c88 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2261,10 +2261,6 @@ Buffer::ExportStatus Buffer::writeLyXHTMLSource(odocstream & os,
 		if (!styles.empty())
 			os << "\n<!-- Text Class Preamble -->\n" << styles << '\n';
 
-		styles = features.getPreambleSnippets().str;
-		if (!styles.empty())
-			os << "\n<!-- Preamble Snippets -->\n" << styles << '\n';
-
 		// we will collect CSS information in a stream, and then output it
 		// either here, as part of the header, or else in a separate file.
 		odocstringstream css;
@@ -4331,7 +4327,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 	string & result_file) const
 {
 	bool const update_unincluded =
-			params().maintain_unincluded_children
+			params().maintain_unincluded_children != BufferParams::CM_None
 			&& !params().getIncludedChildren().empty();
 
 	// (1) export with all included children (omit \includeonly)
@@ -4502,8 +4498,9 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 	string const ext = theFormats().extension(format);
 	FileName const tmp_result_file(changeExtension(filename, ext));
 	Converters::RetVal const retval = 
-		converters.convert(this, FileName(filename), tmp_result_file, 
-		FileName(absFileName()), backend_format, format, error_list);
+		converters.convert(this, FileName(filename), tmp_result_file,
+				   FileName(absFileName()), backend_format, format,
+				   error_list, Converters::none, includeall);
 	if (retval == Converters::KILLED)
 		return ExportCancel;
 	bool success = (retval == Converters::SUCCESS);
@@ -4618,7 +4615,7 @@ Buffer::ExportStatus Buffer::doExport(string const & target, bool put_in_tempdir
 Buffer::ExportStatus Buffer::preview(string const & format) const
 {
 	bool const update_unincluded =
-			params().maintain_unincluded_children
+			params().maintain_unincluded_children != BufferParams::CM_None
 			&& !params().getIncludedChildren().empty();
 	return preview(format, update_unincluded);
 }