[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

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

New commits:
commit 63e10bf2383d22a5b3fafd95a688c2389f0076bc
Author: Eike Rathke <erack at redhat.com>
Date:   Sat Dec 15 23:42:45 2012 +0100

    check conditions before checking for matrix fragment
    
    Was omitted in ab0096ed68cdc08906f518d3499a8e1afc5ba80c
    
    Change-Id: If3e1c141f02751ca7e6104ba21c246926fca843d

diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 6fbe22d..72c8be3 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -150,15 +150,18 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
             case FID_FILL_TO_RIGHT:     // fill to left / right
             {
                 bDisable = !bSimpleArea || (nCol1 == 0 && nCol2 == 0);
-                bDisable = pDoc->HasSelectedBlockMatrixFragment(
-                    nCol1, nRow1, nCol1, nRow2, rMark );    // first column
+                if ( !bDisable && bEditable )
+                {   // do not damage matrix
+                    bDisable = pDoc->HasSelectedBlockMatrixFragment(
+                            nCol1, nRow1, nCol1, nRow2, rMark );    // first column
+                }
             }
             break;
             case FID_FILL_TO_LEFT:
             {
                 bDisable = (!bSimpleArea) || (nCol1 == MAXCOL && nCol2 == MAXCOL);
                 if ( !bDisable && bEditable )
-                {   // Matrix nicht zerreissen
+                {   // do not damage matrix
                     bDisable = pDoc->HasSelectedBlockMatrixFragment(
                         nCol2, nRow1, nCol2, nRow2, rMark );    // last column
                 }