diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-19 13:21:10 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-19 13:21:10 +0000 |
| commit | 57060ba91a91f6c4fe0afef90fa366a17034a9a1 (patch) | |
| tree | 0842c05134bfbc075518f1ec0d02aae59261ef12 /sd | |
| parent | 12bdbeaa6b54156bcba037adac1633022526aa27 (diff) | |
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
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slideshow/slideshowviewimpl.cxx | 12 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshowviewimpl.hxx | 1 | ||||
| -rw-r--r-- | sd/xml/transitions-ogl.xml (renamed from sd/xml/transitions-ogl) | 0 |
3 files changed, 13 insertions, 0 deletions
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 9b279fa64bf9..f4de77f03394 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -487,6 +487,18 @@ void SAL_CALL SlideShowView::setMouseCursor( sal_Int16 nPointerShape ) throw (Ru mxWindowPeer->setPointer( mxPointer ); } +awt::Rectangle SAL_CALL SlideShowView::getCanvasArea( ) throw (RuntimeException) +{ + awt::Rectangle aRectangle; + + if( mxWindow.is() ) + return mxWindow->getPosSize(); + + aRectangle.X = aRectangle.Y = aRectangle.Width = aRectangle.Height = 0; + + return aRectangle; +} + void SlideShowView::updateimpl( ::osl::ClearableMutexGuard& rGuard, SlideshowImpl* pSlideShow ) { if( pSlideShow ) diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index 2073faaa045d..8eebe162b942 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -236,6 +236,7 @@ public: virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setMouseCursor( sal_Int16 nPointerShape ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCanvasArea( ) throw (::com::sun::star::uno::RuntimeException); // XWindowListener methods virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/xml/transitions-ogl b/sd/xml/transitions-ogl.xml index 8db94340611a..8db94340611a 100644 --- a/sd/xml/transitions-ogl +++ b/sd/xml/transitions-ogl.xml |