diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-10 18:58:50 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-05-10 18:58:50 +0200 |
| commit | f4410925a564f6ec608ccbc8861424cf055f5ad5 (patch) | |
| tree | 5ac81d0a0bceafaee99cf33d8e84112c6dd10b83 /cui | |
| parent | ff7ef41b52770b1b01a39411d362208a9f21e232 (diff) | |
| parent | 2cbfe1e5608cf2f53eef47a6fb300a0a48935938 (diff) | |
CWS-TOOLING: integrate CWS dtardon01
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/chardlg.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 696c1c62cb23..1f166b8f8d41 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -3386,11 +3386,6 @@ USHORT* SvxCharPositionPage::GetRanges() } // ----------------------------------------------------------------------- -#define ENABLE_AND_CHECK( aCheckBox ) \ - if ( !aCheckBox.IsEnabled() ) \ - aCheckBox.Enable(); \ - aCheckBox.Check( TRUE ) - void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) { String sUser = GetUserData(); @@ -3431,6 +3426,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) m_aFontSizeEdit.Enable(); short nFac; + sal_Bool bAutomatic(sal_False); if ( nEsc > 0 ) { @@ -3438,8 +3434,8 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) m_aHighPosBtn.Check( TRUE ); if ( nEsc == DFLT_ESC_AUTO_SUPER ) { - ENABLE_AND_CHECK( m_aHighLowRB ); nEsc = DFLT_ESC_SUPER; + bAutomatic = sal_True; } } else @@ -3448,10 +3444,15 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) m_aLowPosBtn.Check( TRUE ); if ( nEsc == DFLT_ESC_AUTO_SUB ) { - ENABLE_AND_CHECK( m_aHighLowRB ); nEsc = DFLT_ESC_SUB; + bAutomatic = sal_True; } } + if (!m_aHighLowRB.IsEnabled()) + { + m_aHighLowRB.Enable(); + } + m_aHighLowRB.Check(bAutomatic); if ( m_aHighLowRB.IsChecked() ) { |