[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sc/source vcl/source

[Armin Le Grand (Allotropia) (via logerrit)]

 sc/source/ui/view/gridwin.cxx |   11 +++++++++--
 vcl/source/window/winproc.cxx |    7 +++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

New commits:
commit a102f574d8bf8bd37221440170c9f21da45dc651
Author:     Armin Le Grand (Allotropia) <armin.le.gr...@me.com>
AuthorDate: Thu Dec 9 16:13:12 2021 +0100
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Fri Dec 10 19:25:49 2021 +0100

    tdf#127341 Do not activate TextEdit at right-klick on URL in calc
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126618
    Tested-by: Jenkins
    Reviewed-by: Armin Le Grand <armin.le.gr...@me.com>
    (cherry picked from commit 110d3504c1f738a1d7f740cc212064dafa4fb224)
    
    Change-Id: I1881c007a05f56d5cb7914da56243f551c2da1cc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126597
    Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 15ae09b7f31c..aa540b5d5134 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3009,8 +3009,15 @@ void ScGridWindow::Command( const CommandEvent& rCEvt )
 
         if ( !bEdit )
         {
-                // Edit cell with spelling errors ?
-            if (bMouse && (GetEditUrl(aPosPixel) || bSpellError))
+            // Edit cell with spelling errors ?
+            // tdf#127341 the formally used GetEditUrl(aPosPixel) addiionally
+            // to bSpellError acivated EditMode here for right-click on URL
+            // which prevents the regular contex-menu from appearing. Since 
this
+            // is more expeced than the context-menu for editing an URL I 
removed
+            // this. If this was wanted and can be argued his migh be 
re-acivated.
+            // For now, reduce to spelling errors - as the original comment 
above
+            // suggests.
+            if (bMouse && bSpellError)
             {
                 //  GetEditUrlOrError has already moved the Cursor
 
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index cb4c6cd35d9e..5ac478c86972 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -262,6 +262,13 @@ bool ImplHandleMouseEvent( const VclPtr<vcl::Window>& 
xWindow, MouseNotifyEvent
                            long nX, long nY, sal_uInt64 nMsgTime,
                            sal_uInt16 nCode, MouseEventModifiers nMode )
 {
+    SAL_INFO( "vcl.debugevent",
+              "mouse event "
+               "(MouseNotifyEvent " << static_cast<sal_uInt16>(nSVEvent) << ") 
"
+               "(MouseLeave " << bMouseLeave << ") "
+               "(X, Y " << nX << ", " << nY << ") "
+               "(Code " << nCode << ") "
+               "(Modifiers " << static_cast<sal_uInt16>(nMode) << ")");
     ImplSVData* pSVData = ImplGetSVData();
     Point       aMousePos( nX, nY );
     VclPtr<vcl::Window> pChild;