[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source

[Szymon Kłos (via logerrit)]

 vcl/source/app/salvtables.cxx |    2 +-
 vcl/source/window/paint.cxx   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 788599c7df58546900874ff0443be8522f9b4a04
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Apr 1 13:20:02 2022 +0200
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Apr 4 11:22:46 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 <szymon.k...@collabora.com>
    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 <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Mert Tumer <mert.tu...@collabora.com>

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 9eb7ff7fe665..9f40b770ffbb 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1351,7 +1351,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);