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

[Jim Raykowski (via logerrit)]

 sw/source/core/crsr/viscrs.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit ccf3a0600ee902390ad6112ecf28223078bdd2db
Author:     Jim Raykowski <raykowj at gmail..com>
AuthorDate: Sat May 11 10:15:52 2019 -0800
Commit:     Jim Raykowski <raykowj at gmail.com>
CommitDate: Mon May 13 03:32:13 2019 +0200

    tdf#104204 Keep selection when context menu is opened on extended row
    
    Change-Id: I5a94f7bcf90e5831fc63d3f8ad83278e425417eb
    Reviewed-on: https://gerrit.libreoffice.org/72159
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <raykowj at gmail.com>

diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 72ccc90b7acd..f4272cacd354 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -59,6 +59,8 @@
 #include <paintfrm.hxx>
 #include <PostItMgr.hxx>
 
+#include <cellfrm.hxx>
+
 // Here static members are defined. They will get changed on alteration of the
 // MapMode. This is done so that on ShowCursor the same size does not have to be
 // expensively determined again and again.
@@ -843,6 +845,12 @@ bool SwShellTableCursor::IsInside( const Point& rPt ) const
         OSL_ENSURE( pFrame, "Node not in a table" );
         if( pFrame && pFrame->getFrameArea().IsInside( rPt ) )
             return true;
+
+        for ( SwCellFrame* pCellFrame = static_cast<SwCellFrame*>(pFrame); pCellFrame; pCellFrame = pCellFrame->GetFollowCell() )
+        {
+            if( pCellFrame->getFrameArea().IsInside( rPt ) )
+                return true;
+        }
     }
     return false;
 }