From 516dda5ec3e249dd18086fb48fdc4d62bdab6e99 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 13 Nov 2011 08:57:29 +0000 Subject: [PATCH] Fixes --- openlp/core/lib/serviceitem.py | 5 ++--- openlp/core/utils/__init__.py | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index f69f861c7..b12a27f1d 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -325,8 +325,7 @@ class ServiceItem(object): self.media_length = header[u'media_length'] if u'background_audio' in header: self.background_audio = header[u'background_audio'] - if u'theme_overwritten' in header: - self.theme_overwritten = header[u'theme_overwritten'] + self.theme_overwritten = header.get(u'theme_overwritten', False) if self.service_item_type == ServiceItemType.Text: for slide in serviceitem[u'serviceitem'][u'data']: self._raw_frames.append(slide) @@ -488,7 +487,7 @@ class ServiceItem(object): ``theme`` 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._new_item() self.render() diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index 736e7756c..fbf185474 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -480,12 +480,11 @@ def get_uno_command(): Returns the UNO command to launch an openoffice.org instance. """ COMMAND = u'soffice' - OPTIONS = u'--nologo --norestore --minimized --nodefault' \ - u' --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) def get_uno_instance(resolver):