summaryrefslogtreecommitdiff
path: root/pyuno
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-03-29 09:17:00 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-03-29 09:17:47 +0200
commit0bd502af47b53bc4340df7874bd726361e3bbad9 (patch)
tree813d8fb60a4a5fe8bf4cbf316fb73621247647f3 /pyuno
parent0db89bcabfb4e207bed95b4a14685391311eaa3e (diff)
Clean up remaining C-style casts among void pointers
Change-Id: I1b49c020d597b569e330482f4dbf20c15ccdae3f
Diffstat (limited to 'pyuno')
-rw-r--r--pyuno/source/module/pyuno.cxx4
-rw-r--r--pyuno/source/module/pyuno_runtime.cxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 1d990d035eeb..3ec1316b123c 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -408,7 +408,7 @@ PyObject *PyUNO_str( PyObject * self )
{
PyThreadDetach antiguard;
Any a = rHolder->getMaterial();
- OUString s = val2str( (void*) a.getValue(), a.getValueType().getTypeLibType() );
+ OUString s = val2str( a.getValue(), a.getValueType().getTypeLibType() );
buf.append( OUStringToOString(s,RTL_TEXTENCODING_ASCII_US) );
}
}
@@ -418,7 +418,7 @@ PyObject *PyUNO_str( PyObject * self )
PyThreadDetach antiguard;
buf.append( "pyuno object " );
- OUString s = val2str( (void*)me->members->wrappedObject.getValue(),
+ OUString s = val2str( me->members->wrappedObject.getValue(),
me->members->wrappedObject.getValueType().getTypeLibType() );
buf.append( OUStringToOString(s,RTL_TEXTENCODING_ASCII_US) );
}
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index c58682cd006b..a7793da7e7ff 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -499,8 +499,8 @@ PyRef Runtime::any2PyObject (const Any &a ) const
PyRef args( PyTuple_New( 1 ), SAL_NO_ACQUIRE, NOT_NULL );
// assuming that the Message is always the first member, wuuuu
- void *pData = (void*)a.getValue();
- OUString message = *static_cast<OUString *>(pData);
+ void const *pData = a.getValue();
+ OUString message = *static_cast<OUString const *>(pData);
PyRef pymsg = ustring2PyString( message );
PyTuple_SetItem( args.get(), 0 , pymsg.getAcquired() );
// the exception base functions want to have an "args" tuple,