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

[Libreoffice Gerrit user]

 vcl/source/window/paint.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6625d5368c367c794fb20e5ba8e460b56120df50
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Sun Feb 10 11:57:58 2019 +0100
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Sun Feb 10 18:28:00 2019 +0100

    lok: Fix the font previews in eg. Format -> Character... dialog.
    
    Change-Id: I5d25249c58f55c501e3e5610419753a68423b0f2
    Reviewed-on: https://gerrit.libreoffice.org/67612
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 7da91892fc4d..4baaf3e8bf10 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1395,9 +1395,11 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
         if (!IsPaintTransparent() && IsBackground() && ! (GetParentClipMode() & ParentClipMode::NoClip))
             Erase(*pDevice);
 
+        pDevice->SetMapMode(GetMapMode());
+
         Paint(*pDevice, tools::Rectangle(Point(), GetOutputSizePixel()));
 
-        i_pTargetOutDev->DrawOutDev(i_rPos, aSize, Point(), aSize, *pDevice);
+        i_pTargetOutDev->DrawOutDev(i_rPos, aSize, Point(), pDevice->PixelToLogic(aSize), *pDevice);
 
         // get rid of virtual device now so they don't pile up during recursive calls
         pDevice.disposeAndClear();