diff options
author | thb <thb@openoffice.org> | 2010-01-07 13:07:30 +0100 |
---|---|---|
committer | thb <thb@openoffice.org> | 2010-01-07 13:07:30 +0100 |
commit | b2960f768b727ba6ed8217d3482e635fd0d1bdd7 (patch) | |
tree | 9e604fce4d985968d8a08450805b13e7d90377d0 /offapi/com/sun/star/presentation | |
parent | #103174# Code from the ecntablet and eraser CWS; optionally improves user pai... (diff) | |
parent | CWS-TOOLING: integrate CWS fwk132_DEV300 (diff) | |
download | core-b2960f768b727ba6ed8217d3482e635fd0d1bdd7.tar.gz core-b2960f768b727ba6ed8217d3482e635fd0d1bdd7.zip |
eraser01: merge with DEV300 m68
Diffstat (limited to 'offapi/com/sun/star/presentation')
-rw-r--r-- | offapi/com/sun/star/presentation/XSlideShow.idl | 37 | ||||
-rw-r--r-- | offapi/com/sun/star/presentation/XSlideShowController.idl | 8 | ||||
-rw-r--r-- | offapi/com/sun/star/presentation/XSlideShowListener.idl | 6 |
3 files changed, 49 insertions, 2 deletions
diff --git a/offapi/com/sun/star/presentation/XSlideShow.idl b/offapi/com/sun/star/presentation/XSlideShow.idl index 0d6065f1b0ed..ca3a614f8d86 100644 --- a/offapi/com/sun/star/presentation/XSlideShow.idl +++ b/offapi/com/sun/star/presentation/XSlideShow.idl @@ -99,6 +99,25 @@ interface XSlideShow : ::com::sun::star::uno::XInterface */ boolean nextEffect(); + /** Undo the last effect in the main sequence of the slideshow.<p> + + The current slide is displayed as if the last user-triggered effect + has never been triggered. If there is no previous effect on the + current slide then slideEnded(true) is called at the registered + XSlideShowListener objects, which can then trigger a change to the + previous slide. Note that this command is executed asynchronously. + Multiple calls to update() may be necessary to complete its execution. + If there is currently no slideshow running, this method does + nothing.<p> + + @return <TRUE/>, if the previous effect was successfully + triggered. This method returns <FALSE/>, if there is no show + running, the first effect on the first slide was not yet + triggered, or the implementation failed to trigger the previous + effect. + */ + boolean previousEffect(); + /** Start a shape-intrinsic animation or activity.<p> This method starts an animation or activity intrinsic to the @@ -151,8 +170,24 @@ interface XSlideShow : ::com::sun::star::uno::XInterface a different slide, this will still work but will not have any performance improvements </li> + <li>name: SkipAllMainSequenceEffects, value: boolean. + When <TRUE/> then all main sequence effects on the new slide + are triggered. This is typically used when going back one + effect leads to the previous slide. On that slide all + effects have to be shown in order to continue the backward + travelling. + When <FALSE/>, the default, then no main sequence effect is + triggered. + </li> + <li>name: SkipSlideTransition, value: boolean. + When <TRUE/> then the slide transition animation, if there + is any, is not displayed. This is typically used when going + back one effect leads to the previous slide. Typically used + together with SkipAllMainSequenceEffects also being <TRUE/>. + When <FALSE/>, the default, then the slide transition + effect, if it exists, is played. + </li> </ul> - */ void displaySlide( [in] ::com::sun::star::drawing::XDrawPage xSlide, diff --git a/offapi/com/sun/star/presentation/XSlideShowController.idl b/offapi/com/sun/star/presentation/XSlideShowController.idl index 9476604a2c77..8ddc9931e163 100644 --- a/offapi/com/sun/star/presentation/XSlideShowController.idl +++ b/offapi/com/sun/star/presentation/XSlideShowController.idl @@ -121,6 +121,14 @@ interface XSlideShowController //------------------------------------------------------------------------- + /** undo the last effects that where triggered by a generic trigger. + <p>If there is no previous effect that can be undone then the + previous slide will be displayed. + */ + void gotoPreviousEffect(); + + //------------------------------------------------------------------------- + /** goto and display first slide */ void gotoFirstSlide(); diff --git a/offapi/com/sun/star/presentation/XSlideShowListener.idl b/offapi/com/sun/star/presentation/XSlideShowListener.idl index 90b7dec18e84..46786eabc03c 100644 --- a/offapi/com/sun/star/presentation/XSlideShowListener.idl +++ b/offapi/com/sun/star/presentation/XSlideShowListener.idl @@ -65,8 +65,12 @@ interface XSlideShowListener : ::com::sun::star::animations::XAnimationListener /** Notify that the current slide has ended, e.g. the user has clicked on the slide. Calling displaySlide() twice will not issue this event. + @param reverse + For the default order (forward) this flag is <FALSE/>. + When the main sequence was traversed in reverse order then this + flag is <TRUE/>. */ - void slideEnded(); + void slideEnded( [in] boolean reverse ); /** Notifies that a hyperlink has been clicked. @param hyperLink hyperlink URL |