diff options
Diffstat (limited to 'sw/source/ui/config/fontcfg.cxx')
| -rw-r--r-- | sw/source/ui/config/fontcfg.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx index e1b951c1c879..140b8da8c42c 100644 --- a/sw/source/ui/config/fontcfg.cxx +++ b/sw/source/ui/config/fontcfg.cxx @@ -192,9 +192,9 @@ SwStdFontConfig::~SwStdFontConfig() /*-----------------18.01.97 10.05------------------- --------------------------------------------------*/ -BOOL SwStdFontConfig::IsFontDefault(USHORT nFontType) const +sal_Bool SwStdFontConfig::IsFontDefault(sal_uInt16 nFontType) const { - BOOL bSame = sal_False; + sal_Bool bSame = sal_False; SvtLinguOptions aLinguOpt; SvtLinguConfig().GetOptions( aLinguOpt ); @@ -234,7 +234,7 @@ BOOL SwStdFontConfig::IsFontDefault(USHORT nFontType) const case FONT_CAPTION_CJK : case FONT_INDEX_CJK : { - BOOL b1 = sDefaultFonts[FONT_STANDARD_CJK] == sDefFontCJK; + sal_Bool b1 = sDefaultFonts[FONT_STANDARD_CJK] == sDefFontCJK; bSame = b1 && sDefaultFonts[nFontType] == sDefFontCJK; } break; @@ -242,7 +242,7 @@ BOOL SwStdFontConfig::IsFontDefault(USHORT nFontType) const case FONT_CAPTION_CTL : case FONT_INDEX_CTL : { - BOOL b1 = sDefaultFonts[FONT_STANDARD_CJK] == sDefFontCTL; + sal_Bool b1 = sDefaultFonts[FONT_STANDARD_CJK] == sDefFontCTL; bSame = b1 && sDefaultFonts[nFontType] == sDefFontCTL; } break; @@ -253,10 +253,10 @@ BOOL SwStdFontConfig::IsFontDefault(USHORT nFontType) const /* -----------------11.01.99 13:16------------------- * Standards auslesen * --------------------------------------------------*/ -String SwStdFontConfig::GetDefaultFor(USHORT nFontType, LanguageType eLang) +String SwStdFontConfig::GetDefaultFor(sal_uInt16 nFontType, LanguageType eLang) { String sRet; - USHORT nFontId; + sal_uInt16 nFontId; switch( nFontType ) { case FONT_OUTLINE : @@ -294,7 +294,7 @@ String SwStdFontConfig::GetDefaultFor(USHORT nFontType, LanguageType eLang) /*-- 11.10.2005 10:43:43--------------------------------------------------- -----------------------------------------------------------------------*/ -sal_Int32 SwStdFontConfig::GetDefaultHeightFor(USHORT nFontType, LanguageType eLang) +sal_Int32 SwStdFontConfig::GetDefaultHeightFor(sal_uInt16 nFontType, LanguageType eLang) { sal_Int32 nRet = FONTSIZE_DEFAULT; switch( nFontType ) @@ -315,7 +315,7 @@ sal_Int32 SwStdFontConfig::GetDefaultHeightFor(USHORT nFontType, LanguageType eL /*-- 11.10.2005 10:50:06--------------------------------------------------- -----------------------------------------------------------------------*/ -void SwStdFontConfig::ChangeInt( USHORT nFontType, sal_Int32 nHeight ) +void SwStdFontConfig::ChangeInt( sal_uInt16 nFontType, sal_Int32 nHeight ) { DBG_ASSERT( nFontType < DEF_FONT_COUNT, "invalid index in SwStdFontConfig::ChangInt()"); if( nFontType < DEF_FONT_COUNT && nDefaultFontHeight[nFontType] != nHeight) |