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

Use return-to-pre-blank-slide fix for all powerpoint versions.

Browse Source
This commit is contained in:
Tomas Groth 2015-04-28 14:36:43 +02:00
parent ed6d454105
commit 9c0525b00c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openlp/plugins/presentations/lib/powerpointcontroller.py
View File

@ -231,8 +231,8 @@ class PowerpointDocument(PresentationDocument):
# ppSlideShowRunning = 1 # ppSlideShowRunning = 1
self.presentation.SlideShowWindow.View.State = 1 self.presentation.SlideShowWindow.View.State = 1
self.presentation.SlideShowWindow.Activate() self.presentation.SlideShowWindow.Activate()
# Unblanking is broken in PowerPoint 2010 and 2013, need to redisplay # Unblanking is broken it seems, can't return to the right slide
if float(self.presentation.Application.Version) >= 14.0 and self.blank_slide: if self.blank_slide:
self.presentation.SlideShowWindow.View.GotoSlide(self.blank_slide, False) self.presentation.SlideShowWindow.View.GotoSlide(self.blank_slide, False)
if self.blank_click: if self.blank_click:
self.presentation.SlideShowWindow.View.GotoClick(self.blank_click) self.presentation.SlideShowWindow.View.GotoClick(self.blank_click)
@ -252,8 +252,7 @@ class PowerpointDocument(PresentationDocument):
""" """
log.debug('blank_screen') log.debug('blank_screen')
try: try:
# Unblanking is broken in PowerPoint 2010 and 2013, need to save info for later # Unblanking is broken it seems, can't return to the right slide, need to save info for later
if float(self.presentation.Application.Version) >= 14.0:
self.blank_slide = self.get_slide_number() self.blank_slide = self.get_slide_number()
self.blank_click = self.presentation.SlideShowWindow.View.GetClickIndex() self.blank_click = self.presentation.SlideShowWindow.View.GetClickIndex()
# ppSlideShowBlackScreen = 3 # ppSlideShowBlackScreen = 3