commit 49fc4913ba7fc4a0be2e32407205edd8f31b3172
author Caolán McNamara <caolanm@redhat.com> Thu May 21 14:49:53 2020 +0100
committer Stephan Bergmann <sbergman@redhat.com> Fri May 22 14:26:38 2020 +0200
tree ffb3a0e3bbbd13995d31eb9ffb38491df3880eb7
parent f73980ed151e3d04b02cc463cf9fd6432f14ba03

PaintToDevice doesn't use its Size argument

Change-Id: I45ce895ac67be9aaf137e0e4c79954488f23a6a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94637
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

desktop/source/lib/init.cxx

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c8fc49c..717a542 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -5168,7 +5168,7 @@ static void doc_paintWindowForView(LibreOfficeKitDocument* pThis, unsigned nLOKW
    aMapMode.SetOrigin(Point(-(nX / fDPIScale), -(nY / fDPIScale)));
    pDevice->SetMapMode(aMapMode);

    pWindow->PaintToDevice(pDevice.get(), Point(0, 0), Size());
    pWindow->PaintToDevice(pDevice.get(), Point(0, 0));

    CGContextRelease(cgc);

@@ -5183,7 +5183,7 @@ static void doc_paintWindowForView(LibreOfficeKitDocument* pThis, unsigned nLOKW
    aMapMode.SetOrigin(Point(-(nX / fDPIScale), -(nY / fDPIScale)));
    pDevice->SetMapMode(aMapMode);

    pWindow->PaintToDevice(pDevice.get(), Point(0, 0), Size());
    pWindow->PaintToDevice(pDevice.get(), Point(0, 0));
#endif

    comphelper::LibreOfficeKit::setDialogPainting(false);

include/vcl/window.hxx

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 360c982..66d61ea 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1545,7 +1545,7 @@ public:
    bool    IsNativeWidgetEnabled() const;

    // a helper method for a Control's Draw method
    void PaintToDevice( ::OutputDevice* pDevice, const Point& rPos, const Size& rSize );
    void PaintToDevice( ::OutputDevice* pDevice, const Point& rPos );

    /* tdf#119390 set parent to default window. Typically for use in advance of destroying
     * a floating windows which has the current focus so focus will revert to the main

toolkit/source/awt/vclxwindow.cxx

diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 8c7b306..dbeeb20 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -2280,7 +2280,7 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY )
                bool bOldNW =pWindow->IsNativeWidgetEnabled();
                if( bOldNW )
                    pWindow->EnableNativeWidget(false);
                pWindow->PaintToDevice( pDev, aP, aSz );
                pWindow->PaintToDevice( pDev, aP );
                if( bOldNW )
                    pWindow->EnableNativeWidget();
            }

vcl/source/window/paint.cxx

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 7a9e24a..7bd9867 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1597,7 +1597,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
    mnDPIY = nOldDPIY;
}

void Window::PaintToDevice( OutputDevice* pDev, const Point& rPos, const Size& /*rSize*/ )
void Window::PaintToDevice(OutputDevice* pDev, const Point& rPos)
{
    SAL_WARN_IF(  pDev->HasMirroredGraphics(), "vcl.window", "PaintToDevice to mirroring graphics" );
    SAL_WARN_IF(  pDev->IsRTLEnabled(), "vcl.window", "PaintToDevice to mirroring device" );