From d470daacde92f42f31532bc7136bf080a52ebd91 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Thu, 19 Feb 2009 13:21:10 +0000 Subject: CWS-TOOLING: integrate CWS transogl03redux 2009-02-09 13:59:40 +0100 thb r267511 : #i96946# Added seemingly missing change for the color space selection for the slide textures 2009-02-04 10:47:12 +0100 cmc r267353 : #i96946# integrate ogltrans work --- offapi/com/sun/star/presentation/XSlideShowView.idl | 10 +++++++--- offapi/com/sun/star/presentation/XTransition.idl | 13 ++++++++++++- offapi/com/sun/star/presentation/XTransitionFactory.idl | 3 +-- 3 files changed, 20 insertions(+), 6 deletions(-) (limited to 'offapi/com/sun/star/presentation') diff --git a/offapi/com/sun/star/presentation/XSlideShowView.idl b/offapi/com/sun/star/presentation/XSlideShowView.idl index 3425dd68625c..1affc8b39397 100644 --- a/offapi/com/sun/star/presentation/XSlideShowView.idl +++ b/offapi/com/sun/star/presentation/XSlideShowView.idl @@ -37,9 +37,6 @@ #ifndef __com_sun_star_rendering_XSpriteCanvas_idl__ #include #endif -#ifndef __com_sun_star_geometry_RealRectangle2D_idl__ -#include -#endif #ifndef __com_sun_star_util_XModifyListener_idl__ #include #endif @@ -52,6 +49,9 @@ #ifndef __com_sun_star_awt_XMouseMotionListener_idl__ #include #endif +#ifndef __com_sun_star_awt_Rectangle_idl__ +#include +#endif module com { module sun { module star { module presentation { @@ -179,6 +179,10 @@ interface XSlideShowView : ::com::sun::star::uno::XInterface */ void setMouseCursor( [in] short nPointerShape ); + /** Get rectangle defining area inside of canvas device which + this slideshow view uses. + */ + ::com::sun::star::awt::Rectangle getCanvasArea(); }; }; }; }; }; diff --git a/offapi/com/sun/star/presentation/XTransition.idl b/offapi/com/sun/star/presentation/XTransition.idl index cd373db0dd62..6a1acefefe6a 100644 --- a/offapi/com/sun/star/presentation/XTransition.idl +++ b/offapi/com/sun/star/presentation/XTransition.idl @@ -35,7 +35,14 @@ #include #endif -module com { module sun { module star { module presentation { +module com { module sun { module star { + +module rendering { interface XBitmap; }; + +module presentation { + +interface XSlideShowView; + /** Transition interface to render custom transitions over time.

@since OOo 2.4 @@ -49,6 +56,10 @@ interface XTransition : ::com::sun::star::uno::XInterface [0,1] range. */ void update( [in] double t ); + + void viewChanged( [in] XSlideShowView view, + [in] com::sun::star::rendering::XBitmap leavingBitmap, + [in] com::sun::star::rendering::XBitmap enteringBitmap ); }; }; }; }; }; diff --git a/offapi/com/sun/star/presentation/XTransitionFactory.idl b/offapi/com/sun/star/presentation/XTransitionFactory.idl index ce3b8a0a5cc8..bc1293d50943 100644 --- a/offapi/com/sun/star/presentation/XTransitionFactory.idl +++ b/offapi/com/sun/star/presentation/XTransitionFactory.idl @@ -85,8 +85,7 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface [in] short transitionSubType, [in] XSlideShowView view, [in] com::sun::star::rendering::XBitmap leavingBitmap, - [in] com::sun::star::rendering::XBitmap enteringBitmap, - [in] com::sun::star::geometry::RealPoint2D slideOffset ); + [in] com::sun::star::rendering::XBitmap enteringBitmap ); }; service TransitionFactory : XTransitionFactory; -- cgit