forked from openlp/openlp
Fixes
This commit is contained in:
parent
d71f059433
commit
516dda5ec3
@ -325,8 +325,7 @@ class ServiceItem(object):
|
|||||||
self.media_length = header[u'media_length']
|
self.media_length = header[u'media_length']
|
||||||
if u'background_audio' in header:
|
if u'background_audio' in header:
|
||||||
self.background_audio = header[u'background_audio']
|
self.background_audio = header[u'background_audio']
|
||||||
if u'theme_overwritten' in header:
|
self.theme_overwritten = header.get(u'theme_overwritten', False)
|
||||||
self.theme_overwritten = header[u'theme_overwritten']
|
|
||||||
if self.service_item_type == ServiceItemType.Text:
|
if self.service_item_type == ServiceItemType.Text:
|
||||||
for slide in serviceitem[u'serviceitem'][u'data']:
|
for slide in serviceitem[u'serviceitem'][u'data']:
|
||||||
self._raw_frames.append(slide)
|
self._raw_frames.append(slide)
|
||||||
@ -488,7 +487,7 @@ class ServiceItem(object):
|
|||||||
``theme``
|
``theme``
|
||||||
The new theme to be replaced in the service item
|
The new theme to be replaced in the service item
|
||||||
"""
|
"""
|
||||||
self.theme_overwritten = False if theme == None else True
|
self.theme_overwritten = (theme == None)
|
||||||
self.theme = theme
|
self.theme = theme
|
||||||
self._new_item()
|
self._new_item()
|
||||||
self.render()
|
self.render()
|
||||||
|
@ -480,12 +480,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' \
|
OPTIONS = u'-nologo -norestore -minimized -nodefault -nofirststartwizard'
|
||||||
u' --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):
|
||||||
|
Loading…
Reference in New Issue
Block a user