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

[Libreoffice Gerrit user]

 vcl/source/window/paint.cxx |   77 --------------------------------------------
 1 file changed, 77 deletions(-)

New commits:
commit 1a02ab0aeafeaa97f4a46fc77ac3ef9a68904f7a
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Feb 8 17:57:41 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Feb 8 22:16:32 2019 +0100

    Revert "lokit: Draw dialogs without using a MetaFile"
    
    Quick fix for the too big previews in the font dialog.
    
    This reverts commit a6634c01f8adcc79b7e74cc2d34de1b262139594.
    
    Change-Id: I04cf8d604e4fa58bf591cdd817c6feddeb45e84e
    Reviewed-on: https://gerrit.libreoffice.org/67550
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 7da91892fc4d..8d10d77513e4 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1343,83 +1343,6 @@ void Window::Update()
 
 void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rPos )
 {
-    // Special drawing when called through LOKit
-    // TODO: Move to it's own method
-    if (comphelper::LibreOfficeKit::isActive())
-    {
-        VclPtrInstance<VirtualDevice> pDevice(*i_pTargetOutDev);
-
-        Size aSize(GetOutputSizePixel());
-        pDevice->SetOutputSizePixel(aSize);
-
-        vcl::Font aCopyFont = GetFont();
-        pDevice->SetFont(aCopyFont);
-
-        pDevice->SetTextColor(GetTextColor());
-        if (IsLineColor())
-            pDevice->SetLineColor(GetLineColor());
-        else
-            pDevice->SetLineColor();
-
-        if (IsFillColor())
-            pDevice->SetFillColor(GetFillColor());
-        else
-            pDevice->SetFillColor();
-
-        if (IsTextLineColor())
-            pDevice->SetTextLineColor(GetTextLineColor());
-        else
-            pDevice->SetTextLineColor();
-
-        if (IsOverlineColor())
-            pDevice->SetOverlineColor(GetOverlineColor());
-        else
-            pDevice->SetOverlineColor();
-
-        if (IsTextFillColor())
-            pDevice->SetTextFillColor(GetTextFillColor());
-        else
-            pDevice->SetTextFillColor();
-
-        pDevice->SetTextAlign(GetTextAlign());
-        pDevice->SetRasterOp(GetRasterOp());
-
-        tools::Rectangle aPaintRect;
-        aPaintRect = tools::Rectangle(Point(), GetOutputSizePixel());
-
-        vcl::Region aClipRegion(GetClipRegion());
-        pDevice->SetClipRegion();
-        aClipRegion.Intersect(aPaintRect);
-        pDevice->SetClipRegion(aClipRegion);
-
-        if (!IsPaintTransparent() && IsBackground() && ! (GetParentClipMode() & ParentClipMode::NoClip))
-            Erase(*pDevice);
-
-        Paint(*pDevice, tools::Rectangle(Point(), GetOutputSizePixel()));
-
-        i_pTargetOutDev->DrawOutDev(i_rPos, aSize, Point(), aSize, *pDevice);
-
-        // get rid of virtual device now so they don't pile up during recursive calls
-        pDevice.disposeAndClear();
-
-
-        for( vcl::Window* pChild = mpWindowImpl->mpFirstChild; pChild; pChild = pChild->mpWindowImpl->mpNext )
-        {
-            if( pChild->mpWindowImpl->mpFrame == mpWindowImpl->mpFrame && pChild->IsVisible() )
-            {
-                long nDeltaX = pChild->mnOutOffX - mnOutOffX;
-                long nDeltaY = pChild->mnOutOffY - mnOutOffY;
-
-                Point aPos( i_rPos );
-                aPos += Point(nDeltaX, nDeltaY);
-
-                pChild->ImplPaintToDevice( i_pTargetOutDev, aPos );
-            }
-        }
-        return;
-    }
-
-
     bool bRVisible = mpWindowImpl->mbReallyVisible;
     mpWindowImpl->mbReallyVisible = mpWindowImpl->mbVisible;
     bool bDevOutput = mbDevOutput;