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

[Dennis Francis]

 sc/source/ui/view/viewfun2.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit efecee353f55640dd5cdf1a0f5d3f4e562ed5e43
Author: Dennis Francis <dennisfrancis.in at gmail.com>
Date:   Fri Oct 7 12:15:33 2016 +0530

    tdf#101299 : do not show merge cells context menu for the trivial case
    
    Change-Id: I4e5726009ac5ef60ffa74f3bbbe01683c3658e95
    Reviewed-on: https://gerrit.libreoffice.org/29583
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 76d600a..ee8f6f7 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1011,8 +1011,11 @@ bool ScViewFunc::TestMergeCells()           // pre-test (for menu)
     const ScMarkData& rMark = GetViewData().GetMarkData();
     if ( rMark.IsMarked() || rMark.IsMultiMarked() )
     {
-        ScRange aDummy;
-        return GetViewData().GetSimpleArea( aDummy) == SC_MARK_SIMPLE;
+        ScRange aRange;
+        bool bMergable = ( GetViewData().GetSimpleArea( aRange ) == SC_MARK_SIMPLE );
+        bMergable = bMergable && ( aRange.aStart.Col() != aRange.aEnd.Col() ||
+                                   aRange.aStart.Row() != aRange.aEnd.Row() );
+        return bMergable;
     }
     else
         return false;