openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

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

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-2/+merge/151087

Hello,

- fixed bug #902964 (Libreoffice deprecated commandline args)
-- 
https://code.launchpad.net/~googol/openlp/bug-902964-2/+merge/151087
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/bug-902964-2 into lp:openlp/2.0.

=== 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:17:20 +0000
@@ -91,7 +91,7 @@
     VersionDir = 5
     CacheDir = 6
     LanguageDir = 7
-    
+
     # Base path where data/config/cache dir is located
     BaseDir = None
 
@@ -213,7 +213,7 @@
     global APPLICATION_VERSION
     if APPLICATION_VERSION:
         return APPLICATION_VERSION
-    if u'--dev-version' in sys.argv or u'-d' in sys.argv:
+    if u'--devnversion' in sys.argv or u'-d' in sys.argv:
         # If we're running the dev version, let's use bzr to get the version.
         try:
             # If bzrlib is available, use it.
@@ -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)