diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2020-09-25 12:30:15 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2020-09-26 14:14:55 +0200 |
commit | 5ff00ae591979db0653d9d0b5956f9a520ad24ff (patch) | |
tree | 0a5a0fd22b1383e26fee5423d20226eb37b39373 | |
parent | 4008401c9ba4e1df6a4a4f6dbb8ca134ed3f218a (diff) |
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@yahoo.fr>
-rw-r--r-- | sc/source/ui/view/viewfun2.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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; |