sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 3 ++- sw/source/uibase/docvw/AnnotationWin2.cxx | 2 +- vcl/source/outdev/transparent.cxx | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit 0821457cdb6476b2b1860c8aeda718b130ab808e Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Mon Jul 17 13:03:22 2023 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Mon Jul 17 16:27:35 2023 +0200 simply some LogicToPixel calculation sites Change-Id: I9698562dd1f8d4679c9999342ded1022bde698be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154523 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 077bdaead1db..09e01e939693 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1027,7 +1027,8 @@ void ScShapeChildren::FillShapes(const tools::Rectangle& aPixelPaintRect, const uno::Reference< drawing::XShape > xShape(pObj->getUnoShape(), uno::UNO_QUERY); if (xShape.is()) { - tools::Rectangle aRect(pWin->LogicToPixel(VCLPoint(xShape->getPosition()), aMapMode), pWin->LogicToPixel(VCLSize(xShape->getSize()), aMapMode)); + tools::Rectangle aRect(pWin->LogicToPixel( + tools::Rectangle(VCLPoint(xShape->getPosition()), VCLSize(xShape->getSize())), aMapMode)); if(!aClippedPixelPaintRect.GetIntersection(aRect).IsEmpty()) { ScShapeChild aShape; diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index ae52f1c21075..8c7a26bc1b10 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -147,7 +147,7 @@ void SwAnnotationWin::PaintTile(vcl::RenderContext& rRenderContext, const tools: bool SwAnnotationWin::IsHitWindow(const Point& rPointLogic) { - tools::Rectangle aRectangleLogic(EditWin().PixelToLogic(GetPosPixel()), EditWin().PixelToLogic(GetSizePixel())); + tools::Rectangle aRectangleLogic(EditWin().PixelToLogic(tools::Rectangle(GetPosPixel(),GetSizePixel()))); return aRectangleLogic.Contains(rPointLogic); } diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index 4a4b6b5a54bb..793b26e2e581 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -585,7 +585,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, else { GDIMetaFile* pOldMetaFile = mpMetaFile; - tools::Rectangle aOutRect( LogicToPixel( rPos ), LogicToPixel( rSize ) ); + tools::Rectangle aOutRect( LogicToPixel( tools::Rectangle(rPos, rSize) ) ); Point aPoint; tools::Rectangle aDstRect( aPoint, GetOutputSizePixel() );