diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-15 13:04:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-15 13:05:31 +0200 |
| commit | ea2604180089ec749086f868a17ffef7cbcbbc47 (patch) | |
| tree | f1067b61361e2871cce004f956523aad79c9061f /sw/source/ui | |
| parent | 9e87c064408aa9549336d4ce463e2c2315d30001 (diff) | |
convert SvxCompareMode to scoped enum
and move it to SW since it is only used there
Change-Id: I9cc7869564e24a8ce733f30ef453751a854cf7e0
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/config/optpage.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 38b45687ccc6..dd75cbe9423b 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -2335,11 +2335,11 @@ bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet* ) m_pWordRB->IsValueChangedFromSaved() || m_pCharRB->IsValueChangedFromSaved() ) { - SvxCompareMode eCmpMode = SVX_CMP_AUTO; + SwCompareMode eCmpMode = SwCompareMode::Auto; - if ( m_pAutoRB->IsChecked() ) eCmpMode = SVX_CMP_AUTO; - if ( m_pWordRB->IsChecked() ) eCmpMode = SVX_CMP_BY_WORD; - if ( m_pCharRB->IsChecked() ) eCmpMode = SVX_CMP_BY_CHAR; + if ( m_pAutoRB->IsChecked() ) eCmpMode = SwCompareMode::Auto; + if ( m_pWordRB->IsChecked() ) eCmpMode = SwCompareMode::ByWord; + if ( m_pCharRB->IsChecked() ) eCmpMode = SwCompareMode::ByChar; pOpt->SetCompareMode( eCmpMode ); bRet = true; @@ -2376,22 +2376,22 @@ void SwCompareOptionsTabPage::Reset( const SfxItemSet* ) { SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig(); - SvxCompareMode eCmpMode = pOpt->GetCompareMode(); - if( eCmpMode == SVX_CMP_AUTO ) + SwCompareMode eCmpMode = pOpt->GetCompareMode(); + if( eCmpMode == SwCompareMode::Auto ) { m_pAutoRB->Check(); m_pRsidCB->Disable(); m_pIgnoreCB->Disable(); m_pLenNF->Disable(); } - else if( eCmpMode == SVX_CMP_BY_WORD ) + else if( eCmpMode == SwCompareMode::ByWord ) { m_pWordRB->Check(); m_pRsidCB->Enable(); m_pIgnoreCB->Enable(); m_pLenNF->Enable(); } - else if( eCmpMode == SVX_CMP_BY_CHAR) + else if( eCmpMode == SwCompareMode::ByChar) { m_pCharRB->Check(); m_pRsidCB->Enable(); @@ -2408,7 +2408,7 @@ void SwCompareOptionsTabPage::Reset( const SfxItemSet* ) m_pIgnoreCB->Check( pOpt->IsIgnorePieces() ); m_pIgnoreCB->SaveValue(); - m_pLenNF->Enable( m_pIgnoreCB->IsChecked() && eCmpMode ); + m_pLenNF->Enable( m_pIgnoreCB->IsChecked() && eCmpMode != SwCompareMode::Auto ); m_pLenNF->SetValue( pOpt->GetPieceLen() ); m_pLenNF->SaveValue(); |