]>
Commit | Line | Data |
---|---|---|
f640f666 AM |
1 | --- libreoffice-6.0.5.2/pyuno/source/module/pyuno_impl.hxx~ 2018-06-20 00:27:30.000000000 +0200 |
2 | +++ libreoffice-6.0.5.2/pyuno/source/module/pyuno_impl.hxx 2018-07-02 20:29:01.747956284 +0200 | |
3 | @@ -82,7 +82,7 @@ inline PyObject* PyStr_FromString(const | |
4 | ||
5 | inline char * PyStr_AsString(PyObject *object) | |
6 | { | |
7 | - return PyUnicode_AsUTF8(object); | |
8 | + return (char *)PyUnicode_AsUTF8(object); | |
9 | } | |
10 | ||
11 | inline bool PyStr_Check(PyObject const *object) | |
12 | --- libreoffice-6.0.5.2/pyuno/source/module/pyuno_util.cxx~ 2018-06-20 00:27:30.000000000 +0200 | |
13 | +++ libreoffice-6.0.5.2/pyuno/source/module/pyuno_util.cxx 2018-07-02 21:11:29.419418239 +0200 | |
14 | @@ -69,7 +69,7 @@ OUString pyString2ustring( PyObject *pys | |
15 | #else | |
16 | #if PY_MAJOR_VERSION >= 3 | |
17 | Py_ssize_t size(0); | |
18 | - char *pUtf8(PyUnicode_AsUTF8AndSize(pystr, &size)); | |
19 | + char *pUtf8((char *)PyUnicode_AsUTF8AndSize(pystr, &size)); | |
20 | ret = OUString(pUtf8, size, RTL_TEXTENCODING_UTF8); | |
21 | #else | |
22 | PyObject* pUtf8 = PyUnicode_AsUTF8String(pystr); |