You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2020/01/28 14:42:24 UTC

[openoffice] 02/08: Workaround most of the Python 3 issues.

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 12ae17966a29cfdb844f2f0ef63118c662a57c66
Author: Pedro Giffuni <pf...@FreeBSD.org>
AuthorDate: Wed Jan 15 00:42:50 2020 -0500

    Workaround most of the Python 3 issues.
    
    (cherry picked from commit 3fca2ba9cd48b30a6c5f46ea5e1c985440d981d7)
---
 main/pyuno/source/loader/pyuno_loader.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/pyuno/source/loader/pyuno_loader.cxx b/main/pyuno/source/loader/pyuno_loader.cxx
index 62b8460..6ba2d1c 100644
--- a/main/pyuno/source/loader/pyuno_loader.cxx
+++ b/main/pyuno/source/loader/pyuno_loader.cxx
@@ -117,7 +117,7 @@ static void setPythonHome ( const OUString & pythonHome )
     rtl_string_acquire(o.pData); // leak this string (thats the api!)
     Py_SetPythonHome( o.pData->buffer);
 #else
-    wchar_t *wpath = Py_DecodeLocale(o.pData->buffer, NULL);
+    static wchar_t *wpath = Py_DecodeLocale(o.pData->buffer, NULL);
     if (wpath == NULL) {
     	PyErr_SetString(PyExc_SystemError, "Cannot decode python home path");
 	return;