diff options
Diffstat (limited to 'svx/source/dialog/langbox.cxx')
| -rw-r--r-- | svx/source/dialog/langbox.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 35aa62c3a5..8edde7bdc4 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -156,7 +156,6 @@ void SvxLanguageBox::Init() m_pLangTable = new SvtLanguageTable; m_aNotCheckedImage = Image( SVX_RES( RID_SVXIMG_NOTCHECKED ) ); m_aCheckedImage = Image( SVX_RES( RID_SVXIMG_CHECKED ) ); - m_aCheckedImageHC = Image( SVX_RES( RID_SVXIMG_CHECKED_H ) ); m_aAllString = String( SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL ) ); m_nLangList = LANG_LIST_EMPTY; m_bHasLangNone = FALSE; @@ -202,8 +201,6 @@ USHORT SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, USHORT nPos, bo USHORT nRet = 0; if( !bChecked ) nRet = InsertEntry( rEntry, m_aNotCheckedImage, nPos ); - else if( GetSettings().GetStyleSettings().GetHighContrastMode() ) - nRet = InsertEntry( rEntry, m_aCheckedImageHC, nPos ); else nRet = InsertEntry( rEntry, m_aCheckedImage, nPos ); return nRet; @@ -299,7 +296,7 @@ void SvxLanguageBox::SetLanguageList( INT16 nLangList, nLangType != LANGUAGE_SYSTEM && nLangType != LANGUAGE_NONE && (nLangType < LANGUAGE_USER1 || nLangType > LANGUAGE_USER9) && - (MsLangId::getSubLanguage( nLangType) != 0 || + (MsLangId::getSubLanguage( nLangType) != 0 || (nLangList & LANG_LIST_ALSO_PRIMARY_ONLY)) && ((nLangList & LANG_LIST_ALL) != 0 || ((nLangList & LANG_LIST_WESTERN) != 0 && @@ -345,8 +342,8 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, USHORT nPos USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT nPos, sal_Int16 nType ) { LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType); - // For obsolete and to be replaced languages check whether an entry of the - // replacement already exists and if so don't add an entry with identical + // For obsolete and to be replaced languages check whether an entry of the + // replacement already exists and if so don't add an entry with identical // string as would be returned by SvtLanguageTable::GetString(). if (nLang != nLangType) { @@ -405,8 +402,8 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, BOOL bCheckEntry, USHORT nPos ) { LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType); - // For obsolete and to be replaced languages check whether an entry of the - // replacement already exists and if so don't add an entry with identical + // For obsolete and to be replaced languages check whether an entry of the + // replacement already exists and if so don't add an entry with identical // string as would be returned by SvtLanguageTable::GetString(). if (nLang != nLangType) { @@ -451,7 +448,7 @@ LanguageType SvxLanguageBox::GetSelectLanguage() const void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, BOOL bSelect ) { - // If the core uses a LangID of an imported MS document and wants to select + // If the core uses a LangID of an imported MS document and wants to select // a language that is replaced, we need to select the replacement instead. LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType); |