A bit of renaming, plus default values for htmlTag() and htmlClass().

[lyx.git] / src / Buffer.cpp
diff --git a/src/Buffer.cpp b/src/Buffer.cpp

index 55090abc47ceebb9b7dd4704a8b097b2873861de..e3ab0d298e9c8a4ba8f5159a91c56d3f4afeb0c9 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -127,7 +127,7 @@ namespace {
  
  // Do not remove the comment below, so we get merge conflict in
  // independent branches. Instead add your own.
-int const LYX_FORMAT = 371; // uwestoehr: option to turn off mhchem
+int const LYX_FORMAT = 372; // jspitzm: buffer param fontenc
  
  typedef map<string, bool> DepClean;
  typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
@@ -1445,8 +1445,9 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
                 os << "</head>\n<body>\n";
         }
  
+       XHTMLStream xs(os);
         params().documentClass().counters().reset();
-       xhtmlParagraphs(text(), *this, os, runparams);
+       xhtmlParagraphs(text(), *this, xs, runparams);
         if (!only_body)
                 os << "</body>\n</html>\n";
  }
@@ -1762,7 +1763,6 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
                         lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto"));
                         break;
                 }
-               doExport(argument, false);
                 bool success = doExport(argument, false);
                 dr.setError(success);
                 if (!success)