diff options
| author | Eike Rathke <erack@redhat.com> | 2012-11-22 12:26:52 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-11-22 12:34:59 +0100 |
| commit | 9955dbebbdf1b7d36fec272dfea46f57fab47e19 (patch) | |
| tree | 80705ccc2382e7440ea76f62a544d64d12d1ce4f /toolkit | |
| parent | 9c5d6ea5efb5f56a4ac96b4a8505ed84abbbc6bf (diff) | |
AllSettings with LanguageTag
Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/Library_tk.mk | 1 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxaccessiblecomponent.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/controls/grid/sortablegriddatamodel.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/helper/tkresmgr.cxx | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index cfd0079c2978..7385829e8965 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,tk,\ cppu \ cppuhelper \ sal \ + i18nisolang1 \ tl \ utl \ vcl \ diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index 6f260a4093bf..106cb0810474 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -713,7 +713,7 @@ lang::Locale VCLXAccessibleComponent::getLocale() throw (accessibility::IllegalA { OExternalLockGuard aGuard( this ); - return Application::GetSettings().GetLocale(); + return Application::GetSettings().GetLanguageTag().getLocale(); } uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleAtPoint( const awt::Point& rPoint ) throw (uno::RuntimeException) diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index 109478c5b9cf..5343050a3e95 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -216,7 +216,7 @@ namespace toolkit Reference< XCollator > lcl_loadDefaultCollator_throw( ::comphelper::ComponentContext const & i_context ) { Reference< XCollator > const xCollator( i_context.createComponent( "com.sun.star.i18n.Collator" ), UNO_QUERY_THROW ); - xCollator->loadDefaultCollator( Application::GetSettings().GetLocale(), 0 ); + xCollator->loadDefaultCollator( Application::GetSettings().GetLanguageTag().getLocale(), 0 ); return xCollator; } } diff --git a/toolkit/source/helper/tkresmgr.cxx b/toolkit/source/helper/tkresmgr.cxx index bd514d9099b6..ae197370a355 100644 --- a/toolkit/source/helper/tkresmgr.cxx +++ b/toolkit/source/helper/tkresmgr.cxx @@ -55,7 +55,7 @@ void TkResMgr::ensureImplExists() if (m_pSimpleResMgr) return; - ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale(); + ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale(); m_pSimpleResMgr = SimpleResMgr::Create( "tk", aLocale ); m_pResMgr = ResMgr::CreateResMgr( "tk" ); |