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

[Andrea Gelmini (via logerrit)]

 sc/source/ui/view/viewfun2.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5ff00ae591979db0653d9d0b5956f9a520ad24ff
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Fri Sep 25 12:30:15 2020 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sat Sep 26 14:14:55 2020 +0200

    Fix typo in code
    
    It passed "make check" on Linux
    
    Change-Id: I9906dc44e8398abfad83c947659d82a8fac66bd0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103457
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 8260ef688030..f3dbeece26b7 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1128,10 +1128,10 @@ bool ScViewFunc::TestMergeCells()           // pre-test (for menu)
     if ( rMark.IsMarked() || rMark.IsMultiMarked() )
     {
         ScRange aRange;
-        bool bMergable = ( GetViewData().GetSimpleArea( aRange ) == SC_MARK_SIMPLE );
-        bMergable = bMergable && ( aRange.aStart.Col() != aRange.aEnd.Col() ||
+        bool bMergeable = ( GetViewData().GetSimpleArea( aRange ) == SC_MARK_SIMPLE );
+        bMergeable = bMergeable && ( aRange.aStart.Col() != aRange.aEnd.Col() ||
                                    aRange.aStart.Row() != aRange.aEnd.Row() );
-        return bMergable;
+        return bMergeable;
     }
     else
         return false;