summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-10-26 13:26:15 +0000
committerEike Rathke <erack@redhat.com>2015-10-26 13:26:49 +0000
commit068178adf5de6ca667c0bcd2764519f6555d9d40 (patch)
tree5e30d3d46338cc4a7181494c60cfd5549e37a91c
parentac5b2047ca72677d6beaf58ddaa8fdcda7236292 (diff)
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 <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
-rw-r--r--formula/source/ui/dlg/formula.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 71d87a811481..831d54bda8b8 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);