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

Tamás Zolnai (via logerrit) logerrit at kemper.freedesktop.org
Tue Sep 3 19:42:18 UTC 2019


 sw/source/uibase/docvw/edtwin.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit cdecd2c2e05b47602312f0875f9e3a719749fb01
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Sep 2 18:23:19 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Sep 3 21:41:31 2019 +0200

    lok: Don't change mouse pointer when hovering over table borders
    
    Reviewed-on: https://gerrit.libreoffice.org/78411
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit e015ce45c299bec5d4a571e127ca7422caea523b)
    
    Change-Id: If6cc3698e6e7229a01d3147d79a587ead65f9b5e
    Reviewed-on: https://gerrit.libreoffice.org/78415
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 5fcfbc9b3c5a..c7260dd99a75 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -3887,7 +3887,8 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
 
             if ( PointerStyle::Null != nPointer &&
                 // i#35543 - Enhanced table selection is explicitly allowed in table mode
-                ( !bChkTableSel || !rSh.IsTableMode() ) )
+                ( !bChkTableSel || !rSh.IsTableMode() ) &&
+                !comphelper::LibreOfficeKit::isActive() )
             {
                 SetPointer( nPointer );
             }


More information about the Libreoffice-commits mailing list