ooo-build r15507 - in trunk: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Mon Mar  9 14:52:16 2009
New Revision: 15507
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15507&view=rev

Log:
    * patches/dev300/slideshow-effect-rewind.diff: added another
    missing piece (sdext also needed adaptation)



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/slideshow-effect-rewind.diff

Modified: trunk/patches/dev300/slideshow-effect-rewind.diff
==============================================================================
--- trunk/patches/dev300/slideshow-effect-rewind.diff	(original)
+++ trunk/patches/dev300/slideshow-effect-rewind.diff	Mon Mar  9 14:52:16 2009
@@ -1,6 +1,6 @@
 the fix for issue 48179
 
-From: <af openoffice org>
+From: Thorsten Behrens <thb openoffice org>
 
 
 ---
@@ -9,6 +9,8 @@
  .../sun/star/presentation/XSlideShowListener.idl   |    6 
  sd/source/ui/slideshow/slideshowimpl.cxx           |  120 +++++-
  sd/source/ui/slideshow/slideshowimpl.hxx           |    8 
+ .../presenter/PresenterCurrentSlideObserver.cxx    |    9 
+ .../presenter/PresenterCurrentSlideObserver.hxx    |    2 
  .../source/engine/animationnodes/basenode.hxx      |    6 
  .../animationnodes/sequentialtimecontainer.cxx     |    6 
  slideshow/source/engine/effectrewinder.cxx         |  404 ++++++++++++++++++++
@@ -23,7 +25,7 @@
  slideshow/source/inc/eventqueue.hxx                |    8 
  slideshow/source/inc/screenupdater.hxx             |   21 +
  slideshow/source/inc/usereventqueue.hxx            |   18 +
- 18 files changed, 1236 insertions(+), 176 deletions(-)
+ 20 files changed, 1244 insertions(+), 179 deletions(-)
  create mode 100644 slideshow/source/engine/effectrewinder.cxx
  create mode 100644 slideshow/source/engine/effectrewinder.hxx
 
@@ -373,6 +375,46 @@
  
  	css::uno::Reference< css::presentation::XSlideShow > mxShow;
  	comphelper::ImplementationReference< ::sd::SlideShowView, css::presentation::XSlideShowView > mxView;
+diff --git sdext/source/presenter/PresenterCurrentSlideObserver.cxx sdext/source/presenter/PresenterCurrentSlideObserver.cxx
+index 8f587c5..d2d8436 100644
+--- sdext/source/presenter/PresenterCurrentSlideObserver.cxx
++++ sdext/source/presenter/PresenterCurrentSlideObserver.cxx
+@@ -109,7 +109,7 @@ 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
+@@ -118,7 +118,12 @@ void SAL_CALL PresenterCurrentSlideObserver::slideEnded (void)
+     if (mxSlideShowController.is())
+         if (mxSlideShowController->getNextSlideIndex() < 0)
+             if( mpPresenterController.is() )
+-                mpPresenterController->UpdateCurrentSlide(+1);
++            {
++                if( bReverse )
++                    mpPresenterController->UpdateCurrentSlide(-1);
++                else
++                    mpPresenterController->UpdateCurrentSlide(+1);
++            }
+ }
+ 
+ void SAL_CALL PresenterCurrentSlideObserver::hyperLinkClicked (const rtl::OUString &)
+diff --git sdext/source/presenter/PresenterCurrentSlideObserver.hxx sdext/source/presenter/PresenterCurrentSlideObserver.hxx
+index 8775c50..f6e2d94 100644
+--- sdext/source/presenter/PresenterCurrentSlideObserver.hxx
++++ sdext/source/presenter/PresenterCurrentSlideObserver.hxx
+@@ -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 reverse ) throw (::com::sun::star::uno::RuntimeException);
+     virtual void SAL_CALL hyperLinkClicked( const ::rtl::OUString& hyperLink ) throw (::com::sun::star::uno::RuntimeException);
+ 
+ 	// XAnimationListener
 diff --git slideshow/source/engine/animationnodes/basenode.hxx slideshow/source/engine/animationnodes/basenode.hxx
 index a25f6cb..dbf2f13 100644
 --- slideshow/source/engine/animationnodes/basenode.hxx