diff options
8 files changed, 10 insertions, 10 deletions
diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx index 5e9ba82cd058..d641d6bb1887 100644 --- a/comphelper/source/compare/AnyCompareFactory.cxx +++ b/comphelper/source/compare/AnyCompareFactory.cxx @@ -150,7 +150,7 @@ Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames_static Reference< XInterface > SAL_CALL AnyCompareFactory::Create( const Reference< XComponentContext >& rxContext ) { - return (cppu::OWeakObject*)new AnyCompareFactory( rxContext ); + return static_cast<cppu::OWeakObject*>(new AnyCompareFactory( rxContext )); } void createRegistryInfo_AnyCompareFactory() diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index 9c54c3375b45..cd329af150e9 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx @@ -247,7 +247,7 @@ sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUStrin uno::Reference< uno::XInterface > SAL_CALL IndexedPropertyValuesContainer::Create( SAL_UNUSED_PARAMETER const uno::Reference< uno::XComponentContext >&) { - return (cppu::OWeakObject*)new IndexedPropertyValuesContainer(); + return static_cast<cppu::OWeakObject*>(new IndexedPropertyValuesContainer()); } void createRegistryInfo_IndexedPropertyValuesContainer() diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index d59944a81329..88ff7f9bfc02 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -216,7 +216,7 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& uno::Reference< uno::XInterface > SAL_CALL NamedPropertyValuesContainer::Create( SAL_UNUSED_PARAMETER const uno::Reference< uno::XComponentContext >&) { - return (cppu::OWeakObject*)new NamedPropertyValuesContainer(); + return static_cast<cppu::OWeakObject*>(new NamedPropertyValuesContainer()); } void createRegistryInfo_NamedPropertyValuesContainer() diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx index 995180bb17a3..7a273b24e5dd 100644 --- a/comphelper/source/container/namecontainer.cxx +++ b/comphelper/source/container/namecontainer.cxx @@ -199,7 +199,7 @@ Type SAL_CALL NameContainer::getElementType() Reference< XNameContainer > comphelper::NameContainer_createInstance( Type aType ) { - return (XNameContainer*) new NameContainer( aType ); + return static_cast<XNameContainer*>(new NameContainer( aType )); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 279f18d0ce6e..5074a577b185 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -185,7 +185,7 @@ void SAL_CALL AttacherAllListener_Impl::firing(const AllEventObject& Event) throw( RuntimeException, std::exception ) { ScriptEvent aScriptEvent; - aScriptEvent.Source = (OWeakObject *)mpManager; // get correct XInterface + aScriptEvent.Source = static_cast<OWeakObject *>(mpManager); // get correct XInterface aScriptEvent.ListenerType = Event.ListenerType; aScriptEvent.MethodName = Event.MethodName; aScriptEvent.Arguments = Event.Arguments; @@ -250,7 +250,7 @@ Any SAL_CALL AttacherAllListener_Impl::approveFiring( const AllEventObject& Even throw( InvocationTargetException, RuntimeException, std::exception ) { ScriptEvent aScriptEvent; - aScriptEvent.Source = (OWeakObject *)mpManager; // get correct XInterface + aScriptEvent.Source = static_cast<OWeakObject *>(mpManager); // get correct XInterface aScriptEvent.ListenerType = Event.ListenerType; aScriptEvent.MethodName = Event.MethodName; aScriptEvent.Arguments = Event.Arguments; diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index 5ce4ab16bade..2ddb513a7cc9 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -265,7 +265,7 @@ Sequence< OUString > SAL_CALL GenericPropertySet::getSupportedServiceNames( ) ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > comphelper::GenericPropertySet_CreateInstance( comphelper::PropertySetInfo* pInfo ) { - return (XPropertySet*)new GenericPropertySet( pInfo ); + return static_cast<XPropertySet*>(new GenericPropertySet( pInfo )); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx index 37016836d223..3efe2d1126f2 100644 --- a/comphelper/source/streaming/memorystream.cxx +++ b/comphelper/source/streaming/memorystream.cxx @@ -115,7 +115,7 @@ sal_Int32 SAL_CALL UNOMemoryStream::readBytes( Sequence< sal_Int8 >& aData, sal_ { sal_Int8* pData = static_cast<sal_Int8*>(&(*maData.begin())); sal_Int8* pCursor = &((pData)[mnCursor]); - memcpy( (void*)aData.getArray(), (void*)pCursor, nBytesToRead ); + memcpy( static_cast<void*>(aData.getArray()), static_cast<void*>(pCursor), nBytesToRead ); mnCursor += nBytesToRead; } @@ -190,7 +190,7 @@ void SAL_CALL UNOMemoryStream::writeBytes( const Sequence< sal_Int8 >& aData ) t sal_Int8* pData = static_cast<sal_Int8*>(&(*maData.begin())); sal_Int8* pCursor = &(pData[mnCursor]); - memcpy( (void*)pCursor, (void*)aData.getConstArray(), nBytesToWrite ); + memcpy( pCursor, aData.getConstArray(), nBytesToWrite ); mnCursor += nBytesToWrite; } diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx index 4b9aad443b6c..4b3dd8e81606 100644 --- a/comphelper/source/streaming/oslfile2streamwrap.cxx +++ b/comphelper/source/streaming/oslfile2streamwrap.cxx @@ -51,7 +51,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 aData.realloc(nBytesToRead); sal_uInt64 nRead = 0; - FileBase::RC eError = m_pFile->read((void*)aData.getArray(), nBytesToRead, nRead); + FileBase::RC eError = m_pFile->read(static_cast<void*>(aData.getArray()), nBytesToRead, nRead); if (eError != FileBase::E_None) throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); |