From 22871f1af3be444e747f7adaad5221b9c8b0bebf Mon Sep 17 00:00:00 2001 From: Noel Power Date: Fri, 24 Feb 2012 12:27:37 +0000 Subject: fix core when clicking on entries in Manage Names dialog in calc fdo#46568 --- sc/source/ui/namedlg/namedlg.cxx | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'sc/source/ui/namedlg') diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index b2a7de6e2245..7baccb528f48 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -263,10 +263,28 @@ void ScNameDlg::SetActive() void ScNameDlg::UpdateChecks(ScRangeData* pData) { + // remove handlers, we only want the handlers to process + // user input and not when we are syncing the controls with our internal + // model ( also UpdateChecks is called already from some other event + // handlers, triggering handlers while already processing a handler can + // ( and does in this case ) corrupt the internal data + + maBtnCriteria.SetToggleHdl( Link() ); + maBtnPrintArea.SetToggleHdl( Link() ); + maBtnColHeader.SetToggleHdl( Link() ); + maBtnRowHeader.SetToggleHdl( Link() ); + maBtnCriteria .Check( pData->HasType( RT_CRITERIA ) ); maBtnPrintArea.Check( pData->HasType( RT_PRINTAREA ) ); maBtnColHeader.Check( pData->HasType( RT_COLHEADER ) ); maBtnRowHeader.Check( pData->HasType( RT_ROWHEADER ) ); + + // Restore handlers so user input is processed again + Link aToggleHandler = LINK( this, ScNameDlg, EdModifyHdl ); + maBtnCriteria.SetToggleHdl( aToggleHandler ); + maBtnPrintArea.SetToggleHdl( aToggleHandler ); + maBtnColHeader.SetToggleHdl( aToggleHandler ); + maBtnRowHeader.SetToggleHdl( aToggleHandler ); } bool ScNameDlg::IsNameValid() -- cgit