[Emacs-diffs] /srv/bzr/emacs/trunk r111747: * doc-view.el (doc-view-odf->pdf-converter-soffice): Use separate

[Tassilo Horn]

------------------------------------------------------------
revno: 111747
committer: Tassilo Horn <address@hidden>
branch nick: trunk
timestamp: Tue 2013-02-12 11:52:47 +0100
message:
  * doc-view.el (doc-view-odf->pdf-converter-soffice): Use separate
  UserInstallation when calling soffice to work around LibreOffice
  bug 37531.
modified:
  lisp/ChangeLog
  lisp/doc-view.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-12 08:36:09 +0000
+++ b/lisp/ChangeLog    2013-02-12 10:52:47 +0000
@@ -1,3 +1,9 @@
+2013-02-12  Tassilo Horn  <address@hidden>
+
+       * 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  <address@hidden>
 
        * files.el (basic-save-buffer):

=== modified file 'lisp/doc-view.el'
--- a/lisp/doc-view.el  2013-02-11 19:29:40 +0000
+++ b/lisp/doc-view.el  2013-02-12 10:52:47 +0000
@@ -940,8 +940,20 @@
 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)