From: Tassilo Horn Date: Tue, 12 Feb 2013 10:52:47 +0000 (+0100) Subject: * doc-view.el (doc-view-odf->pdf-converter-soffice): Use separate X-Git-Tag: emacs-24.3.90~173^2~7^2~76 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=62c0e84768a8f83c7c7ce1e9401a04e68a98c226;p=emacs.git * doc-view.el (doc-view-odf->pdf-converter-soffice): Use separate UserInstallation when calling soffice to work around LibreOffice bug 37531. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0aaead88b9c..3dd163f0612 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-02-12 Tassilo Horn + + * doc-view.el (doc-view-odf->pdf-converter-soffice): Use separate + UserInstallation when calling soffice to work around LibreOffice + bug 37531. + 2013-02-12 Glenn Morris * files.el (basic-save-buffer): diff --git a/lisp/doc-view.el b/lisp/doc-view.el index edd59a7b518..da0b728ce91 100644 --- a/lisp/doc-view.el +++ b/lisp/doc-view.el @@ -940,8 +940,20 @@ is named like ODF with the extension turned to pdf." The converted PDF is put into the current cache directory, and it is named like ODF with the extension turned to pdf." (doc-view-start-process "odf->pdf" doc-view-odf->pdf-converter-program - (list "--headless" "--convert-to" "pdf" - "--outdir" (doc-view-current-cache-dir) odf) + (list + ;; FIXME: soffice doesn't work when there's + ;; another running LibreOffice instance, in + ;; which case it returns success without + ;; actually doing anything. See + ;; LibreOffice bug + ;; https://bugs.freedesktop.org/show_bug.cgi?id=37531. + ;; A workaround is to start soffice with a + ;; separate UserInstallation directory. + (concat "-env:UserInstallation=file://" + (expand-file-name (format "libreoffice-docview%d" (user-uid)) + temporary-file-directory)) + "--headless" "--convert-to" "pdf" + "--outdir" (doc-view-current-cache-dir) odf) callback)) (defun doc-view-pdf/ps->png (pdf-ps png)