Reverted a change for deprecated options (for now).

This commit is contained in:
Raoul Snyman 2011-09-20 18:26:04 +02:00
parent 54a1e25cb7
commit bd3961eb50
1 changed files with 3 additions and 3 deletions

View File

@ -475,11 +475,11 @@ def get_uno_command():
Returns the UNO command to launch an openoffice.org instance. Returns the UNO command to launch an openoffice.org instance.
""" """
COMMAND = u'soffice' COMMAND = u'soffice'
OPTIONS = u'--nologo --norestore --minimized --nodefault --nofirststartwizard' OPTIONS = u'-nologo -norestore -minimized -nodefault -nofirststartwizard'
if UNO_CONNECTION_TYPE == u'pipe': if UNO_CONNECTION_TYPE == u'pipe':
CONNECTION = u'"--accept=pipe,name=openlp_pipe;urp;"' CONNECTION = u'"-accept=pipe,name=openlp_pipe;urp;"'
else: 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) return u'%s %s %s' % (COMMAND, OPTIONS, CONNECTION)
def get_uno_instance(resolver): def get_uno_instance(resolver):