mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:cstylecast: deal with remaining pointer casts

Browse Source 
Change-Id: I1ceb4359188b61e15a31750a496021c4394e1a3f
This commit is contained in:
Stephan Bergmann
2015-06-08 16:23:52 +02:00
parent bc14d27dd0
commit 66a0a3726a
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
comphelper/source/compare/AnyCompareFactory.cxx
View File

@@ -150,7 +150,7 @@ Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames_static
Reference< XInterface > SAL_CALL AnyCompareFactory::Create( Reference< XInterface > SAL_CALL AnyCompareFactory::Create(
const Reference< XComponentContext >& rxContext ) const Reference< XComponentContext >& rxContext )
{ {
return (cppu::OWeakObject*)new AnyCompareFactory( rxContext ); return static_cast<cppu::OWeakObject*>(new AnyCompareFactory( rxContext ));
} }
void createRegistryInfo_AnyCompareFactory() void createRegistryInfo_AnyCompareFactory()

2
comphelper/source/container/IndexedPropertyValuesContainer.cxx
View File

@@ -247,7 +247,7 @@ sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUStrin
uno::Reference< uno::XInterface > SAL_CALL IndexedPropertyValuesContainer::Create( uno::Reference< uno::XInterface > SAL_CALL IndexedPropertyValuesContainer::Create(
SAL_UNUSED_PARAMETER const uno::Reference< uno::XComponentContext >&) SAL_UNUSED_PARAMETER const uno::Reference< uno::XComponentContext >&)
{ {
return (cppu::OWeakObject*)new IndexedPropertyValuesContainer(); return static_cast<cppu::OWeakObject*>(new IndexedPropertyValuesContainer());
} }
void createRegistryInfo_IndexedPropertyValuesContainer() void createRegistryInfo_IndexedPropertyValuesContainer()

2
comphelper/source/container/NamedPropertyValuesContainer.cxx
View File

@@ -216,7 +216,7 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString&
uno::Reference< uno::XInterface > SAL_CALL NamedPropertyValuesContainer::Create( uno::Reference< uno::XInterface > SAL_CALL NamedPropertyValuesContainer::Create(
SAL_UNUSED_PARAMETER const uno::Reference< uno::XComponentContext >&) SAL_UNUSED_PARAMETER const uno::Reference< uno::XComponentContext >&)
{ {
return (cppu::OWeakObject*)new NamedPropertyValuesContainer(); return static_cast<cppu::OWeakObject*>(new NamedPropertyValuesContainer());
} }
void createRegistryInfo_NamedPropertyValuesContainer() void createRegistryInfo_NamedPropertyValuesContainer()

2
comphelper/source/container/namecontainer.cxx
View File

@@ -199,7 +199,7 @@ Type SAL_CALL NameContainer::getElementType()
Reference< XNameContainer > comphelper::NameContainer_createInstance( Type aType ) 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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
comphelper/source/eventattachermgr/eventattachermgr.cxx
View File

@@ -185,7 +185,7 @@ void SAL_CALL AttacherAllListener_Impl::firing(const AllEventObject& Event)
throw( RuntimeException, std::exception ) throw( RuntimeException, std::exception )
{ {
ScriptEvent aScriptEvent; ScriptEvent aScriptEvent;
aScriptEvent.Source = (OWeakObject *)mpManager; // get correct XInterface aScriptEvent.Source = static_cast<OWeakObject *>(mpManager); // get correct XInterface
aScriptEvent.ListenerType = Event.ListenerType; aScriptEvent.ListenerType = Event.ListenerType;
aScriptEvent.MethodName = Event.MethodName; aScriptEvent.MethodName = Event.MethodName;
aScriptEvent.Arguments = Event.Arguments; aScriptEvent.Arguments = Event.Arguments;
@@ -250,7 +250,7 @@ Any SAL_CALL AttacherAllListener_Impl::approveFiring( const AllEventObject& Even
throw( InvocationTargetException, RuntimeException, std::exception ) throw( InvocationTargetException, RuntimeException, std::exception )
{ {
ScriptEvent aScriptEvent; ScriptEvent aScriptEvent;
aScriptEvent.Source = (OWeakObject *)mpManager; // get correct XInterface aScriptEvent.Source = static_cast<OWeakObject *>(mpManager); // get correct XInterface
aScriptEvent.ListenerType = Event.ListenerType; aScriptEvent.ListenerType = Event.ListenerType;
aScriptEvent.MethodName = Event.MethodName; aScriptEvent.MethodName = Event.MethodName;
aScriptEvent.Arguments = Event.Arguments; aScriptEvent.Arguments = Event.Arguments;

2
comphelper/source/property/genericpropertyset.cxx
View File

@@ -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 ) ::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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
comphelper/source/streaming/memorystream.cxx
View File

@@ -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* pData = static_cast<sal_Int8*>(&(*maData.begin()));
sal_Int8* pCursor = &((pData)[mnCursor]); 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; 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* pData = static_cast<sal_Int8*>(&(*maData.begin()));
sal_Int8* pCursor = &(pData[mnCursor]); sal_Int8* pCursor = &(pData[mnCursor]);
memcpy( (void*)pCursor, (void*)aData.getConstArray(), nBytesToWrite ); memcpy( pCursor, aData.getConstArray(), nBytesToWrite );
mnCursor += nBytesToWrite; mnCursor += nBytesToWrite;
} }

2
comphelper/source/streaming/oslfile2streamwrap.cxx
View File

@@ -51,7 +51,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8
aData.realloc(nBytesToRead); aData.realloc(nBytesToRead);
sal_uInt64 nRead = 0; 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) if (eError != FileBase::E_None)
throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this)); throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));