#87257# change GetUILanguage

This commit is contained in:
Ocke Janssen 2001-07-11 09:34:00 +00:00
parent 3029d23de4
commit 76fb1c425f
5 changed files with 16 additions and 17 deletions

View file

@ -2,9 +2,9 @@
* *
* $RCSfile: FormattedField.cxx,v $ * $RCSfile: FormattedField.cxx,v $
* *
* $Revision: 1.15 $ * $Revision: 1.16 $
* *
* last change: $Author: fs $ $Date: 2001-06-25 10:30:09 $ * last change: $Author: oj $ $Date: 2001-07-11 10:33:58 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -144,7 +144,6 @@
#ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_ #ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_
#include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp>
#endif #endif
#ifndef _VOS_MUTEX_HXX_ #ifndef _VOS_MUTEX_HXX_
#include <vos/mutex.hxx> #include <vos/mutex.hxx>
#endif #endif
@ -270,7 +269,7 @@ protected:
//------------------------------------------------------------------ //------------------------------------------------------------------
StandardFormatsSupplier::StandardFormatsSupplier(const Reference< XMultiServiceFactory > & _rxFactory) StandardFormatsSupplier::StandardFormatsSupplier(const Reference< XMultiServiceFactory > & _rxFactory)
:SvNumberFormatsSupplierObj() :SvNumberFormatsSupplierObj()
,m_pMyPrivateFormatter(new SvNumberFormatter(_rxFactory, Application::GetAppInternational().GetLanguage())) ,m_pMyPrivateFormatter(new SvNumberFormatter(_rxFactory, Application::GetSettings().GetUILanguage()))
{ {
SetNumberFormatter(m_pMyPrivateFormatter); SetNumberFormatter(m_pMyPrivateFormatter);
} }
@ -851,7 +850,7 @@ void OFormattedModel::_loaded(const EventObject& rEvent)
if (xTypes.is()) if (xTypes.is())
{ {
UniString sLanguage, sCountry; UniString sLanguage, sCountry;
ConvertLanguageToIsoNames(Application::GetAppInternational().GetLanguage(), sLanguage, sCountry); ConvertLanguageToIsoNames(Application::GetSettings().GetUILanguage(), sLanguage, sCountry);
Locale aApplicationLocale(sLanguage, sCountry, ::rtl::OUString()); Locale aApplicationLocale(sLanguage, sCountry, ::rtl::OUString());
sal_Int32 nNewKey = 0; sal_Int32 nNewKey = 0;

View file

@ -2,9 +2,9 @@
* *
* $RCSfile: FormattedFieldWrapper.cxx,v $ * $RCSfile: FormattedFieldWrapper.cxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: fs $ $Date: 2001-05-31 13:59:50 $ * last change: $Author: oj $ $Date: 2001-07-11 10:33:58 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -267,7 +267,7 @@ void SAL_CALL OFormattedFieldWrapper::write(const Reference<XObjectOutputStream>
query_interface(static_cast<XWeak*>(m_pEditPart), xEditProps); query_interface(static_cast<XWeak*>(m_pEditPart), xEditProps);
UniString sLanguage, sCountry; UniString sLanguage, sCountry;
ConvertLanguageToIsoNames(Application::GetAppInternational().GetLanguage(), sLanguage, sCountry); ConvertLanguageToIsoNames(Application::GetSettings().GetUILanguage(), sLanguage, sCountry);
Locale aAppLanguage( Locale aAppLanguage(
sLanguage, sLanguage,
sCountry, sCountry,

View file

@ -2,9 +2,9 @@
* *
* $RCSfile: ListBox.cxx,v $ * $RCSfile: ListBox.cxx,v $
* *
* $Revision: 1.16 $ * $Revision: 1.17 $
* *
* last change: $Author: pl $ $Date: 2001-05-14 09:08:00 $ * last change: $Author: oj $ $Date: 2001-07-11 10:33:58 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -827,7 +827,7 @@ void OListBoxModel::loadData()
if (!bHaveFormat) if (!bHaveFormat)
{ {
String sLanguage, sCountry; String sLanguage, sCountry;
ConvertLanguageToIsoNames(Application::GetAppInternational().GetLanguage(), sLanguage, sCountry); ConvertLanguageToIsoNames(Application::GetSettings().GetUILanguage(), sLanguage, sCountry);
Locale aAppLanguage( Locale aAppLanguage(
sLanguage, sLanguage,
sCountry, sCountry,

View file

@ -2,9 +2,9 @@
* *
* $RCSfile: InterfaceContainer.cxx,v $ * $RCSfile: InterfaceContainer.cxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: vg $ $Date: 2001-07-04 11:28:20 $ * last change: $Author: oj $ $Date: 2001-07-11 10:33:59 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -368,7 +368,7 @@ void SAL_CALL OInterfaceContainer::disposing(const EventObject& _rSource) throw(
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void OInterfaceContainer::propertyChange(const PropertyChangeEvent& evt) void OInterfaceContainer::propertyChange(const PropertyChangeEvent& evt)
{ {
if (evt.PropertyName == (rtl::OUString) PROPERTY_NAME) if (evt.PropertyName == PROPERTY_NAME)
{ {
::osl::MutexGuard aGuard( m_rMutex ); ::osl::MutexGuard aGuard( m_rMutex );
OInterfaceMap::iterator i = find(m_aMap.begin(), m_aMap.end(), OInterfaceMap::iterator i = find(m_aMap.begin(), m_aMap.end(),

View file

@ -2,9 +2,9 @@
* *
* $RCSfile: frm_resource.cxx,v $ * $RCSfile: frm_resource.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: hr $ $Date: 2000-09-18 16:29:06 $ * last change: $Author: oj $ $Date: 2001-07-11 10:34:00 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -99,7 +99,7 @@ namespace frm
if (m_pImpl) if (m_pImpl)
return; return;
LanguageType nType = Application::GetAppInternational().GetLanguage(); LanguageType nType = Application::GetSettings().GetUILanguage();
ByteString sFileName("frm"); ByteString sFileName("frm");
sFileName += ByteString::CreateFromInt32( (sal_Int32)SOLARUPD ); sFileName += ByteString::CreateFromInt32( (sal_Int32)SOLARUPD );