diff options
Diffstat (limited to 'sd/source/ui/framework/factories')
10 files changed, 25 insertions, 25 deletions
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 9bc89f120e1e..2558510e6817 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -170,7 +170,7 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( } // Get Window pointer for XWindow of the pane. - ::Window* pWindow = NULL; + vcl::Window* pWindow = NULL; if (xPane.is()) pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); @@ -299,7 +299,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) ::boost::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView ( const Reference<XResourceId>& rxViewId, SfxViewFrame& rFrame, - ::Window& rWindow, + vcl::Window& rWindow, const Reference<XPane>& rxPane, FrameView* pFrameView, const bool bIsCenterPane) @@ -344,7 +344,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) ::boost::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( const Reference<XResourceId>& rxViewId, SfxViewFrame& rFrame, - ::Window& rWindow, + vcl::Window& rWindow, FrameView* pFrameView, const bool bIsCenterPane) { diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index 77a40a5f5461..fa62d325b17d 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -41,7 +41,7 @@ class ViewShellBase; class FrameView; } class SfxViewFrame; -class Window; +namespace vcl { class Window; } namespace { @@ -104,7 +104,7 @@ private: FrameView* mpFrameView; class ViewCache; - ::boost::shared_ptr<Window> mpWindow; + ::boost::shared_ptr<vcl::Window> mpWindow; ::boost::shared_ptr<ViewCache> mpViewCache; css::uno::Reference<css::drawing::framework::XPane> mxLocalPane; @@ -112,7 +112,7 @@ private: ::boost::shared_ptr<ViewDescriptor> CreateView ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, SfxViewFrame& rFrame, - ::Window& rWindow, + vcl::Window& rWindow, const css::uno::Reference<css::drawing::framework::XPane>& rxPane, FrameView* pFrameView, const bool bIsCenterView); @@ -120,7 +120,7 @@ private: ::boost::shared_ptr<ViewShell> CreateViewShell ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, SfxViewFrame& rFrame, - ::Window& rWindow, + vcl::Window& rWindow, FrameView* pFrameView, const bool bIsCenterView); diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 304574f3ea53..c08c590db1ee 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -38,7 +38,7 @@ ChildWindowPane::ChildWindowPane ( sal_uInt16 nChildWindowId, ViewShellBase& rViewShellBase, ::std::auto_ptr<SfxShell> pShell) - : ChildWindowPaneInterfaceBase(rxPaneId,(::Window*)NULL), + : ChildWindowPaneInterfaceBase(rxPaneId,(vcl::Window*)NULL), mnChildWindowId(nChildWindowId), mrViewShellBase(rViewShellBase), mpShell(pShell), @@ -118,7 +118,7 @@ void SAL_CALL ChildWindowPane::disposing (void) Pane::disposing(); } -::Window* ChildWindowPane::GetWindow (void) +::vcl::Window* ChildWindowPane::GetWindow (void) { do { diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index f244f61fcecc..72d42a51562d 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -72,7 +72,7 @@ public: Note that GetWindow() may return different Window pointers when Hide() is called in between. */ - virtual ::Window* GetWindow (void) SAL_OVERRIDE; + virtual vcl::Window* GetWindow (void) SAL_OVERRIDE; /** The local getWindow() first calls GetWindow() to provide a valid window pointer before forwarding the call to the base class. diff --git a/sd/source/ui/framework/factories/FrameWindowPane.cxx b/sd/source/ui/framework/factories/FrameWindowPane.cxx index dec2d0ee4ed2..82af2666733b 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.cxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.cxx @@ -27,7 +27,7 @@ namespace sd { namespace framework { FrameWindowPane::FrameWindowPane ( const Reference<XResourceId>& rxPaneId, - ::Window* pWindow) + vcl::Window* pWindow) : Pane(rxPaneId,pWindow) { } diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx index 7276ecc53c1b..836c2f77929f 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.hxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx @@ -36,7 +36,7 @@ public: FrameWindowPane ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId>& rxPaneId, - ::Window* pWindow); + vcl::Window* pWindow); virtual ~FrameWindowPane (void) throw(); /** A frame window typically can (and should) exists on its own without diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 105d557680d6..13a9af05759d 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -40,12 +40,12 @@ namespace sd { namespace framework { FullScreenPane::FullScreenPane ( const Reference<XComponentContext>& rxComponentContext, const Reference<XResourceId>& rxPaneId, - const ::Window* pViewShellWindow) + const vcl::Window* pViewShellWindow) : FrameWindowPane(rxPaneId,NULL), mxComponentContext(rxComponentContext), mpWorkWindow(NULL) { - ::Window* pParent = NULL; + vcl::Window* pParent = NULL; mpWorkWindow.reset(new WorkWindow( pParent, 0)); // For debugging (non-fullscreen) use WB_BORDER | WB_MOVEABLE | WB_SIZEABLE)); @@ -86,7 +86,7 @@ FullScreenPane::FullScreenPane ( // For some reason the VCL canvas can not paint into a WorkWindow. // Therefore a child window is created that covers the WorkWindow // completely. - mpWindow = new ::Window(mpWorkWindow.get()); + mpWindow = new vcl::Window(mpWorkWindow.get()); mpWindow->SetPosSizePixel(Point(0,0), mpWorkWindow->GetSizePixel()); mpWindow->SetBackground(Wallpaper()); mxWindow = VCLUnoHelper::GetInterface(mpWindow); @@ -165,7 +165,7 @@ void SAL_CALL FullScreenPane::setAccessible ( Reference<lang::XInitialization> xInitializable (rxAccessible, UNO_QUERY); if (xInitializable.is()) { - ::Window* pParentWindow = mpWindow->GetParent(); + vcl::Window* pParentWindow = mpWindow->GetParent(); Reference<css::accessibility::XAccessible> xAccessibleParent; if (pParentWindow != NULL) xAccessibleParent = pParentWindow->GetAccessible(); @@ -198,7 +198,7 @@ IMPL_LINK(FullScreenPane, WindowEventHandler, VclWindowEvent*, pEvent) Reference<rendering::XCanvas> FullScreenPane::CreateCanvas (void) throw (RuntimeException) { - ::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow); if (pWindow != NULL) { Sequence<Any> aArg (5); diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index af9a47f03ce1..1d7c3481ea98 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -51,7 +51,7 @@ public: FullScreenPane ( const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, - const ::Window* pViewShellWindow); + const vcl::Window* pViewShellWindow); virtual ~FullScreenPane (void) throw(); virtual void SAL_CALL disposing (void) SAL_OVERRIDE; diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 5fea572a81ad..978cb870f8ec 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -34,7 +34,7 @@ namespace sd { namespace framework { Pane::Pane ( const Reference<XResourceId>& rxPaneId, - ::Window* pWindow) + vcl::Window* pWindow) throw () : PaneInterfaceBase(MutexOwner::maMutex), mxPaneId(rxPaneId), @@ -53,7 +53,7 @@ void Pane::disposing (void) mpWindow = NULL; } -::Window* Pane::GetWindow (void) +::vcl::Window* Pane::GetWindow (void) { if (mxWindow.is()) return mpWindow; @@ -90,7 +90,7 @@ sal_Bool SAL_CALL Pane::isVisible (void) { ThrowIfDisposed(); - const ::Window* pWindow = GetWindow(); + const vcl::Window* pWindow = GetWindow(); if (pWindow != NULL) return pWindow->IsVisible(); else @@ -102,7 +102,7 @@ void SAL_CALL Pane::setVisible (sal_Bool bIsVisible) { ThrowIfDisposed(); - ::Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if (pWindow != NULL) pWindow->Show(bIsVisible); } @@ -111,7 +111,7 @@ Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible (void) throw (RuntimeException, std::exception) { ThrowIfDisposed(); - ::Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if (pWindow != NULL) return pWindow->GetAccessible(false); else @@ -123,7 +123,7 @@ void SAL_CALL Pane::setAccessible ( throw (RuntimeException, std::exception) { ThrowIfDisposed(); - ::Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if (pWindow != NULL) pWindow->SetAccessible(rxAccessible); } diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index 867737c021f0..656bbcc703b9 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -207,7 +207,7 @@ sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor ( if (mpViewShell.get() != NULL) { - ::Window* pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); + ::vcl::Window* pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); if (pWindow != NULL && mpViewShell->RelocateToParentWindow(pWindow)) { bResult = true; |