formula/source/ui/dlg/formula.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 068178adf5de6ca667c0bcd2764519f6555d9d40
Author: Eike Rathke <er...@redhat.com>
Date:   Mon Oct 26 13:26:15 2015 +0000

    Revert "tdf#90695: In function Wizard Array box cannot be unchecked"
    
    This reverts commit bebc20c62be2df2cf2741fb82945ce6b631d2fe5.
    
    Removing the disabling is plain wrong. Please see the code for when the 
button is disabled, when it is enabled, and what consequences it has when 
changing the state from checked to unchecked. Unchecking will result in the 
formula not being applied as array formula anymore, which it was before editing.
    
    Actually tdf#90695 is not even a bug. The checked but disabled Array button 
is meant as an indicator that the formula IS an array/matrix formula.
    
    Change-Id: Ic7f9f7010ce208171ef614e0885474f2deae4ac9
    Reviewed-on: https://gerrit.libreoffice.org/19602
    Reviewed-by: Eike Rathke <er...@redhat.com>
    Tested-by: Eike Rathke <er...@redhat.com>

diff --git a/formula/source/ui/dlg/formula.cxx 
b/formula/source/ui/dlg/formula.cxx
index 71d87a8..831d54b 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1572,6 +1572,7 @@ bool FormulaDlg_Impl::CheckMatrix(OUString& aFormula)
     {
         aFormula = aFormula.copy( 1, aFormula.getLength()-2 );
         m_pBtnMatrix->Check( bMatrix );
+        m_pBtnMatrix->Disable();
     } // if ( bMatrix )
 
     m_pTabCtrl->SetCurPageId(TP_STRUCT);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to