diff options
Diffstat (limited to 'sdext/source/presenter/PresenterScreen.cxx')
-rw-r--r-- | sdext/source/presenter/PresenterScreen.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 951c4610b8be..89f8fd3a3da6 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,11 +88,11 @@ namespace { virtual void SAL_CALL disposing (void); // document::XEventListener - + virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException); // XEventListener - + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException); private: @@ -251,7 +251,7 @@ void SAL_CALL PresenterScreenListener::disposing (void) xDocBroadcaster->removeEventListener( Reference<document::XEventListener>( static_cast<document::XEventListener*>(this), UNO_QUERY)); - + if (mpPresenterScreen.is()) { mpPresenterScreen->RequestShutdownPresenterScreen(); @@ -263,7 +263,7 @@ void SAL_CALL PresenterScreenListener::disposing (void) // document::XEventListener - + void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException) { ThrowIfDisposed(); @@ -287,12 +287,12 @@ void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventOb // XEventListener - + void SAL_CALL PresenterScreenListener::disposing (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException) { (void)rEvent; - + if (mpPresenterScreen.is()) { mpPresenterScreen->RequestShutdownPresenterScreen(); @@ -510,7 +510,7 @@ sal_Int32 PresenterScreen::GetScreenNumber ( UNO_QUERY); if ( ! xDisplayProperties.is()) return -1; - + if (nDisplayNumber > 0) { nScreenNumber = nDisplayNumber - 1; @@ -523,7 +523,7 @@ sal_Int32 PresenterScreen::GetScreenNumber ( if (nDisplayNumber <= 0 && xDisplayProperties.is()) xDisplayProperties->getPropertyValue(A2S("DefaultDisplay")) >>= nScreenNumber; } - + // We still have to determine the number of screens to decide // whether the presenter screen may be shown at all. Reference<container::XIndexAccess> xIndexAccess (xDisplayProperties, UNO_QUERY); @@ -572,7 +572,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId ( const sal_Int32 nScreenNumber(GetScreenNumber(rxPresentation)); if (nScreenNumber < 0) return NULL; - + // Setup the resource id of the full screen background pane so that // it is displayed on another screen than the presentation. sal_Int32 nPresenterScreenNumber (1); @@ -585,7 +585,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId ( case 1: nPresenterScreenNumber = 0; break; - + default: // When the full screen presentation is displayed on a screen // other than 0 or 1 then place the presenter on the first @@ -593,7 +593,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId ( nPresenterScreenNumber = 0; break; } - + return ResourceId::create( Reference<XComponentContext>(mxContextWeak), PresenterHelper::msFullScreenPaneURL @@ -639,7 +639,7 @@ void PresenterScreen::ShutdownPresenterScreen (void) if (xViewFactoryComponent.is()) xViewFactoryComponent->dispose(); mxViewFactory = NULL; - + Reference<lang::XComponent> xPaneFactoryComponent (mxPaneFactory, UNO_QUERY); if (xPaneFactoryComponent.is()) xPaneFactoryComponent->dispose(); @@ -713,7 +713,7 @@ void PresenterScreen::SetupConfiguration ( } catch (RuntimeException&) { - } + } } @@ -770,7 +770,7 @@ void PresenterScreen::ProcessLayout ( } catch (RuntimeException&) { - } + } } @@ -799,7 +799,7 @@ void PresenterScreen::ProcessViewDescriptions ( catch (RuntimeException&) { OSL_ASSERT(false); - } + } } |