diff options
| author | Eike Rathke <erack@redhat.com> | 2014-04-17 23:56:35 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-04-17 23:57:00 +0200 |
| commit | 1ba03cff6f9f2ba3f3912818c301ce7a07bf6027 (patch) | |
| tree | 8d72c28ec9f222b4816c59be981c25010fa5e693 | |
| parent | e84331b4fdbbdca1e221c990578aaf889038d60a (diff) | |
and another temporary SvtLanguageTable instance is moot
Change-Id: Ia6d9d46124c04018f3f8a4fd6208f29054e5c94c
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 7ae17fd96049..db279d068da2 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1026,12 +1026,11 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe get(m_pIgnoreLanguageChangeCB, "ignorelanguagechange"); // initialize user interface language selection - SvtLanguageTable* pLanguageTable = new SvtLanguageTable; - m_sSystemDefaultString = pLanguageTable->GetString( LANGUAGE_SYSTEM ); + m_sSystemDefaultString = SvtLanguageTable::GetLanguageString( LANGUAGE_SYSTEM ); OUString aUILang = m_sSystemDefaultString + " - " + - pLanguageTable->GetString( Application::GetSettings().GetUILanguageTag().getLanguageType(), true ); + SvtLanguageTable::GetLanguageString( Application::GetSettings().GetUILanguageTag().getLanguageType(), true ); m_pUserInterfaceLB->InsertEntry(aUILang); m_pUserInterfaceLB->SetEntryData(0, 0); @@ -1056,7 +1055,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe if (aLang != LANGUAGE_DONTKNOW) { //sal_uInt16 p = m_pUserInterfaceLB->InsertLanguage(aLang); - OUString aLangStr( pLanguageTable->GetString( aLang, true ) ); + OUString aLangStr( SvtLanguageTable::GetLanguageString( aLang, true ) ); sal_uInt16 p = m_pUserInterfaceLB->InsertEntry(aLangStr); m_pUserInterfaceLB->SetEntryData(p, (void*)(i+1)); } @@ -1116,11 +1115,10 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe pCurr->GetSymbol(); aStr_ = ApplyLreOrRleEmbedding( aStr_ ) + aTwoSpace + - ApplyLreOrRleEmbedding( pLanguageTable->GetString( pCurr->GetLanguage() ) ); + ApplyLreOrRleEmbedding( SvtLanguageTable::GetLanguageString( pCurr->GetLanguage() ) ); sal_uInt16 nPos = m_pCurrencyLB->InsertEntry( aStr_ ); m_pCurrencyLB->SetEntryData( nPos, (void*) pCurr ); } - delete pLanguageTable; m_pLocaleSettingLB->SetSelectHdl( LINK( this, OfaLanguagesTabPage, LocaleSettingHdl ) ); m_pDatePatternsED->SetModifyHdl( LINK( this, OfaLanguagesTabPage, DatePatternsHdl ) ); |