diff options
-rw-r--r-- | sdext/source/presenter/PresenterSlideShowView.hxx | 8 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterViewFactory.cxx | 11 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterViewFactory.hxx | 8 |
3 files changed, 24 insertions, 3 deletions
diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index 738c188f5131..4525a38b04db 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -8,7 +8,7 @@ * * $RCSfile: PresenterSlideShowView.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -88,6 +88,12 @@ public: void LateInit (void); virtual void SAL_CALL disposing (void); + + // CachablePresenterView + + virtual void ReleaseView (void); + + // XSlideShowView virtual css::uno::Reference< diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 17ca50f32a30..bcda35866d62 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -8,7 +8,7 @@ * * $RCSfile: PresenterViewFactory.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -320,6 +320,8 @@ void SAL_CALL PresenterViewFactory::releaseResource (const Reference<XResource>& { try { + if (pView != NULL) + pView->ReleaseView(); Reference<lang::XComponent> xComponent (rxView, UNO_QUERY); if (xComponent.is()) xComponent->dispose(); @@ -642,4 +644,11 @@ void CachablePresenterView::DeactivatePresenterView (void) + +void CachablePresenterView::ReleaseView (void) +{ +} + + + } } diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index 7da3ca1f1f9f..7472f4912f0d 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -8,7 +8,7 @@ * * $RCSfile: PresenterViewFactory.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -69,6 +69,12 @@ public: */ virtual void DeactivatePresenterView (void); + /** Called before the view is disposed. This gives the view the + oportunity to trigger actions that may lead to (synchronous) + callbacks that do not result in DisposedExceptions. + */ + virtual void ReleaseView (void); + protected: bool mbIsPresenterViewActive; |