mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use correct PyString_Size for python2

Browse Source 
This reverts commit 8ea4657f64.

Conflicts:
	pyuno/source/module/pyuno_util.cxx

Change-Id: I252688b72610864613ceb80aac9030062e63fdac
This commit is contained in:
Rene Engelhard
2012-11-26 13:48:58 +01:00
parent 2ea5803586
commit 669f0da19b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pyuno/source/module/pyuno_util.cxx
View File

@@ -86,8 +86,7 @@ OUString pyString2ustring( PyObject *pystr )
ret = OUString(pUtf8, size, RTL_TEXTENCODING_UTF8); ret = OUString(pUtf8, size, RTL_TEXTENCODING_UTF8);
#else #else
PyObject* pUtf8 = PyUnicode_AsUTF8String(pystr); PyObject* pUtf8 = PyUnicode_AsUTF8String(pystr);
char *pStr = PyStr_AsString(pUtf8); ret = OUString(PyStr_AsString(pUtf8), PyString_Size(pUtf8), RTL_TEXTENCODING_UTF8);
ret = OUString(pStr, strlen(pStr), RTL_TEXTENCODING_UTF8);
Py_DECREF(pUtf8); Py_DECREF(pUtf8);
#endif #endif
#endif #endif