diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-15 09:36:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-04-17 07:21:08 +0000 |
| commit | a7b7c64afc523cfd9ff4e724b3efbec6567fc1c8 (patch) | |
| tree | 52fd05ef3292f3dab172864cbc3be96a8d44a9d0 /sw/source/uibase/shells/textsh.cxx | |
| parent | add7eeb7dbd0eefa0c5ae5430490864079add801 (diff) | |
convert SCRIPTTYPE_ constants to scoped enum
Change-Id: I5be3980ac865162d8d7626556ca47eca4b0ee433
Reviewed-on: https://gerrit.libreoffice.org/15344
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/source/uibase/shells/textsh.cxx')
| -rw-r--r-- | sw/source/uibase/shells/textsh.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 912ce34066a0..57bfb92d3673 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -987,7 +987,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT, 0 ); rSh.GetCurAttr( aSet ); - sal_uInt16 nScript = rSh.GetScriptType(); + SvtScriptType nScript = rSh.GetScriptType(); SvxFontItem aFont( RES_CHRATR_FONT ); { @@ -1001,7 +1001,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) aSet.Get( GetWhichOfScript( RES_CHRATR_FONT, - GetI18NScriptTypeOfLanguage( (sal_uInt16)GetAppLanguage() ) ))); + SvtLanguageOptions::GetI18NScriptTypeOfLanguage( GetAppLanguage() ) ))); if (aFontName.isEmpty()) aFontName = aFont.GetFamilyName(); } @@ -1067,7 +1067,7 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) else aFont = static_cast<const SvxFontItem&>(aSet.Get( GetWhichOfScript( RES_CHRATR_FONT, - GetI18NScriptTypeOfLanguage( (sal_uInt16)GetAppLanguage() ) ))); + SvtLanguageOptions::GetI18NScriptTypeOfLanguage( GetAppLanguage() ) ))); } // Insert character. @@ -1087,17 +1087,17 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT, 0 ); nScript = g_pBreakIt->GetAllScriptsOfText( aChars ); - if( SCRIPTTYPE_LATIN & nScript ) + if( SvtScriptType::LATIN & nScript ) { aRestoreSet.Put( aSet.Get( RES_CHRATR_FONT, true ) ); aSet.Put( aNewFontItem, RES_CHRATR_FONT); } - if( SCRIPTTYPE_ASIAN & nScript ) + if( SvtScriptType::ASIAN & nScript ) { aRestoreSet.Put( aSet.Get( RES_CHRATR_CJK_FONT, true ) ); aSet.Put( aNewFontItem, RES_CHRATR_CJK_FONT ); } - if( SCRIPTTYPE_COMPLEX & nScript ) + if( SvtScriptType::COMPLEX & nScript ) { aRestoreSet.Put( aSet.Get( RES_CHRATR_CTL_FONT, true ) ); aSet.Put( aNewFontItem, RES_CHRATR_CTL_FONT ); |