diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 16:17:11 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 16:17:11 +0000 |
| commit | 0b171a2f0b657cfd31374674d7cbceacb1498e99 (patch) | |
| tree | 400352d3242f1e3210b0d6e1003c0d49ec2c7736 /sfx2 | |
| parent | 059bbf5c2a1df381e590ef2d924d2cccaf995bbb (diff) | |
INTEGRATION: CWS fwk44 (1.31.46); FILE MERGED
2006/08/07 12:35:08 pb 1.31.46.1: fix: #133213# do not select NULL entries
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/acccfg.cxx | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/sfx2/source/dialog/acccfg.cxx b/sfx2/source/dialog/acccfg.cxx index 7c339166a84f..bb4f90f7e3e4 100644 --- a/sfx2/source/dialog/acccfg.cxx +++ b/sfx2/source/dialog/acccfg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: acccfg.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: kz $ $Date: 2006-07-06 14:36:23 $ + * last change: $Author: hr $ $Date: 2006-08-11 17:17:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1107,22 +1107,17 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) } //----------------------------------------------- -IMPL_LINK( SfxAcceleratorConfigPage, RadioHdl, RadioButton *, pBtn ) +IMPL_LINK( SfxAcceleratorConfigPage, RadioHdl, RadioButton *, EMPTYARG ) { - (void)pBtn; //unused css::uno::Reference< css::ui::XAcceleratorConfiguration > xOld = m_xAct; if (aOfficeButton.IsChecked()) m_xAct = m_xGlobal; - else - if (aModuleButton.IsChecked()) + else if (aModuleButton.IsChecked()) m_xAct = m_xModule; // nothing changed? => do nothing! - if ( - (m_xAct.is() ) && - (xOld == m_xAct) - ) + if ( m_xAct.is() && ( xOld == m_xAct ) ) return 0; aEntriesBox.SetUpdateMode( FALSE ); @@ -1132,8 +1127,14 @@ IMPL_LINK( SfxAcceleratorConfigPage, RadioHdl, RadioButton *, pBtn ) aEntriesBox.Invalidate(); aGroupLBox.Init(m_xSMGR, m_xFrame, m_sModuleLongName); - aEntriesBox.Select(aEntriesBox.GetEntry(0, 0)); - aGroupLBox.Select (aGroupLBox.GetEntry (0, 0)); + + // pb: #133213# do not select NULL entries + SvLBoxEntry* pEntry = aEntriesBox.GetEntry( 0, 0 ); + if ( pEntry ) + aEntriesBox.Select( pEntry ); + pEntry = aGroupLBox.GetEntry( 0, 0 ); + if ( pEntry ) + aGroupLBox.Select( pEntry ); ((Link &) aFunctionBox.GetSelectHdl()).Call( &aFunctionBox ); return 1L; |