3 files changed, 15 insertions, 15 deletions
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index 50ac309006cc..04a1de11f9fa 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -50,7 +50,7 @@ namespace {
 class ContentWindow : public ::sd::Window
 {
 public:
-    ContentWindow(::Window& rParent, SlideSorter& rSlideSorter);
+    ContentWindow(::vcl::Window& rParent, SlideSorter& rSlideSorter);
     virtual ~ContentWindow (void);
     void SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction);
     virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE;
@@ -90,7 +90,7 @@ private:
 ::boost::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter (
     ViewShellBase& rBase,
     ViewShell* pViewShell,
-    ::Window& rParentWindow)
+    ::vcl::Window& rParentWindow)
 {
     ::boost::shared_ptr<SlideSorter> pSlideSorter(
         new SlideSorter(
@@ -128,7 +128,7 @@ SlideSorter::SlideSorter (
 SlideSorter::SlideSorter (
     ViewShellBase& rBase,
     ViewShell* pViewShell,
-    ::Window& rParentWindow)
+    ::vcl::Window& rParentWindow)
     : mbIsValid(false),
       mpSlideSorterController(),
       mpSlideSorterModel(),
@@ -173,7 +173,7 @@ void SlideSorter::Init (void)
     SharedSdWindow pContentWindow (GetContentWindow());
     if (pContentWindow)
     {
-        ::Window* pParentWindow = pContentWindow->GetParent();
+        ::vcl::Window* pParentWindow = pContentWindow->GetParent();
         if (pParentWindow != NULL)
             pParentWindow->SetBackground(Wallpaper());
         pContentWindow->SetBackground(Wallpaper());
@@ -256,7 +256,7 @@ void SlideSorter::Paint (const Rectangle& rRepaintArea)
         GetContentWindow().get());
 }
 
-void SlideSorter::SetupControls (::Window* )
+void SlideSorter::SetupControls (::vcl::Window* )
 {
     GetVerticalScrollBar()->Show();
     mpSlideSorterController->GetScrollBarManager().LateInitialization();
@@ -267,7 +267,7 @@ void SlideSorter::SetupListeners (void)
     SharedSdWindow pWindow (GetContentWindow());
     if (pWindow)
     {
-        ::Window* pParentWindow = pWindow->GetParent();
+        ::vcl::Window* pParentWindow = pWindow->GetParent();
         if (pParentWindow != NULL)
             pParentWindow->AddEventListener(
                 LINK(
@@ -301,7 +301,7 @@ void SlideSorter::ReleaseListeners (void)
                 controller::SlideSorterController,
                 WindowEventHandler));
 
-        ::Window* pParentWindow = pWindow->GetParent();
+        ::vcl::Window* pParentWindow = pWindow->GetParent();
         if (pParentWindow != NULL)
             pParentWindow->RemoveEventListener(
                 LINK(mpSlideSorterController.get(),
@@ -400,14 +400,14 @@ SvBorder SlideSorter::GetBorder (void)
     return aBorder;
 }
 
-bool SlideSorter::RelocateToWindow (::Window* pParentWindow)
+bool SlideSorter::RelocateToWindow (::vcl::Window* pParentWindow)
 {
    // Stop all animations for they have been started for the old window.
     mpSlideSorterController->GetAnimator()->RemoveAllAnimations();
 
     ReleaseListeners();
 
-    ::Window *pNewWindow = NULL;
+    ::vcl::Window *pNewWindow = NULL;
     if (mpViewShell)
     {
         mpViewShell->ViewShell::RelocateToParentWindow(pParentWindow);
@@ -465,7 +465,7 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction)
 namespace {
 
 ContentWindow::ContentWindow(
-    ::Window& rParent,
+    ::vcl::Window& rParent,
     SlideSorter& rSlideSorter)
     : ::sd::Window(&rParent),
     mrSlideSorter(rSlideSorter),
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index 1d15c0935cc1..d167e1a3f533 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -123,7 +123,7 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments)
 
             // Get the parent window.
             mxParentWindow = Reference<awt::XWindow>(rArguments[2], UNO_QUERY_THROW);
-            ::Window* pParentWindow = VCLUnoHelper::GetWindow(mxParentWindow);
+            vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(mxParentWindow);
 
             mxParentWindow->addWindowListener(this);
 
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 1185a64a9e51..708bbb82a256 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -93,7 +93,7 @@ TYPEINIT1(SlideSorterViewShell, ViewShell);
 ::boost::shared_ptr<SlideSorterViewShell> SlideSorterViewShell::Create (
     SfxViewFrame* pFrame,
     ViewShellBase& rViewShellBase,
-    ::Window* pParentWindow,
+    ::vcl::Window* pParentWindow,
     FrameView* pFrameViewArgument,
     const bool bIsCenterPane)
 {
@@ -118,7 +118,7 @@ TYPEINIT1(SlideSorterViewShell, ViewShell);
 SlideSorterViewShell::SlideSorterViewShell (
     SfxViewFrame* pFrame,
     ViewShellBase& rViewShellBase,
-    ::Window* pParentWindow,
+    ::vcl::Window* pParentWindow,
     FrameView* pFrameViewArgument)
     : ViewShell (pFrame, pParentWindow, rViewShellBase),
       mpSlideSorter(),
@@ -292,7 +292,7 @@ SlideSorter& SlideSorterViewShell::GetSlideSorter (void) const
     return *mpSlideSorter;
 }
 
-bool SlideSorterViewShell::RelocateToParentWindow (::Window* pParentWindow)
+bool SlideSorterViewShell::RelocateToParentWindow (::vcl::Window* pParentWindow)
 {
     OSL_ASSERT(mpSlideSorter);
     if ( ! mpSlideSorter)
@@ -658,7 +658,7 @@ void SlideSorterViewShell::UpdateScrollBars (void)
 
 void SlideSorterViewShell::StartDrag (
     const Point& rDragPt,
-    ::Window* pWindow )
+    ::vcl::Window* pWindow )
 {
     OSL_ASSERT(mpSlideSorter.get()!=NULL);
     mpSlideSorter->GetController().GetClipboard().StartDrag (