vcl/source/app/salvtables.cxx | 2 +- vcl/source/window/paint.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit b5e2a004dc355c4e6a8abeac9d1d414f25d8db2c Author: Szymon Kłos <[email protected]> AuthorDate: Fri Apr 1 13:20:02 2022 +0200 Commit: Szymon Kłos <[email protected]> CommitDate: Mon Apr 11 20:59:51 2022 +0200 lok: fix formulabar rendering While forwardporting it was not taken into account that no pixel/logic conversion is needed. regression in: commit cf5b0d5972b02809e9b7f35780885445242b3f12 Author: Szymon Kłos <[email protected]> Date: Mon Jan 17 13:11:19 2022 +0100 RTL: lok: render correctly interim windows Change-Id: Ic6716bf9335d4a9297e3e5edfeb161702b846efb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132424 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Mert Tumer <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132809 Tested-by: Jenkins Reviewed-by: Szymon Kłos <[email protected]> diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index d7c3d31e50d5..7d0a62057231 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -1329,7 +1329,7 @@ void SalInstanceWidget::DoRecursivePaint(vcl::Window* pWindow, const Point& rRen = pChild->GetOutDev()->GetOutOffYPixel() - pWindow->GetOutDev()->GetOutOffYPixel(); Point aPos(rRenderLogicPos); - aPos += rOutput.PixelToLogic(Point(nDeltaX, nDeltaY)); + aPos += Point(nDeltaX, nDeltaY); DoRecursivePaint(pChild, aPos, rOutput); } diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 49fd65f8c5fe..40172ade6a9e 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -1421,7 +1421,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP if( bHasMirroredGraphics ) nDeltaX = GetOutDev()->mnOutWidth - nDeltaX - pChild->GetOutDev()->mnOutWidth; - tools::Long nDeltaY = pChild->GetOutDev()->mnOutOffY - GetOutDev()->mnOutOffY; + tools::Long nDeltaY = pChild->GetOutOffYPixel() - GetOutOffYPixel(); Point aPos( i_rPos ); aPos += Point(nDeltaX, nDeltaY);
