diff options
| author | Eike Rathke <erack@redhat.com> | 2014-04-18 01:03:55 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-04-18 01:05:58 +0200 |
| commit | 7531f838c89b0e1d0826d4144ad2d0c70a41e1aa (patch) | |
| tree | ffe327b64cc512024b9d8f09ca7fd0635530452f /svx | |
| parent | 2580b5dd875f7a8d12b652128e27aaea7d9b6403 (diff) | |
we don't even need an instance of SvtLanguageTable at SvxLanguageBox
Change-Id: I7ccefc73d7f6e5b7c41d6819ae13116af9d5b5ef
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/langbox.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 4e206af19ad3..ae89cf4fbcd6 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -143,7 +143,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxLanguageBox(Window *pPar void SvxLanguageBox::Init() { - m_pLangTable = new SvtLanguageTable; m_aNotCheckedImage = Image( SVX_RES( RID_SVXIMG_NOTCHECKED ) ); m_aCheckedImage = Image( SVX_RES( RID_SVXIMG_CHECKED ) ); m_aAllString = SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL ); @@ -180,7 +179,6 @@ void SvxLanguageBox::Init() SvxLanguageBox::~SvxLanguageBox() { delete m_pSpellUsedLang; - delete m_pLangTable; } @@ -340,7 +338,7 @@ sal_Int32 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal_ return nAt; } - OUString aStrEntry = m_pLangTable->GetString( nLang ); + OUString aStrEntry = SvtLanguageTable::GetLanguageString( nLang ); if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll) aStrEntry = m_aAllString; @@ -349,11 +347,11 @@ sal_Int32 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal_ { nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang, nType); aStrEntry += " - "; - aStrEntry += m_pLangTable->GetString( nRealLang ); + aStrEntry += SvtLanguageTable::GetLanguageString( nRealLang ); } else if (nRealLang == LANGUAGE_USER_SYSTEM_CONFIG) { nRealLang = MsLangId::getSystemLanguage(); aStrEntry += " - "; - aStrEntry += m_pLangTable->GetString( nRealLang ); + aStrEntry += SvtLanguageTable::GetLanguageString( nRealLang ); } aStrEntry = ApplyLreOrRleEmbedding( aStrEntry ); @@ -411,7 +409,7 @@ sal_Int32 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, return nAt; } - OUString aStrEntry = m_pLangTable->GetString( nLang ); + OUString aStrEntry = SvtLanguageTable::GetLanguageString( nLang ); if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll) aStrEntry = m_aAllString; |