From d662bcd2fdd88ce0eb76faf73b68ff434fb352e8 Mon Sep 17 00:00:00 2001
From: webzwo0i <webzwo0i@c3d2.de>
Date: Mon, 14 Sep 2020 12:30:00 +0200
Subject: [PATCH] switch back to soffice standard converter; dont swallow
 newlines

---
 src/node/utils/ImportHtml.js  | 2 +-
 src/node/utils/LibreOffice.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/node/utils/ImportHtml.js b/src/node/utils/ImportHtml.js
index 28ce4f689..2dde8c6c1 100644
--- a/src/node/utils/ImportHtml.js
+++ b/src/node/utils/ImportHtml.js
@@ -34,7 +34,7 @@ exports.setPadHTML = function(pad, html)
   rehype()
     .use(format, opts)
     .process(html, function(err, output){
-      html = String(output).replace(/(\r\n|\n|\r)/gm,"");
+      //html = String(output).replace(/(\r\n|\n|\r)/gm,"");
   })
 
   var $ = cheerio.load(html);
diff --git a/src/node/utils/LibreOffice.js b/src/node/utils/LibreOffice.js
index aa80dfa57..ec8ea9273 100644
--- a/src/node/utils/LibreOffice.js
+++ b/src/node/utils/LibreOffice.js
@@ -43,7 +43,7 @@ exports.convertFile = function(srcFile, destFile, type, callback) {
 
   if (type === "html") {
     // "html:XHTML Writer File:UTF8" does a better job than normal html exports
-    type = "html:XHTML Writer File:UTF8"
+    //type = "html:XHTML Writer File:UTF8"
 
     // PDF files need to be converted with LO Draw ref https://github.com/ether/etherpad-lite/issues/4151
     if (path.extname(srcFile).toLowerCase() === ".pdf") {