diff options
Diffstat (limited to 'sd/source/ui/slidesorter/controller')
3 files changed, 16 insertions, 16 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index b3f920a4692a..20d627eaedad 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -123,7 +123,7 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) if (pWindow) { // The whole background is painted by the view and controls. - ::Window* pParentWindow = pWindow->GetParent(); + ::vcl::Window* pParentWindow = pWindow->GetParent(); OSL_ASSERT(pParentWindow!=NULL); pParentWindow->SetBackground (Wallpaper()); @@ -267,7 +267,7 @@ ScrollBarManager& SlideSorterController::GetScrollBarManager (void) void SlideSorterController::Paint ( const Rectangle& rBBox, - ::Window* pWindow) + ::vcl::Window* pWindow) { if (mnPaintEntranceCount == 0) { @@ -542,7 +542,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent) { if (pEvent != NULL) { - ::Window* pWindow = pEvent->GetWindow(); + ::vcl::Window* pWindow = pEvent->GetWindow(); SharedSdWindow pActiveWindow (mrSlideSorter.GetContentWindow()); switch (pEvent->GetId()) { diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index fee1e6c96446..f633a4fe8ae5 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -217,7 +217,7 @@ void Clipboard::HandleSlotCall (SfxRequest& rRequest) } } -void Clipboard::DoCut (::Window* pWindow) +void Clipboard::DoCut (::vcl::Window* pWindow) { if (mrSlideSorter.GetModel().GetPageCount() > 1) { @@ -226,7 +226,7 @@ void Clipboard::DoCut (::Window* pWindow) } } -void Clipboard::DoDelete (::Window* ) +void Clipboard::DoDelete (::vcl::Window* ) { if (mrSlideSorter.GetModel().GetPageCount() > 1) { @@ -234,12 +234,12 @@ void Clipboard::DoDelete (::Window* ) } } -void Clipboard::DoCopy (::Window* pWindow ) +void Clipboard::DoCopy (::vcl::Window* pWindow ) { CreateSlideTransferable( pWindow, false ); } -void Clipboard::DoPaste (::Window* pWindow) +void Clipboard::DoPaste (::vcl::Window* pWindow) { SdTransferable* pClipTransferable = SD_MOD()->pTransferClip; @@ -259,7 +259,7 @@ void Clipboard::DoPaste (::Window* pWindow) } } -sal_Int32 Clipboard::GetInsertionPosition (::Window* pWindow) +sal_Int32 Clipboard::GetInsertionPosition (::vcl::Window* pWindow) { sal_Int32 nInsertPosition = -1; @@ -377,7 +377,7 @@ void Clipboard::SelectPageRange (sal_Int32 nFirstIndex, sal_Int32 nPageCount) } void Clipboard::CreateSlideTransferable ( - ::Window* pWindow, + ::vcl::Window* pWindow, bool bDrag) { std::vector<OUString> aBookmarkList; @@ -442,7 +442,7 @@ void Clipboard::CreateSlideTransferable ( aObjDesc.maDisplayName = pDocument->GetDocSh() ->GetMedium()->GetURLObject().GetURLNoPass(); - ::Window* pActionWindow = pWindow; + ::vcl::Window* pActionWindow = pWindow; if (pActionWindow == NULL) { ViewShell* pViewShell = mrSlideSorter.GetViewShell(); @@ -556,7 +556,7 @@ void Clipboard::CreateSlideTransferable ( void Clipboard::StartDrag ( const Point& rPosition, - ::Window* pWindow) + ::vcl::Window* pWindow) { maPagesToRemove.clear(); maPagesToSelect.clear(); diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 0da6c42d5874..6f66ccd60261 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -290,12 +290,12 @@ public: #else SelectionFunction& rSelectionFunction, const Point& rMousePosition, - ::Window* pWindow); + ::vcl::Window* pWindow); #endif virtual ~DragAndDropModeHandler (void); #ifndef MACOSX - void Initialize(const Point& rMousePosition, ::Window* pWindow); + void Initialize(const Point& rMousePosition, ::vcl::Window* pWindow); #endif virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; @@ -390,7 +390,7 @@ bool SelectionFunction::KeyInput (const KeyEvent& rEvent) FocusManager& rFocusManager (mrController.GetFocusManager()); bool bResult = false; - const vcl::KeyCode& rCode (rEvent.GetKeyCode()); + const ::vcl::KeyCode& rCode (rEvent.GetKeyCode()); switch (rCode.GetCode()) { case KEY_RETURN: @@ -1508,14 +1508,14 @@ DragAndDropModeHandler::DragAndDropModeHandler ( #else SelectionFunction& rSelectionFunction, const Point& rMousePosition, - ::Window* pWindow) + ::vcl::Window* pWindow) #endif : ModeHandler(rSlideSorter, rSelectionFunction, false) { #ifndef MACOSX } -void DragAndDropModeHandler::Initialize(const Point& rMousePosition, ::Window* pWindow) +void DragAndDropModeHandler::Initialize(const Point& rMousePosition, ::vcl::Window* pWindow) { #endif SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag; |