Merge lp:~googol-deactivatedaccount/openlp/bug-902964-2 into lp:openlp/2.0

[Andreas Preikschat]

Hello,

- fixed bug #902964 (Libreoffice deprecated commandline args)

[Raoul Snyman (raoul-snyman)]

This *should* be OK on modern systems, but on older systems like Ubuntu 10.04 things will fail. Do we want to up our minimum versions again?

review: Approve

[Jonathan Corwin (j-corwin)]

My view is that if someone is running an older system, then they should also be happy running an older OpenLP (i.e. 2.0).
If at some point they really want/need to run a newer OpenLP then they ought to be prepared to upgrade the system too.

[Raoul Snyman (raoul-snyman)]

Jonathan, that's fine, but this proposal is meant to go into 2.0 ;-)

[Jonathan Corwin (j-corwin)]

Ahh, I hadn't spotted that.
Why do we need to fix this in 2.0, aren't they just warning messages?

[Andreas Preikschat (googol-deactivatedaccount)]

We can skip this proposal for the 2.0 branch....

Unmerged revisions

2138. By Andreas Preikschat on 2013-02-28

fixed mistake

2137. By Andreas Preikschat on 2013-02-28

- fixed bug #902964 (Libreoffice deprecated commandline args)

=== modified file 'openlp/core/utils/__init__.py'
--- openlp/core/utils/__init__.py	2012-12-30 19:41:24 +0000
+++ openlp/core/utils/__init__.py	2013-02-28 20:19:23 +0000
@@ -91,7 +91,7 @@
     VersionDir = 5
     CacheDir = 6
     LanguageDir = 7
-    
+
     # Base path where data/config/cache dir is located
     BaseDir = None
 
@@ -447,11 +447,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)