strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#i48179# Added support for stepping back by effect.

Browse source
This commit is contained in:
Andre Fischer 2009-03-25 13:25:25 +00:00
parent 3bd2875308
commit 08b4374045
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sdext/source/presenter/PresenterController.cxx
View file

@ -918,13 +918,22 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
break;
case awt::Key::PAGEUP:
if (mxSlideShowController.is())
{
if (rEvent.Modifiers == awt::KeyModifier::MOD2)
mxSlideShowController->gotoPreviousSlide();
else
mxSlideShowController->gotoPreviousEffect();
}
break;
case awt::Key::LEFT:
case awt::Key::UP:
case awt::Key::P:
case awt::Key::BACKSPACE:
if (mxSlideShowController.is())
{
mxSlideShowController->gotoPreviousSlide();
mxSlideShowController->gotoPreviousEffect();
}
break;

4
sdext/source/presenter/PresenterCurrentSlideObserver.cxx
View file

@ -109,13 +109,13 @@ void SAL_CALL PresenterCurrentSlideObserver::resumed (void)
{
}
void SAL_CALL PresenterCurrentSlideObserver::slideEnded (void)
void SAL_CALL PresenterCurrentSlideObserver::slideEnded (sal_Bool bReverse)
throw (css::uno::RuntimeException)
{
// Determine whether the new current slide (the one after the one that
// just ended) is the slide past the last slide in the presentation,
// i.e. the one that says something like "click to end presentation...".
if (mxSlideShowController.is())
if (mxSlideShowController.is() && !bReverse)
if (mxSlideShowController->getNextSlideIndex() < 0)
if( mpPresenterController.is() )
mpPresenterController->UpdateCurrentSlide(+1);

2
sdext/source/presenter/PresenterCurrentSlideObserver.hxx
View file

@ -76,7 +76,7 @@ public:
virtual void SAL_CALL slideTransitionStarted( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL slideAnimationsEnded( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL slideEnded( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL hyperLinkClicked( const ::rtl::OUString& hyperLink ) throw (::com::sun::star::uno::RuntimeException);
// XAnimationListener

4
sdext/source/presenter/description.xml
View file

@ -8,7 +8,7 @@
<identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
<dependencies>
<OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
<OpenOffice.org-minimal-version value="3.2" dep:name="OpenOffice.org 3.2"/>
</dependencies>
<registration>
@ -17,7 +17,7 @@
</simple-license>
</registration>
<version value="1.0.2" />
<version value="1.1.0" />
<platform value="UPDATED_PLATFORM" />