[Libreoffice-commits] core.git: 2 commits - cui/source include/svtools svtools/source

[Eike Rathke]

 cui/source/options/optgdlg.cxx  |   10 ++++------
 include/svtools/langtab.hxx     |    1 +
 svtools/source/misc/langtab.cxx |    7 ++++++-
 3 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 1ba03cff6f9f2ba3f3912818c301ce7a07bf6027
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Apr 17 23:56:35 2014 +0200

    and another temporary SvtLanguageTable instance is moot
    
    Change-Id: Ia6d9d46124c04018f3f8a4fd6208f29054e5c94c

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 7ae17fd..db279d0 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 ) );
commit e84331b4fdbbdca1e221c990578aaf889038d60a
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Apr 17 23:53:11 2014 +0200

    introduce second static GetLanguageString() with explicit bool parameter
    
    Change-Id: Ief79b8871701cc2e39e421145370feb246ce5e20

diff --git a/include/svtools/langtab.hxx b/include/svtools/langtab.hxx
index 7521313..7f437e0 100644
--- a/include/svtools/langtab.hxx
+++ b/include/svtools/langtab.hxx
@@ -47,6 +47,7 @@ public:
     LanguageType    GetTypeAtIndex( sal_uInt32 nIndex ) const;
 
     static OUString     GetLanguageString( const LanguageType eType );
+    static OUString     GetLanguageString( const LanguageType eType, bool bUserInterfaceSelection );
     static LanguageType GetLanguageType( const OUString& rStr );
 };
 
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index e5c7cc4..236f074 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -154,7 +154,12 @@ const OUString SvtLanguageTable::GetString( const LanguageType eType, bool bUser
 
 OUString SvtLanguageTable::GetLanguageString( const LanguageType eType )
 {
-    return theLanguageTable::get().GetString( eType );
+    return theLanguageTable::get().GetString( eType, false );
+}
+
+OUString SvtLanguageTable::GetLanguageString( const LanguageType eType, bool bUserInterfaceSelection )
+{
+    return theLanguageTable::get().GetString( eType, bUserInterfaceSelection );
 }