From 3abf9d9460700072d39495ced84c1dec81b8eca1 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Wed, 18 Feb 2009 08:29:33 +0000 Subject: CWS-TOOLING: integrate CWS impress167 2009-02-02 16:32:46 +0100 sj r267276 : build problem, removing build dependency to vcl 2009-01-30 16:45:22 +0100 sj r267210 : CWS-TOOLING: rebase CWS impress167 to trunk@267171 (milestone: DEV300:m41) 2009-01-23 16:14:11 +0100 sj r266833 : #98331# fixed: crop information is not saved and not read on loading 2009-01-23 10:45:11 +0100 af r266780 : #158592# Made processing of slidesorter queue entries more robust. 2009-01-23 09:58:16 +0100 af r266773 : #i93848# Fixed termination of timer thread. --- sdext/source/presenter/PresenterPaneBorderPainter.hxx | 1 - sdext/source/presenter/PresenterTimer.cxx | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'sdext/source/presenter') diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx index e09192734f7f..45fbe3340cd5 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx @@ -32,7 +32,6 @@ #ifndef SDEXT_PRESENTER_PRESENTER_PANE_BORDER_PAINTER_HXX #define SDEXT_PRESENTER_PRESENTER_PANE_BORDER_PAINTER_HXX -#include #include #include #include diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index 45aba5f8bdce..f66289f2e5e6 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -76,7 +76,6 @@ class TimerScheduler { public: static ::boost::shared_ptr Instance (void); - static void Release (void); static SharedTimerTask CreateTimerTask ( const PresenterTimer::Task& rTask, const TimeValue& rDueTime, @@ -107,12 +106,15 @@ private: ::osl::Mutex maCurrentTaskMutex; SharedTimerTask mpCurrentTask; + static void Release (void); + TimerScheduler (void); virtual ~TimerScheduler (void); class Deleter {public: void operator () (TimerScheduler* pScheduler) { delete pScheduler; } }; friend class Deleter; virtual void SAL_CALL run (void); + virtual void SAL_CALL onTerminated (void); }; @@ -380,7 +382,13 @@ void SAL_CALL TimerScheduler::run (void) mpCurrentTask.reset(); } } +} + + + +void SAL_CALL TimerScheduler::onTerminated (void) +{ Release(); } -- cgit From 4f4fe6aa7203aac35a774108f4880553df5b93a4 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 --- sdext/source/presenter/PresenterSlideShowView.cxx | 48 +++++++++++++++-------- sdext/source/presenter/PresenterSlideShowView.hxx | 7 +++- 2 files changed, 37 insertions(+), 18 deletions(-) (limited to 'sdext/source/presenter') diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index ded3fe69c554..518595082683 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -82,6 +82,8 @@ PresenterSlideShowView::PresenterSlideShowView ( mxPointer(), mxWindow(), mxViewWindow(), + mxTopPane(), + mxPresenterHelper(), mxBackgroundPolygon1(), mxBackgroundPolygon2(), mbIsViewAdded(false), @@ -114,6 +116,13 @@ void PresenterSlideShowView::LateInit (void) if (xSlideShowComponent.is()) xSlideShowComponent->addEventListener(static_cast(this)); + Reference xFactory ( + mxComponentContext->getServiceManager(), UNO_QUERY_THROW); + mxPresenterHelper.set (xFactory->createInstanceWithContext( + OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"), + mxComponentContext), + UNO_QUERY_THROW); + // Use view id and controller to retrieve window and canvas from // configuration controller. Reference xCM (mxController, UNO_QUERY_THROW); @@ -121,6 +130,8 @@ void PresenterSlideShowView::LateInit (void) if (xCC.is()) { + mxTopPane.set(xCC->getResource(mxViewId->getAnchor()->getAnchor()), UNO_QUERY); + Reference xPane (xCC->getResource(mxViewId->getAnchor()), UNO_QUERY_THROW); mxWindow = xPane->getWindow(); @@ -142,8 +153,8 @@ void PresenterSlideShowView::LateInit (void) // Create a window for the actual slide show view. It is places // centered and with maximal size inside the pane. mxViewWindow = CreateViewWindow(mxWindow); - mxViewCanvas = CreateViewCanvas(mxViewWindow, - Reference(xCC->getResource(mxViewId->getAnchor()->getAnchor()), UNO_QUERY)); + + mxViewCanvas = CreateViewCanvas(mxViewWindow); if (mxViewWindow.is()) { @@ -543,6 +554,19 @@ void SAL_CALL PresenterSlideShowView::setMouseCursor(::sal_Int16 nPointerShape) +awt::Rectangle SAL_CALL PresenterSlideShowView::getCanvasArea( ) throw (RuntimeException) +{ + if( mxViewWindow.is() && mxTopPane.is() ) + return mxPresenterHelper->getWindowExtentsRelative( mxViewWindow, mxTopPane->getWindow() ); + + awt::Rectangle aRectangle; + + aRectangle.X = aRectangle.Y = aRectangle.Width = aRectangle.Height = 0; + + return aRectangle; +} + + //----- lang::XEventListener -------------------------------------------------- @@ -976,22 +1000,14 @@ Reference PresenterSlideShowView::CreateViewWindow ( Reference PresenterSlideShowView::CreateViewCanvas ( - const Reference& rxViewWindow, - const Reference& rxParentPane) const + const Reference& rxViewWindow) const { // Create a canvas for the view window. - Reference xFactory ( - mxComponentContext->getServiceManager(), UNO_QUERY_THROW); - Reference xPresenterHelper( - xFactory->createInstanceWithContext( - OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"), - mxComponentContext), - UNO_QUERY_THROW); - return xPresenterHelper->createSharedCanvas( - Reference(rxParentPane->getCanvas(), UNO_QUERY), - rxParentPane->getWindow(), - rxParentPane->getCanvas(), - rxParentPane->getWindow(), + return mxPresenterHelper->createSharedCanvas( + Reference(mxTopPane->getCanvas(), UNO_QUERY), + mxTopPane->getWindow(), + mxTopPane->getCanvas(), + mxTopPane->getWindow(), rxViewWindow); } diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index 4525a38b04db..4bb12a1aadb0 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -149,6 +149,8 @@ public: virtual void SAL_CALL setMouseCursor(::sal_Int16 nPointerShape) throw (css::uno::RuntimeException); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCanvasArea( ) + throw (::com::sun::star::uno::RuntimeException); // lang::XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) @@ -236,6 +238,8 @@ private: css::uno::Reference mxPointer; css::uno::Reference mxWindow; css::uno::Reference mxViewWindow; + css::uno::Reference mxTopPane; + css::uno::Reference mxPresenterHelper; css::uno::Reference mxBackgroundPolygon1; css::uno::Reference mxBackgroundPolygon2; bool mbIsViewAdded; @@ -267,8 +271,7 @@ private: css::uno::Reference CreateViewWindow ( const css::uno::Reference& rxParentWindow) const; css::uno::Reference CreateViewCanvas ( - const css::uno::Reference& rxWindow, - const css::uno::Reference& rxParentPane) const; + const css::uno::Reference& rxWindow) const; void Resize (void); -- cgit