Kaydet (Commit) fb6c3bd2 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Reduce to static_cast any reinterpret_cast from void pointers

Change-Id: I1d8fc57cb95e12e2a3946fc1927427ab0efbf0db
üst 78a7f969
...@@ -41,7 +41,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL ...@@ -41,7 +41,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL
return NULL; return NULL;
com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
xSMGR = reinterpret_cast< com::sun::star::lang::XMultiServiceFactory* >(pServiceManager); xSMGR = static_cast< com::sun::star::lang::XMultiServiceFactory* >(pServiceManager);
com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory; com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory;
OUString sImplName = OUString::createFromAscii(pImplementationName); OUString sImplName = OUString::createFromAscii(pImplementationName);
......
...@@ -48,7 +48,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL flash_component_getFactory( ...@@ -48,7 +48,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL flash_component_getFactory(
if ( implName.equals(FlashExportFilter_getImplementationName()) ) if ( implName.equals(FlashExportFilter_getImplementationName()) )
{ {
xFactory = createSingleFactory( xFactory = createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), static_cast< XMultiServiceFactory * >( pServiceManager ),
OUString::createFromAscii( pImplName ), OUString::createFromAscii( pImplName ),
FlashExportFilter_createInstance, FlashExportFilter_getSupportedServiceNames() ); FlashExportFilter_createInstance, FlashExportFilter_getSupportedServiceNames() );
...@@ -56,7 +56,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL flash_component_getFactory( ...@@ -56,7 +56,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL flash_component_getFactory(
else if ( implName.equals(SWFDialog_getImplementationName()) ) else if ( implName.equals(SWFDialog_getImplementationName()) )
{ {
xFactory = createSingleFactory( xFactory = createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), static_cast< XMultiServiceFactory * >( pServiceManager ),
OUString::createFromAscii( pImplName ), OUString::createFromAscii( pImplName ),
SWFDialog_createInstance, SWFDialog_getSupportedServiceNames() ); SWFDialog_createInstance, SWFDialog_getSupportedServiceNames() );
} }
......
...@@ -857,7 +857,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali ...@@ -857,7 +857,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali
if( aFilter.ExportGraphic( aGraphic, OUString(), aDstStm, if( aFilter.ExportGraphic( aGraphic, OUString(), aDstStm,
aFilter.GetExportFormatNumberForShortName( OUString(JPG_SHORTNAME) ), &aFilterData ) == ERRCODE_NONE ) aFilter.GetExportFormatNumberForShortName( OUString(JPG_SHORTNAME) ), &aFilterData ) == ERRCODE_NONE )
{ {
pJpgData = reinterpret_cast<const sal_uInt8*>(aDstStm.GetData()); pJpgData = static_cast<const sal_uInt8*>(aDstStm.GetData());
nJpgDataLength = aDstStm.Seek( STREAM_SEEK_TO_END ); nJpgDataLength = aDstStm.Seek( STREAM_SEEK_TO_END );
} }
......
...@@ -226,7 +226,7 @@ odfflatxml_component_getFactory( const sal_Char* pImplementationName, ...@@ -226,7 +226,7 @@ odfflatxml_component_getFactory( const sal_Char* pImplementationName,
return NULL; return NULL;
com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
xSMGR = reinterpret_cast< com::sun::star::lang::XMultiServiceFactory* >(pServiceManager); xSMGR = static_cast< com::sun::star::lang::XMultiServiceFactory* >(pServiceManager);
com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory; com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory;
OUString sImplName = OUString::createFromAscii(pImplementationName); OUString sImplName = OUString::createFromAscii(pImplementationName);
......
...@@ -1502,7 +1502,7 @@ ImplErrorDialog::ImplErrorDialog(const std::set< vcl::PDFWriter::ErrorCode >& rE ...@@ -1502,7 +1502,7 @@ ImplErrorDialog::ImplErrorDialog(const std::set< vcl::PDFWriter::ErrorCode >& rE
if( m_pErrors->GetEntryCount() > 0 ) if( m_pErrors->GetEntryCount() > 0 )
{ {
m_pErrors->SelectEntryPos( 0 ); m_pErrors->SelectEntryPos( 0 );
OUString* pStr = reinterpret_cast<OUString*>(m_pErrors->GetEntryData( 0 )); OUString* pStr = static_cast<OUString*>(m_pErrors->GetEntryData( 0 ));
m_pExplanation->SetText( pStr ? *pStr : OUString() ); m_pExplanation->SetText( pStr ? *pStr : OUString() );
} }
...@@ -1518,7 +1518,7 @@ ImplErrorDialog::~ImplErrorDialog() ...@@ -1518,7 +1518,7 @@ ImplErrorDialog::~ImplErrorDialog()
IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl) IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl)
{ {
OUString* pStr = reinterpret_cast<OUString*>(m_pErrors->GetSelectEntryData()); OUString* pStr = static_cast<OUString*>(m_pErrors->GetSelectEntryData());
m_pExplanation->SetText( pStr ? *pStr : OUString() ); m_pExplanation->SetText( pStr ? *pStr : OUString() );
return 0; return 0;
} }
......
...@@ -46,21 +46,21 @@ extern "C" ...@@ -46,21 +46,21 @@ extern "C"
if( aImplName.equals( PDFFilter_getImplementationName() ) ) if( aImplName.equals( PDFFilter_getImplementationName() ) )
{ {
xFactory = createSingleFactory( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ), xFactory = createSingleFactory( static_cast< XMultiServiceFactory* >( pServiceManager ),
OUString::createFromAscii( pImplName ), OUString::createFromAscii( pImplName ),
PDFFilter_createInstance, PDFFilter_getSupportedServiceNames() ); PDFFilter_createInstance, PDFFilter_getSupportedServiceNames() );
} }
else if( aImplName.equals( PDFDialog_getImplementationName() ) ) else if( aImplName.equals( PDFDialog_getImplementationName() ) )
{ {
xFactory = createSingleFactory( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ), xFactory = createSingleFactory( static_cast< XMultiServiceFactory* >( pServiceManager ),
OUString::createFromAscii( pImplName ), OUString::createFromAscii( pImplName ),
PDFDialog_createInstance, PDFDialog_getSupportedServiceNames() ); PDFDialog_createInstance, PDFDialog_getSupportedServiceNames() );
} }
else if( aImplName.equals( PDFInteractionHandler_getImplementationName() ) ) else if( aImplName.equals( PDFInteractionHandler_getImplementationName() ) )
{ {
xFactory = createSingleFactory( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ), xFactory = createSingleFactory( static_cast< XMultiServiceFactory* >( pServiceManager ),
OUString::createFromAscii( pImplName ), OUString::createFromAscii( pImplName ),
PDFInteractionHandler_createInstance, PDFInteractionHandler_getSupportedServiceNames() ); PDFInteractionHandler_createInstance, PDFInteractionHandler_getSupportedServiceNames() );
......
...@@ -45,7 +45,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL placeware_component_getFactory( ...@@ -45,7 +45,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL placeware_component_getFactory(
if ( pServiceManager && implName.equals(PlaceWareExportFilter_getImplementationName()) ) if ( pServiceManager && implName.equals(PlaceWareExportFilter_getImplementationName()) )
{ {
Reference< XSingleServiceFactory > xFactory( createSingleFactory( Reference< XSingleServiceFactory > xFactory( createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), static_cast< XMultiServiceFactory * >( pServiceManager ),
OUString::createFromAscii( pImplName ), OUString::createFromAscii( pImplName ),
PlaceWareExportFilter_createInstance, PlaceWareExportFilter_getSupportedServiceNames() ) ); PlaceWareExportFilter_createInstance, PlaceWareExportFilter_getSupportedServiceNames() ) );
......
...@@ -43,7 +43,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL t602filter_component_getFactory( ...@@ -43,7 +43,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL t602filter_component_getFactory(
if ( pServiceManager && implName.equals(T602ImportFilter_getImplementationName()) ) if ( pServiceManager && implName.equals(T602ImportFilter_getImplementationName()) )
{ {
Reference< XSingleServiceFactory > xFactory( createSingleFactory( Reference< XSingleServiceFactory > xFactory( createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), static_cast< XMultiServiceFactory * >( pServiceManager ),
OUString::createFromAscii( pImplName ), OUString::createFromAscii( pImplName ),
T602ImportFilter_createInstance, T602ImportFilter_getSupportedServiceNames() ) ); T602ImportFilter_createInstance, T602ImportFilter_getSupportedServiceNames() ) );
...@@ -56,7 +56,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL t602filter_component_getFactory( ...@@ -56,7 +56,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL t602filter_component_getFactory(
else if ( pServiceManager && implName.equals(T602ImportFilterDialog_getImplementationName()) ) else if ( pServiceManager && implName.equals(T602ImportFilterDialog_getImplementationName()) )
{ {
Reference< XSingleServiceFactory > xFactory( createSingleFactory( Reference< XSingleServiceFactory > xFactory( createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), static_cast< XMultiServiceFactory * >( pServiceManager ),
OUString::createFromAscii( pImplName ), OUString::createFromAscii( pImplName ),
T602ImportFilterDialog_createInstance, T602ImportFilterDialog_getSupportedServiceNames() ) ); T602ImportFilterDialog_createInstance, T602ImportFilterDialog_getSupportedServiceNames() ) );
......
...@@ -39,7 +39,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfa_component_getFactory( ...@@ -39,7 +39,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfa_component_getFactory(
if ( pServiceManager && implName.equals(XmlFilterAdaptor_getImplementationName()) ) if ( pServiceManager && implName.equals(XmlFilterAdaptor_getImplementationName()) )
{ {
Reference< XSingleServiceFactory > xFactory( createSingleFactory( Reference< XSingleServiceFactory > xFactory( createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), static_cast< XMultiServiceFactory * >( pServiceManager ),
OUString::createFromAscii( pImplName ), OUString::createFromAscii( pImplName ),
XmlFilterAdaptor_createInstance, XmlFilterAdaptor_getSupportedServiceNames() ) ); XmlFilterAdaptor_createInstance, XmlFilterAdaptor_getSupportedServiceNames() ) );
if (xFactory.is()) if (xFactory.is())
......
...@@ -380,7 +380,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltdlg_component_getFactory( ...@@ -380,7 +380,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltdlg_component_getFactory(
if ( implName.equals(XMLFilterDialogComponent_getImplementationName()) ) if ( implName.equals(XMLFilterDialogComponent_getImplementationName()) )
{ {
xFactory = createOneInstanceFactory( xFactory = createOneInstanceFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), static_cast< XMultiServiceFactory * >( pServiceManager ),
OUString::createFromAscii( pImplName ), OUString::createFromAscii( pImplName ),
XMLFilterDialogComponent_createInstance, XMLFilterDialogComponent_getSupportedServiceNames() ); XMLFilterDialogComponent_createInstance, XMLFilterDialogComponent_getSupportedServiceNames() );
......
...@@ -589,7 +589,7 @@ extern "C" ...@@ -589,7 +589,7 @@ extern "C"
css::uno::Reference<XSingleServiceFactory> css::uno::Reference<XSingleServiceFactory>
xFactory( xFactory(
createSingleFactory( createSingleFactory(
reinterpret_cast<XMultiServiceFactory *> (pServiceManager), static_cast<XMultiServiceFactory *> (pServiceManager),
OUString::createFromAscii( OUString::createFromAscii(
pImplName), pImplName),
CreateFilterInstance, CreateFilterInstance,
...@@ -608,7 +608,7 @@ extern "C" ...@@ -608,7 +608,7 @@ extern "C"
css::uno::Reference<XSingleServiceFactory> css::uno::Reference<XSingleServiceFactory>
xFactory( xFactory(
createSingleFactory( createSingleFactory(
reinterpret_cast<XMultiServiceFactory *> (pServiceManager), static_cast<XMultiServiceFactory *> (pServiceManager),
OUString::createFromAscii( OUString::createFromAscii(
pImplName), pImplName),
CreateTransformerInstance, CreateTransformerInstance,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment