forked from openlp/openlp
Couple of cleanups
This commit is contained in:
parent
3d9a5203a5
commit
7fc5bea107
@ -52,7 +52,8 @@ class AlertsPlugin(Plugin):
|
|||||||
"""
|
"""
|
||||||
Return the settings tab for the Alerts plugin
|
Return the settings tab for the Alerts plugin
|
||||||
"""
|
"""
|
||||||
return AlertsTab(self, self.visible_name[u'title'])
|
self.alertsTab = AlertsTab(self, self.visible_name[u'title'])
|
||||||
|
return self.alertsTab
|
||||||
|
|
||||||
def addToolsMenuItem(self, tools_menu):
|
def addToolsMenuItem(self, tools_menu):
|
||||||
"""
|
"""
|
||||||
|
@ -171,11 +171,11 @@ class ImpressController(PresentationController):
|
|||||||
desktop = self.get_com_desktop()
|
desktop = self.get_com_desktop()
|
||||||
#Sometimes we get a failure and desktop is None
|
#Sometimes we get a failure and desktop is None
|
||||||
if not desktop:
|
if not desktop:
|
||||||
log.exception(u'Failed to terminate OpenOffice')
|
log.exception(u'Failed to find an OpenOffice desktop to terminate')
|
||||||
return
|
return
|
||||||
docs = desktop.getComponents()
|
docs = desktop.getComponents()
|
||||||
if docs.hasElements():
|
if docs.hasElements():
|
||||||
log.debug(u'OpenOffice not terminated')
|
log.debug(u'OpenOffice not terminated as docs are still open')
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
desktop.terminate()
|
desktop.terminate()
|
||||||
|
Loading…
Reference in New Issue
Block a user