[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - pyuno/source

Stephan Bergmann sbergman at redhat.com
Thu Jul 5 14:53:14 UTC 2018


 pyuno/source/module/pyuno_impl.hxx |    2 +-
 pyuno/source/module/pyuno_type.cxx |    2 +-
 pyuno/source/module/pyuno_util.cxx |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 19ff1064c84f1e5e5081ff624b3abd5e6ad99367
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jul 3 08:33:34 2018 +0200

    const fixes for python3-devel-3.7.0-1.fc29.x86_64
    
    Change-Id: Ia16a8b828e11ce36e9bb77ecf9e8a1179bd9b90c
    Reviewed-on: https://gerrit.libreoffice.org/56841
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 76a29148be63cb006a7e25e312dc93acc93e071f)
    Reviewed-on: https://gerrit.libreoffice.org/56913
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index ea0e419ffb1b..73acabdf4a16 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -80,7 +80,7 @@ inline PyObject* PyStr_FromString(const char *string)
     return PyUnicode_FromString(string);
 }
 
-inline char * PyStr_AsString(PyObject *object)
+inline char const * PyStr_AsString(PyObject *object)
 {
     return PyUnicode_AsUTF8(object);
 }
diff --git a/pyuno/source/module/pyuno_type.cxx b/pyuno/source/module/pyuno_type.cxx
index e54400ba6d8d..3c09e24243b6 100644
--- a/pyuno/source/module/pyuno_type.cxx
+++ b/pyuno/source/module/pyuno_type.cxx
@@ -157,7 +157,7 @@ Any PyEnum2Enum( PyObject *obj )
     }
 
     OUString strTypeName( OUString::createFromAscii( PyStr_AsString( typeName.get() ) ) );
-    char *stringValue = PyStr_AsString( value.get() );
+    char const *stringValue = PyStr_AsString( value.get() );
 
     TypeDescription desc( strTypeName );
     if( !desc.is() )
diff --git a/pyuno/source/module/pyuno_util.cxx b/pyuno/source/module/pyuno_util.cxx
index e92dad2e8bca..9bb48cf38747 100644
--- a/pyuno/source/module/pyuno_util.cxx
+++ b/pyuno/source/module/pyuno_util.cxx
@@ -69,7 +69,7 @@ OUString pyString2ustring( PyObject *pystr )
 #else
 #if PY_MAJOR_VERSION >= 3
     Py_ssize_t size(0);
-    char *pUtf8(PyUnicode_AsUTF8AndSize(pystr, &size));
+    char const *pUtf8(PyUnicode_AsUTF8AndSize(pystr, &size));
     ret = OUString(pUtf8, size, RTL_TEXTENCODING_UTF8);
 #else
     PyObject* pUtf8 = PyUnicode_AsUTF8String(pystr);


More information about the Libreoffice-commits mailing list