diff options
Diffstat (limited to 'sd/source/ui/slidesorter')
8 files changed, 17 insertions, 17 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 6ae302375449..4dfad09947a0 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -261,7 +261,7 @@ void SlideSorterController::Paint ( try { - mrView.CompleteRedraw(pWindow, vcl::Region(rBBox)); + mrView.CompleteRedraw(pWindow->GetOutDev(), vcl::Region(rBBox)); } catch (const Exception&) { @@ -552,7 +552,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent&, rEvent, vo if (mrSlideSorter.GetViewShell() != nullptr) mrSlideSorter.GetViewShell()->GetFrameView()->SetDrawMode(nDrawMode); if (pActiveWindow != nullptr) - pActiveWindow->SetDrawMode(nDrawMode); + pActiveWindow->GetOutDev()->SetDrawMode(nDrawMode); mrView.HandleDrawModeChange(); // When the system font has changed a layout has to be done. @@ -596,7 +596,7 @@ void SlideSorterController::GetCtrlState (SfxItemSet& rSet) { if (mrSlideSorter.GetContentWindow()) { - DrawModeFlags nMode = mrSlideSorter.GetContentWindow()->GetDrawMode(); + DrawModeFlags nMode = mrSlideSorter.GetContentWindow()->GetOutDev()->GetDrawMode(); sal_uInt16 nQuality = 0; if (nMode == sd::OUTPUT_DRAWMODE_COLOR) { diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 1780554f74e9..dfa667984a12 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -540,8 +540,8 @@ void SlideSorterViewShell::ReadFrameViewData (FrameView* pFrameView) mpSlideSorter->GetController().Rearrange(true); // DrawMode for 'main' window - if (GetActiveWindow()->GetDrawMode() != pFrameView->GetDrawMode() ) - GetActiveWindow()->SetDrawMode( pFrameView->GetDrawMode() ); + if (GetActiveWindow()->GetOutDev()->GetDrawMode() != pFrameView->GetDrawMode() ) + GetActiveWindow()->GetOutDev()->SetDrawMode( pFrameView->GetDrawMode() ); } // When this slide sorter is not displayed in the main window then we do @@ -566,8 +566,8 @@ void SlideSorterViewShell::WriteFrameViewData() mpFrameView->SetSlidesPerRow(static_cast<sal_uInt16>(rView.GetLayouter().GetColumnCount())); // DrawMode for 'main' window - if( mpFrameView->GetDrawMode() != GetActiveWindow()->GetDrawMode() ) - mpFrameView->SetDrawMode( GetActiveWindow()->GetDrawMode() ); + if( mpFrameView->GetDrawMode() != GetActiveWindow()->GetOutDev()->GetDrawMode() ) + mpFrameView->SetDrawMode( GetActiveWindow()->GetOutDev()->GetDrawMode() ); SdPage* pActualPage = GetActualPage(); if (pActualPage != nullptr) diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index c56bd41cff83..c1eaf8302d08 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -114,7 +114,7 @@ private: SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter) : ::sd::View ( *rSlideSorter.GetModel().GetDocument(), - rSlideSorter.GetContentWindow(), + rSlideSorter.GetContentWindow()->GetOutDev(), rSlideSorter.GetViewShell()), mrSlideSorter(rSlideSorter), mrModel(rSlideSorter.GetModel()), @@ -576,7 +576,7 @@ void SlideSorterView::CompleteRedraw ( if (comphelper::LibreOfficeKit::isActive()) return; - if (pDevice == nullptr || pDevice!=mrSlideSorter.GetContentWindow()) + if (pDevice == nullptr || pDevice!=mrSlideSorter.GetContentWindow()->GetOutDev()) return; #ifdef DEBUG_TIMING diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx index 63f89b9ca1c1..9e1eae75778a 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx @@ -424,7 +424,7 @@ void PageObjectRun::operator () (const double nGlobalTime) // a) animations a bit more smooth and // b) on Mac without the Flush a Reset of the page locations is not properly // visualized when the mouse leaves the window during drag-and-drop. - mrAnimatorAccess.GetContentWindow()->Flush(); + mrAnimatorAccess.GetContentWindow()->GetOutDev()->Flush(); } } // end of namespace ::sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 6c17152faa9b..6b674f4f7302 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -130,7 +130,7 @@ void InsertionIndicatorOverlay::Create ( // Create virtual devices for bitmap and mask whose bitmaps later be // combined to form the BitmapEx of the icon. ScopedVclPtrInstance<VirtualDevice> pContent( - *mrSlideSorter.GetContentWindow(), DeviceFormat::DEFAULT, DeviceFormat::DEFAULT); + *mrSlideSorter.GetContentWindow()->GetOutDev(), DeviceFormat::DEFAULT, DeviceFormat::DEFAULT); pContent->SetOutputSizePixel(aIconSize); pContent->SetFillColor(); diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx index 4ae4ecdeeb60..9c2ce78303c7 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx @@ -161,7 +161,7 @@ private: LayeredDevice::LayeredDevice (const VclPtr<sd::Window>& pTargetWindow) : mpTargetWindow(pTargetWindow), mpLayers(new LayerContainer()), - mpBackBuffer(VclPtr<VirtualDevice>::Create(*mpTargetWindow)), + mpBackBuffer(VclPtr<VirtualDevice>::Create(*mpTargetWindow->GetOutDev())), maSavedMapMode(pTargetWindow->GetMapMode()) { mpBackBuffer->SetOutputSizePixel(mpTargetWindow->GetSizePixel()); @@ -273,7 +273,7 @@ void LayeredDevice::RepaintRectangle (const ::tools::Rectangle& rRepaintRectangl else if (mpLayers->size() == 1) { // Just copy the main layer into the target device. - (*mpLayers)[0]->Repaint(*mpTargetWindow, rRepaintRectangle); + (*mpLayers)[0]->Repaint(*mpTargetWindow->GetOutDev(), rRepaintRectangle); } else { @@ -285,7 +285,7 @@ void LayeredDevice::RepaintRectangle (const ::tools::Rectangle& rRepaintRectangl { it->Repaint(*mpBackBuffer, rRepaintRectangle); } - DeviceCopy(*mpTargetWindow, *mpBackBuffer, rRepaintRectangle); + DeviceCopy(*mpTargetWindow->GetOutDev(), *mpBackBuffer, rRepaintRectangle); } } @@ -387,7 +387,7 @@ void Layer::Initialize (sd::Window *pTargetWindow) #else if ( ! mpLayerDevice) { - mpLayerDevice.disposeAndReset(VclPtr<VirtualDevice>::Create(*pTargetWindow)); + mpLayerDevice.disposeAndReset(VclPtr<VirtualDevice>::Create(*pTargetWindow->GetOutDev())); mpLayerDevice->SetOutputSizePixel(pTargetWindow->GetSizePixel()); } #endif diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx index 6c90634e7c96..928c60306a7c 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx @@ -48,7 +48,7 @@ PageObjectLayouter::PageObjectLayouter ( maTransitionEffectBoundingBox(), maTransitionEffectIcon(IconCache::Instance().GetIcon(BMP_FADE_EFFECT_INDICATOR)), maCustomAnimationEffectIcon(IconCache::Instance().GetIcon(BMP_CUSTOM_ANIMATION_INDICATOR)), - mpPageNumberFont(Theme::GetFont(Theme::Font_PageNumber, *pWindow)) + mpPageNumberFont(Theme::GetFont(Theme::Font_PageNumber, *pWindow->GetOutDev())) { const Size aPageNumberAreaSize (GetPageNumberAreaSize(nPageCount)); diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index be6ce4b3ef2c..7b22240abfdd 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -45,7 +45,7 @@ PageObjectPainter::PageObjectPainter ( : mrLayouter(rSlideSorter.GetView().GetLayouter()), mpCache(rSlideSorter.GetView().GetPreviewCache()), mpTheme(rSlideSorter.GetTheme()), - mpPageNumberFont(Theme::GetFont(Theme::Font_PageNumber, *rSlideSorter.GetContentWindow())), + mpPageNumberFont(Theme::GetFont(Theme::Font_PageNumber, *rSlideSorter.GetContentWindow()->GetOutDev())), mpShadowPainter(new FramePainter(mpTheme->GetIcon(Theme::Icon_RawShadow))), mpFocusBorderPainter(new FramePainter(mpTheme->GetIcon(Theme::Icon_FocusBorder))) { |