From 6a3cfd330550ee558a546fb0808577b56ae04400 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 22 Mar 2017 13:43:20 +0100 Subject: Don't actually change OS-level locale with (unused) osl_setSystemLocale osl_setSystemLocale was introduced with af2938348bb539ccb27c92fe286b768d4143f662 "#88460# added osl_getProcessLocale and osl_setProcessLocale" but never actually used. So mark it as deprecated and, in the sal/osl/unx/ case, don't make it set the OS-level locale via imp_setProcessLocale (calling setlocale or setting the LC_ALL/LC_CTYPE/LANG env vars), same as in the sal/osl/w32/ case. Change-Id: I33348dba5de8ca80ca6fca210043286c0cfa9145 --- include/osl/process.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'include/osl') diff --git a/include/osl/process.h b/include/osl/process.h index ee7b401703fa..49fe59264059 100644 --- a/include/osl/process.h +++ b/include/osl/process.h @@ -396,11 +396,7 @@ SAL_DLLPUBLIC oslProcessError SAL_CALL osl_getProcessWorkingDir( /** Get the locale the process is currently running in. - The unix implementation caches the value it returns, so if you have to change the locale - your are running in, you will have to use osl_setProcessLocale - @param ppLocale [out] a pointer that receives the currently selected locale structure - @see osl_setProcessLocale */ SAL_DLLPUBLIC oslProcessError SAL_CALL osl_getProcessLocale( @@ -409,7 +405,9 @@ SAL_DLLPUBLIC oslProcessError SAL_CALL osl_getProcessLocale( /** Change the locale of the process. @param pLocale [in] a pointer to the locale to be set - @see osl_getProcessLocale + + @deprecated LibreOffice itself does not use this, and client code should + not have good use for it either. It may eventually be removed. */ SAL_DLLPUBLIC oslProcessError SAL_CALL osl_setProcessLocale( -- cgit