diff options
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" ); |