public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix/import: doc import bugfix (#4235)

pull/4237/head
John McLear 2020-08-30 14:11:12 +01:00 committed by GitHub
parent 4db484e34e
commit 12c05c20b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/node/utils/LibreOffice.js
View File

@ -43,7 +43,9 @@ 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";
if (path.extname(srcFile).toLowerCase() === ".doc") {
type = "html";
}
// PDF files need to be converted with LO Draw ref https://github.com/ether/etherpad-lite/issues/4151
if (path.extname(srcFile).toLowerCase() === ".pdf") {
type = "html:XHTML Draw File"

2
tests/backend/specs/api/importexportGetPost.js
View File

@ -110,7 +110,7 @@ describe('Imports and Exports', function(){
// For some reason word import does not work in testing..
// TODO: fix support for .doc files..
xit('Tries to import .doc that uses soffice or abiword', function(done) {
it('Tries to import .doc that uses soffice or abiword', function(done) {
if(!settings.allowAnyoneToImport) return done();
if((settings.abiword && settings.abiword.indexOf("/" === -1)) && (settings.office && settings.soffice.indexOf("/" === -1))) return done();