raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Raoul's kicks

This commit is contained in:
Jonathan Corwin 2012-10-13 19:32:32 +01:00
parent 0ddeef9d8f
commit 4c1fe14fd2
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp/plugins/presentations/lib/impresscontroller.py
View File

@ -153,9 +153,7 @@ class ImpressController(PresentationController):
desktop = None
try:
desktop = self.manager.createInstance(u'com.sun.star.frame.Desktop')
except AttributeError:
log.warn(u'Failure to find desktop - Impress may have closed')
except pywintypes.com_error:
except (AttributeError, pywintypes.com_error):
log.warn(u'Failure to find desktop - Impress may have closed')
return desktop if desktop else None
@ -363,9 +361,7 @@ class ImpressDocument(PresentationDocument):
log.debug(u'is active OpenOffice')
if not self.is_loaded():
return False
if not self.control:
return False
return self.control.isRunning()
return self.control.isRunning() if self.control else False
def unblank_screen(self):
"""