diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-07 14:39:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-08 09:04:30 +0000 |
| commit | 9cacb6ad9f5a012bc892cf9893cd8d37a2a5f304 (patch) | |
| tree | 2823ae9c68c743ed658cae8b064fa91f9772007d /cui | |
| parent | 145accd9a5b55070959d40c9314d870dffa5e4bc (diff) | |
convert SvxCaseMap to scoped enum
Change-Id: Iea77ddc21e9b2d5a021c08e323da9ccabf9d46bd
Reviewed-on: https://gerrit.libreoffice.org/34963
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/chardlg.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 2fa3116c4942..53e5e08200c8 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1528,10 +1528,11 @@ void SvxCharEffectsPage::UpdatePreview_Impl() sal_Int32 nCapsPos = m_pEffectsLB->GetSelectEntryPos(); if ( nCapsPos != LISTBOX_ENTRY_NOTFOUND ) { - rFont.SetCaseMap( (SvxCaseMap)nCapsPos ); - rCJKFont.SetCaseMap( (SvxCaseMap)nCapsPos ); + SvxCaseMap eCaps = (SvxCaseMap)nCapsPos; + rFont.SetCaseMap( eCaps ); + rCJKFont.SetCaseMap( eCaps ); // #i78474# small caps do not exist in CTL fonts - rCTLFont.SetCaseMap( static_cast<SvxCaseMap>( nCapsPos == SVX_CASEMAP_KAPITAELCHEN ? SVX_CASEMAP_NOT_MAPPED : (SvxCaseMap)nCapsPos) ); + rCTLFont.SetCaseMap( eCaps == SvxCaseMap::SmallCaps ? SvxCaseMap::NotMapped : eCaps ); } bool bWordLine = m_pIndividualWordsBtn->IsChecked(); @@ -1545,7 +1546,7 @@ void SvxCharEffectsPage::UpdatePreview_Impl() void SvxCharEffectsPage::SetCaseMap_Impl( SvxCaseMap eCaseMap ) { - if ( SVX_CASEMAP_END > eCaseMap ) + if ( SvxCaseMap::End > eCaseMap ) m_pEffectsLB->SelectEntryPos( sal::static_int_cast< sal_Int32 >( eCaseMap ) ); else @@ -1919,7 +1920,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet ) // this is for consistency only. Here it would be allowed to call SelectHdl_Impl directly ... // Effects - SvxCaseMap eCaseMap = SVX_CASEMAP_END; + SvxCaseMap eCaseMap = SvxCaseMap::End; nWhich = GetWhich( SID_ATTR_CHAR_CASEMAP ); eState = rSet->GetItemState( nWhich ); switch ( eState ) @@ -2290,7 +2291,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet ) // Effects nWhich = GetWhich( SID_ATTR_CHAR_CASEMAP ); pOld = GetOldItem( *rSet, SID_ATTR_CHAR_CASEMAP ); - SvxCaseMap eCaseMap = SVX_CASEMAP_NOT_MAPPED; + SvxCaseMap eCaseMap = SvxCaseMap::NotMapped; bool bChecked = false; sal_Int32 nCapsPos = m_pEffectsLB->GetSelectEntryPos(); if ( nCapsPos != LISTBOX_ENTRY_NOTFOUND ) |