diff options
Diffstat (limited to 'sd/source/ui/framework/factories')
17 files changed, 96 insertions, 96 deletions
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index f406501bd114..e05e66c4c47c 100755 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -1,7 +1,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 @@ -146,7 +146,7 @@ BasicPaneFactory::BasicPaneFactory ( BasicPaneFactory::~BasicPaneFactory (void) { } - + @@ -440,7 +440,7 @@ void SAL_CALL BasicPaneFactory::notifyConfigurationChange ( - + //===== lang::XEventListener ================================================== void SAL_CALL BasicPaneFactory::disposing ( @@ -477,7 +477,7 @@ Reference<XResource> BasicPaneFactory::CreateFrameWindowPane ( const Reference<XResourceId>& rxPaneId) { Reference<XResource> xPane; - + if (mpViewShellBase != NULL) { xPane = new FrameWindowPane(rxPaneId, mpViewShellBase->GetViewWindow()); @@ -522,12 +522,12 @@ Reference<XResource> BasicPaneFactory::CreateChildWindowPane ( pShell.reset(new LeftImpressPaneShell()); nChildWindowId = ::sd::LeftPaneImpressChildWindow::GetChildWindowId(); break; - + case LeftDrawPaneId: pShell.reset(new LeftDrawPaneShell()); nChildWindowId = ::sd::LeftPaneDrawChildWindow::GetChildWindowId(); break; - + case RightPaneId: pShell.reset(new ToolPanelPaneShell()); nChildWindowId = ::sd::ToolPanelChildWindow::GetChildWindowId(); diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index 9b41866180fc..9ce59689fb11 100755 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx @@ -1,7 +1,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 @@ -77,25 +77,25 @@ namespace sd { namespace framework { */ class BasicPaneFactory : private ::cppu::BaseMutex, - public BasicPaneFactoryInterfaceBase + public BasicPaneFactoryInterfaceBase { public: BasicPaneFactory ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); virtual ~BasicPaneFactory (void); - + virtual void SAL_CALL disposing (void); - + // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); // XResourceFactory - + virtual css::uno::Reference<css::drawing::framework::XResource> SAL_CALL createResource ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId) @@ -115,7 +115,7 @@ public: // lang::XEventListener - + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEventObject) throw (css::uno::RuntimeException); diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index d353cfc58c1f..3301f4b2b5ad 100755 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -1,7 +1,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 @@ -189,7 +189,7 @@ void SAL_CALL BasicToolBarFactory::disposing ( //===== XPaneFactory ========================================================== - + Reference<XResource> SAL_CALL BasicToolBarFactory::createResource ( const Reference<XResourceId>& rxToolBarId) throw (RuntimeException, IllegalArgumentException, WrappedTargetException) @@ -197,7 +197,7 @@ Reference<XResource> SAL_CALL BasicToolBarFactory::createResource ( ThrowIfDisposed(); Reference<XResource> xToolBar; - + if (rxToolBarId->getResourceURL().equals(FrameworkHelper::msViewTabBarURL)) { xToolBar = new ViewTabBar(rxToolBarId, mxController); @@ -205,7 +205,7 @@ Reference<XResource> SAL_CALL BasicToolBarFactory::createResource ( else throw lang::IllegalArgumentException(); - + return xToolBar; } diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx index 686de897c179..8b98a3d15a0f 100755 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx @@ -1,7 +1,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 @@ -64,18 +64,18 @@ namespace sd { namespace framework { */ class BasicToolBarFactory : protected ::cppu::BaseMutex, - public BasicToolBarFactoryInterfaceBase + public BasicToolBarFactoryInterfaceBase { public: BasicToolBarFactory ( const css::uno::Reference<com::sun::star::uno::XComponentContext>& rxContext); virtual ~BasicToolBarFactory (void); - + virtual void SAL_CALL disposing (void); - + // ToolBarFactory - + virtual css::uno::Reference<com::sun::star::drawing::framework::XResource> SAL_CALL createResource ( const css::uno::Reference< @@ -90,14 +90,14 @@ public: // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<com::sun::star::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); - + // lang::XEventListener - + virtual void SAL_CALL disposing ( const css::lang::EventObject& rEventObject) throw (css::uno::RuntimeException); diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 1320df5c827b..d73efd9979bf 100755 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -1,7 +1,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 @@ -153,7 +153,7 @@ BasicViewFactory::BasicViewFactory ( BasicViewFactory::~BasicViewFactory (void) { } - + @@ -172,7 +172,7 @@ void SAL_CALL BasicViewFactory::disposing (void) { ReleaseView(*iView, true); } - + // Release the view shell container. At this point no one other than us // should hold references to the view shells (at the moment this is a // trivial requirement, because no one other then us holds a shared @@ -215,10 +215,10 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); // Get the view frame. - SfxViewFrame* pFrame = NULL; + SfxViewFrame* pFrame = NULL; if (mpBase != NULL) pFrame = mpBase->GetViewFrame(); - + if (pFrame != NULL && mpBase!=NULL && pWindow!=NULL) { // Try to get the view from the cache. @@ -229,7 +229,7 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( { pDescriptor = CreateView(rxViewId, *pFrame, *pWindow, xPane, pFrameView); } - + if (pDescriptor.get() != NULL) xView = pDescriptor->mxView; @@ -240,7 +240,7 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( else pWindow->Resize(); } - + return xView; } @@ -354,14 +354,14 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) FrameView* pFrameView) { ::boost::shared_ptr<ViewDescriptor> pDescriptor (new ViewDescriptor()); - + pDescriptor->mpViewShell = CreateViewShell( rxViewId, rFrame, rWindow, pFrameView); pDescriptor->mxViewId = rxViewId; - + if (pDescriptor->mpViewShell.get() != NULL) { const bool bIsCenterPane ( @@ -476,7 +476,7 @@ void BasicViewFactory::ReleaseView ( bool bDoNotCache) { bool bIsCacheable (!bDoNotCache && IsCacheable(rpDescriptor)); - + if (bIsCacheable) { Reference<XRelocatableResource> xResource (rpDescriptor->mxView, UNO_QUERY); @@ -496,14 +496,14 @@ void BasicViewFactory::ReleaseView ( bIsCacheable = false; } } - + if ( ! bIsCacheable) { // Shut down the current view shell. rpDescriptor->mpViewShell->Shutdown (); mpBase->GetDocShell()->Disconnect(rpDescriptor->mpViewShell.get()); mpBase->GetViewShellManager()->DeactivateViewShell(rpDescriptor->mpViewShell.get()); - + Reference<XComponent> xComponent (rpDescriptor->mxView, UNO_QUERY); if (xComponent.is()) xComponent->dispose(); @@ -581,7 +581,7 @@ bool BasicViewFactory::IsCacheable (const ::boost::shared_ptr<ViewDescriptor>& r if (xResource->relocateToAnchor(xNewAnchor)) bRelocationSuccessfull = true; } - + if ( ! bRelocationSuccessfull) { ReleaseView(pDescriptor, true); diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index e5bb43551a24..34d2e258768b 100755 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -1,7 +1,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 @@ -81,16 +81,16 @@ namespace sd { namespace framework { */ class BasicViewFactory : private sd::MutexOwner, - public BasicViewFactoryInterfaceBase + public BasicViewFactoryInterfaceBase { public: BasicViewFactory ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); virtual ~BasicViewFactory (void); - + virtual void SAL_CALL disposing (void); - + // XViewFactory virtual css::uno::Reference<css::drawing::framework::XResource> @@ -102,9 +102,9 @@ public: const css::uno::Reference<css::drawing::framework::XResource>& xView) throw(css::uno::RuntimeException); - + // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); @@ -129,7 +129,7 @@ private: ::Window& rWindow, const css::uno::Reference<css::drawing::framework::XPane>& rxPane, FrameView* pFrameView); - + ::boost::shared_ptr<ViewShell> CreateViewShell ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, SfxViewFrame& rFrame, diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 5e4e6df987f0..a9717ff21dee 100755 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -1,7 +1,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 @@ -146,7 +146,7 @@ void SAL_CALL ChildWindowPane::disposing (void) if (mxWindow.is()) // Window already exists => nothing to do. break; - + // When the window is not yet present then obtain it only when the // shell has already been activated. The activation is not // necessary for the code to work properly but is used to optimize @@ -156,7 +156,7 @@ void SAL_CALL ChildWindowPane::disposing (void) // Impress takes longer. if ( ! mbHasBeenActivated && mpShell.get()!=NULL && ! mpShell->IsActive()) break; - + mbHasBeenActivated = true; SfxViewFrame* pViewFrame = mrViewShellBase.GetViewFrame(); if (pViewFrame == NULL) @@ -193,7 +193,7 @@ void SAL_CALL ChildWindowPane::disposing (void) // At last, we have access to the window and its UNO wrapper. mpWindow = &pDockingWindow->GetContentWindow(); mxWindow = VCLUnoHelper::GetInterface(mpWindow); - + // Register as window listener to be informed when the child window // is hidden. if (mxWindow.is()) @@ -218,11 +218,11 @@ Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow (void) IMPLEMENT_FORWARD_XINTERFACE2( - ChildWindowPane, + ChildWindowPane, ChildWindowPaneInterfaceBase, Pane); IMPLEMENT_FORWARD_XTYPEPROVIDER2( - ChildWindowPane, + ChildWindowPane, ChildWindowPaneInterfaceBase, Pane); @@ -235,7 +235,7 @@ void SAL_CALL ChildWindowPane::disposing (const lang::EventObject& rEvent) throw (RuntimeException) { ThrowIfDisposed(); - + if (rEvent.Source == mxWindow) { // The window is gone but the pane remains alive. The next call to diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index 4d2f154a327f..7bf636c3f765 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -1,7 +1,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 @@ -118,7 +118,7 @@ private: USHORT mnChildWindowId; ViewShellBase& mrViewShellBase; ::std::auto_ptr<SfxShell> mpShell; - + /** This flag is set when the pane shell has been activated at least once. It is used to optimize the start-up performance (by not showing the window too early) and by not delaying its creation at diff --git a/sd/source/ui/framework/factories/FrameWindowPane.cxx b/sd/source/ui/framework/factories/FrameWindowPane.cxx index 8cdbffe05816..31707e9fb867 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.cxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.cxx @@ -1,7 +1,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 diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx index 9fbc153f59ce..017fc7414062 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.hxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx @@ -1,7 +1,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 diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 74088422b4ab..c5f3d59807bd 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -1,7 +1,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 @@ -68,7 +68,7 @@ FullScreenPane::FullScreenPane ( sal_Int32 nScreenNumber = 1; ExtractArguments(rxPaneId, nScreenNumber); - + if (mpWorkWindow.get() == NULL) return; @@ -134,8 +134,8 @@ void SAL_CALL FullScreenPane::disposing (void) mpWorkWindow->RemoveEventListener(aWindowEventHandler); mpWorkWindow.reset(); } - - + + FrameWindowPane::disposing(); } @@ -191,7 +191,7 @@ void SAL_CALL FullScreenPane::setAccessible ( throw (RuntimeException) { ThrowIfDisposed(); - + if (mpWindow != NULL) { Reference<lang::XInitialization> xInitializable (rxAccessible, UNO_QUERY); @@ -242,14 +242,14 @@ Reference<rendering::XCanvas> FullScreenPane::CreateCanvas (void) if (pWindow != NULL) { Sequence<Any> aArg (5); - + // common: first any is VCL pointer to window (for VCL canvas) aArg[0] = makeAny(reinterpret_cast<sal_Int64>(pWindow)); aArg[1] = Any(); aArg[2] = makeAny(::com::sun::star::awt::Rectangle()); aArg[3] = makeAny(sal_False); aArg[4] = makeAny(mxWindow); - + Reference<lang::XMultiServiceFactory> xFactory ( mxComponentContext->getServiceManager(), UNO_QUERY_THROW); return Reference<rendering::XCanvas>( diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index c69a09e10b54..7e71abb8470c 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -1,7 +1,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 @@ -81,7 +81,7 @@ public: const cssu::Reference<css::accessibility::XAccessible>& rxAccessible) throw (cssu::RuntimeException); - + //------------------------------------------------------------------------- DECL_LINK(WindowEventHandler, VclWindowEvent*); diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 94081f24b733..08306aa22cbc 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -1,7 +1,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 @@ -86,7 +86,7 @@ void Pane::disposing (void) //----- XPane ----------------------------------------------------------------- - + Reference<awt::XWindow> SAL_CALL Pane::getWindow (void) throw (RuntimeException) { @@ -106,7 +106,7 @@ Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas (void) if ( ! mxCanvas.is()) mxCanvas = CreateCanvas(); - + return mxCanvas; } @@ -215,7 +215,7 @@ const Sequence<sal_Int8>& Pane::getUnoTunnelId (void) sal_Int64 SAL_CALL Pane::getSomething (const Sequence<sal_Int8>& rId) throw (RuntimeException) -{ +{ sal_Int64 nResult = 0; if (rId.getLength() == 16 @@ -236,7 +236,7 @@ Reference<rendering::XCanvas> Pane::CreateCanvas (void) throw (RuntimeException) { Reference<rendering::XCanvas> xCanvas; - + if (mpWindow != NULL) { ::cppcanvas::SpriteCanvasSharedPtr pCanvas ( @@ -244,7 +244,7 @@ Reference<rendering::XCanvas> Pane::CreateCanvas (void) if (pCanvas.get() != NULL) xCanvas = Reference<rendering::XCanvas>(pCanvas->getUNOSpriteCanvas(), UNO_QUERY); } - + return xCanvas; } diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 6f22f1484627..623eddf134a8 100755 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -1,7 +1,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 @@ -61,9 +61,9 @@ public: virtual ~PresentationFactoryProvider (void); virtual void SAL_CALL disposing (void); - + // XInitialization - + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArguments) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -95,7 +95,7 @@ public: virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (RuntimeException) { return false; } - + private: Reference<XResourceId> mxResourceId; }; @@ -167,7 +167,7 @@ PresentationFactory::PresentationFactory ( PresentationFactory::~PresentationFactory (void) { } - + @@ -231,7 +231,7 @@ void SAL_CALL PresentationFactory::notifyConfigurationChange ( - + //===== lang::XEventListener ================================================== void SAL_CALL PresentationFactory::disposing ( @@ -290,7 +290,7 @@ void PresentationFactoryProvider::disposing (void) // XInitialization - + void SAL_CALL PresentationFactoryProvider::initialize( const Sequence<Any>& aArguments) throw (Exception, RuntimeException) diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.cxx b/sd/source/ui/framework/factories/TaskPanelFactory.cxx index d7c45ceb803b..b518b51aea4d 100755 --- a/sd/source/ui/framework/factories/TaskPanelFactory.cxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.cxx @@ -1,7 +1,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 @@ -82,13 +82,13 @@ typedef ::cppu::WeakComponentImplHelper1 < class TaskPanelResource : private ::cppu::BaseMutex, - public TaskPanelResourceInterfaceBase + public TaskPanelResourceInterfaceBase { public: TaskPanelResource ( const Reference<XResourceId>& rxResourceId ); virtual ~TaskPanelResource (); - + virtual void SAL_CALL disposing (); // XResource @@ -134,9 +134,9 @@ void SAL_CALL TaskPanelFactory::disposing (void) - + //===== XInitialization ======================================================= - + void SAL_CALL TaskPanelFactory::initialize( const ::com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArguments) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) @@ -205,7 +205,7 @@ Reference<XResource> SAL_CALL TaskPanelFactory::createResource ( throw (RuntimeException, IllegalArgumentException, WrappedTargetException) { Reference<XResource> xResource; - + if ( ! rxResourceId.is()) return NULL; @@ -214,7 +214,7 @@ Reference<XResource> SAL_CALL TaskPanelFactory::createResource ( if ( sResourceURL.match( FrameworkHelper::msTaskPanelURLPrefix ) ) { toolpanel::PanelId ePanelId( toolpanel::GetStandardPanelId( sResourceURL ) ); - + if ( ( ePanelId != toolpanel::PID_UNKNOWN ) && ( mpViewShellBase != NULL ) ) { ::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( *mpViewShellBase ) ); diff --git a/sd/source/ui/framework/factories/TaskPanelFactory.hxx b/sd/source/ui/framework/factories/TaskPanelFactory.hxx index 086788a6763e..347e89c4d953 100755 --- a/sd/source/ui/framework/factories/TaskPanelFactory.hxx +++ b/sd/source/ui/framework/factories/TaskPanelFactory.hxx @@ -1,7 +1,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 @@ -57,18 +57,18 @@ namespace sd { namespace framework { */ class TaskPanelFactory : private ::cppu::BaseMutex, - public TaskPanelFactoryInterfaceBase + public TaskPanelFactoryInterfaceBase { public: TaskPanelFactory ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); virtual ~TaskPanelFactory (void); - + virtual void SAL_CALL disposing (void); - + // XInitialization - + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments) throw (css::uno::Exception, css::uno::RuntimeException); diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index a1c0bd525c9e..faac4af35412 100755 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -1,7 +1,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 @@ -83,7 +83,7 @@ ViewShellWrapper::ViewShellWrapper ( ViewShellWrapper::~ViewShellWrapper (void) { } - + @@ -149,7 +149,7 @@ sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor ( if (xWindow.is()) xWindow->removeWindowListener(this); mxWindow = NULL; - + if (mpViewShell.get() != NULL) { ::Window* pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); @@ -197,7 +197,7 @@ const Sequence<sal_Int8>& ViewShellWrapper::getUnoTunnelId (void) sal_Int64 SAL_CALL ViewShellWrapper::getSomething (const Sequence<sal_Int8>& rId) throw (RuntimeException) -{ +{ sal_Int64 nResult = 0; if (rId.getLength() == 16 @@ -231,7 +231,7 @@ void SAL_CALL ViewShellWrapper::windowMoved (const awt::WindowEvent& rEvent) { (void)rEvent; } - + @@ -243,7 +243,7 @@ void SAL_CALL ViewShellWrapper::windowShown (const lang::EventObject& rEvent) if (pViewShell != NULL) pViewShell->Resize(); } - + |