diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-25 19:25:53 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-26 08:42:07 +0200 |
commit | 399149155cf4f882541848ea53bfa5c9806b23f8 (patch) | |
tree | 7d4beaebdff4d0c725fda27662009c2b2f7b0fe1 /sw/source/core/view | |
parent | 581f12c0bdfb718379c16bef01d71ee9e45a5b5a (diff) |
make SwRect(Rectangle) constructor explicit
Change-Id: I715aa9499598c483ccf907f829c9ba3540edf216
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116120
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/view')
-rw-r--r-- | sw/source/core/view/pagepreviewlayout.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/view/viewsh.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index 3c37ba2ced2b..4a19062f4db6 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -1027,7 +1027,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const tools: // paint preview background { - SwRegionRects aPreviewBackgrdRegion(rOutRect); + SwRegionRects aPreviewBackgrdRegion((SwRect(rOutRect))); // calculate preview background rectangles for ( auto & rpPreviewPage : maPreviewPages ) { @@ -1086,14 +1086,14 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const tools: pOutputDev->SetFont( aOldFont ); // paint shadow and border for empty page // use new method to paint page border and shadow - SwPageFrame::PaintBorderAndShadow( aPageRect, &mrParentViewShell, true, false, true ); + SwPageFrame::PaintBorderAndShadow( SwRect(aPageRect), &mrParentViewShell, true, false, true ); } else { const bool bIsLeftShadowed = pPage->IsLeftShadowNeeded(); const bool bIsRightShadowed = pPage->IsRightShadowNeeded(); - mrParentViewShell.maVisArea = aPageRect; + mrParentViewShell.maVisArea = SwRect(aPageRect); aPxPaintRect.Intersection( aPxOutRect ); tools::Rectangle aPaintRect = pOutputDev->PixelToLogic( aPxPaintRect ); mrParentViewShell.Paint(rRenderContext, aPaintRect); @@ -1106,7 +1106,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const tools: bIsLeftShadowed, bIsRightShadowed, true ); const vcl::Region aDLRegion(aPageBorderRect.SVRect()); mrParentViewShell.DLPrePaint2(aDLRegion); - SwPageFrame::PaintBorderAndShadow( aPageRect, &mrParentViewShell, true, false, true ); + SwPageFrame::PaintBorderAndShadow( SwRect(aPageRect), &mrParentViewShell, true, false, true ); mrParentViewShell.DLPostPaint2(true); } // <-- diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index e0f12b18b7a1..a28f3dc2df52 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -401,7 +401,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd ) if ( bPaint ) { if (GetWin()->SupportsDoubleBuffering()) - InvalidateWindows(aRect.SVRect()); + InvalidateWindows(aRect); else { // #i75172# begin DrawingLayer paint @@ -417,7 +417,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd ) if (!comphelper::LibreOfficeKit::isActive()) pCurrentLayout->PaintSwFrame( *mpOut, aRect ); else - pCurrentLayout->GetCurrShell()->InvalidateWindows(aRect.SVRect()); + pCurrentLayout->GetCurrShell()->InvalidateWindows(aRect); // #i75172# end DrawingLayer paint DLPostPaint2(true); @@ -1859,7 +1859,7 @@ void SwViewShell::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang for(const auto& rRectangle : aRectangles) { - Imp()->AddPaintRect(rRectangle); + Imp()->AddPaintRect(SwRect(rRectangle)); } //RegionHandle hHdl( aRegion.BeginEnumRects() ); @@ -1938,7 +1938,7 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int contextWidth, int contex VisPortChgd(SwRect(aOutRect)); // Invoke SwLayAction if layout is not yet ready. - CheckInvalidForPaint(aOutRect); + CheckInvalidForPaint(SwRect(aOutRect)); // draw - works in logic coordinates Paint(rDevice, aOutRect); |