Kaydet (Commit) 54e3af6a authored tarafından Eike Rathke's avatar Eike Rathke

passed rLocale remains unchanged if no mapping found

Change-Id: I4d1494dc5cba7a92fb067191477c3cbba46b056d
üst f3e124f4
...@@ -710,10 +710,7 @@ void MsLangId::Conversion::convertLanguageToLocaleImpl( LanguageType nLang, ...@@ -710,10 +710,7 @@ void MsLangId::Conversion::convertLanguageToLocaleImpl( LanguageType nLang,
} }
while ( pPrivateEntry->mnLang != LANGUAGE_DONTKNOW ); while ( pPrivateEntry->mnLang != LANGUAGE_DONTKNOW );
// Not found. The effective result is the empty SYSTEM locale. // Not found. Passed rLocale argument remains unchanged.
rLocale.Language = OUString();
rLocale.Country = OUString();
rLocale.Variant = OUString();
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
......
...@@ -242,7 +242,12 @@ public: ...@@ -242,7 +242,12 @@ public:
I18NLANGTAG_DLLPRIVATE static ::com::sun::star::lang::Locale convertLanguageToLocale( I18NLANGTAG_DLLPRIVATE static ::com::sun::star::lang::Locale convertLanguageToLocale(
LanguageType nLang, bool bResolveSystem ); LanguageType nLang, bool bResolveSystem );
/** Used by convertLanguageToLocale(LanguageType,bool) */ /** Used by convertLanguageToLocale(LanguageType,bool)
@return rLocale set to mapped values, unchanged if no mapping was
found. E.g. pass empty Locale to obtain empty SYSTEM locale
for that case.
*/
I18NLANGTAG_DLLPRIVATE static void convertLanguageToLocaleImpl( I18NLANGTAG_DLLPRIVATE static void convertLanguageToLocaleImpl(
LanguageType nLang, ::com::sun::star::lang::Locale & rLocale ); LanguageType nLang, ::com::sun::star::lang::Locale & rLocale );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment