[Libreoffice-commits] core.git: vcl/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 9 18:39:30 UTC 2020


 vcl/source/window/cursor.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 6db6163dad0d8ac21ba69b2e361034b06f0a5a30
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jun 8 16:32:02 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jun 9 20:38:53 2020 +0200

    tdf#133462 cursor missing in SQL textbox
    
    (and spell checking, calc page format header/footer dialog, etc)
    
    since...
    
    commit c2f8929ed76085bc81f390f90e06bd6781206537
    Date:   Wed May 29 23:33:25 2019 -0400
    
        vcl: sfx2: LOK: Support per-view popup windows
    
    I feel this is a mismerge where the point of
    
    commit b9c10ee923308f336a694bbc0212396ed5317b6a
    Date:   Wed Apr 3 12:02:13 2019 +0100
    
        weld ClassificationDialog
    
    to allow cursor drawing to a non-Window OutputDevice got clobbered
    
    Change-Id: If693fd0ee83afc6e7f0ddce7b43b8cb6e3327116
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95844
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index fbc2b2ec1d76..9eba6b2f603f 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -47,10 +47,6 @@ static tools::Rectangle ImplCursorInvert(vcl::RenderContext* pRenderContext, Imp
 {
     tools::Rectangle aPaintRect;
 
-    vcl::Window* pWindow = pData ? pData->mpWindow.get() : nullptr;
-    if (!pWindow || pWindow->IsDisposed())
-        return aPaintRect;
-
     bool bMapMode = pRenderContext->IsMapModeEnabled();
     pRenderContext->EnableMapMode( false );
     InvertFlags nInvertStyle;


More information about the Libreoffice-commits mailing list