openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/bug-902964 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #902964 in OpenLP: "Libreoffice deprecated commandline args"
  https://bugs.launchpad.net/openlp/+bug/902964

For more details, see:
https://code.launchpad.net/~googol/openlp/bug-902964/+merge/151085

Hello,

- fixed bug #902964 (Libreoffice deprecated commandline args)

-- 
https://code.launchpad.net/~googol/openlp/bug-902964/+merge/151085
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/bug-902964 into lp:openlp.

=== modified file 'openlp/core/utils/__init__.py'
--- openlp/core/utils/__init__.py	2013-02-27 11:29:24 +0000
+++ openlp/core/utils/__init__.py	2013-02-28 20:11:22 +0000
@@ -335,11 +335,11 @@
     Returns the UNO command to launch an openoffice.org instance.
     """
     COMMAND = u'soffice'
-    OPTIONS = u'-nologo -norestore -minimized -nodefault -nofirststartwizard'
+    OPTIONS = u'--nologo --norestore --minimized --nodefault --nofirststartwizard'
     if UNO_CONNECTION_TYPE == u'pipe':
-        CONNECTION = u'"-accept=pipe,name=openlp_pipe;urp;"'
+        CONNECTION = u'"--accept=pipe,name=openlp_pipe;urp;"'
     else:
-        CONNECTION = u'"-accept=socket,host=localhost,port=2002;urp;"'
+        CONNECTION = u'"--accept=socket,host=localhost,port=2002;urp;"'
     return u'%s %s %s' % (COMMAND, OPTIONS, CONNECTION)