Kaydet (Commit) 669f0da1 authored tarafından Rene Engelhard's avatar Rene Engelhard

use correct PyString_Size for python2

This reverts commit 8ea4657f.

Conflicts:
	pyuno/source/module/pyuno_util.cxx

Change-Id: I252688b72610864613ceb80aac9030062e63fdac
üst 2ea58035
......@@ -86,8 +86,7 @@ OUString pyString2ustring( PyObject *pystr )
ret = OUString(pUtf8, size, RTL_TEXTENCODING_UTF8);
#else
PyObject* pUtf8 = PyUnicode_AsUTF8String(pystr);
char *pStr = PyStr_AsString(pUtf8);
ret = OUString(pStr, strlen(pStr), RTL_TEXTENCODING_UTF8);
ret = OUString(PyStr_AsString(pUtf8), PyString_Size(pUtf8), RTL_TEXTENCODING_UTF8);
Py_DECREF(pUtf8);
#endif
#endif
......
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