diff options
| author | Rene Engelhard <rene@debian.org> | 2012-11-26 13:48:58 +0100 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2012-11-26 13:48:58 +0100 |
| commit | 669f0da19beb577ffded49b2678f4968aa35b5c0 (patch) | |
| tree | 5b7f107ba0d393b24380b276cc3f16c615bd782d /pyuno/source | |
| parent | 2ea580358671a840dbd70db13db72a6e5b8be062 (diff) | |
use correct PyString_Size for python2
This reverts commit 8ea4657f64e7575696be4bba5b2a4309ac029ae4.
Conflicts:
pyuno/source/module/pyuno_util.cxx
Change-Id: I252688b72610864613ceb80aac9030062e63fdac
Diffstat (limited to 'pyuno/source')
| -rw-r--r-- | pyuno/source/module/pyuno_util.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pyuno/source/module/pyuno_util.cxx b/pyuno/source/module/pyuno_util.cxx index da311cd631fe..6d56279fce53 100644 --- a/pyuno/source/module/pyuno_util.cxx +++ b/pyuno/source/module/pyuno_util.cxx @@ -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 |