diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-31 13:14:10 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-31 13:14:10 +0200 |
commit | fb6c3bd2db4960b96151267838859e4f3172a444 (patch) | |
tree | 5d5e26098f394a714d6d596281618a592e0d4933 /filter | |
parent | 78a7f969b476ac2a32be8eca79296ff6c5abe540 (diff) |
Reduce to static_cast any reinterpret_cast from void pointers
Change-Id: I1d8fc57cb95e12e2a3946fc1927427ab0efbf0db
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/config/cache/registration.cxx | 2 | ||||
-rw-r--r-- | filter/source/flash/swfuno.cxx | 4 | ||||
-rw-r--r-- | filter/source/flash/swfwriter1.cxx | 2 | ||||
-rw-r--r-- | filter/source/odfflatxml/OdfFlatXml.cxx | 2 | ||||
-rw-r--r-- | filter/source/pdf/impdialog.cxx | 4 | ||||
-rw-r--r-- | filter/source/pdf/pdfuno.cxx | 6 | ||||
-rw-r--r-- | filter/source/placeware/uno.cxx | 2 | ||||
-rw-r--r-- | filter/source/t602/filterenv.cxx | 4 | ||||
-rw-r--r-- | filter/source/xmlfilteradaptor/genericfilter.cxx | 2 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 2 | ||||
-rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 4 |
11 files changed, 17 insertions, 17 deletions
diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx index 952f5d746e55..3687a24f4a76 100644 --- a/filter/source/config/cache/registration.cxx +++ b/filter/source/config/cache/registration.cxx @@ -41,7 +41,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL return NULL; 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; OUString sImplName = OUString::createFromAscii(pImplementationName); diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx index ca011f969134..a630eb7daa85 100644 --- a/filter/source/flash/swfuno.cxx +++ b/filter/source/flash/swfuno.cxx @@ -48,7 +48,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL flash_component_getFactory( if ( implName.equals(FlashExportFilter_getImplementationName()) ) { xFactory = createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), + static_cast< XMultiServiceFactory * >( pServiceManager ), OUString::createFromAscii( pImplName ), FlashExportFilter_createInstance, FlashExportFilter_getSupportedServiceNames() ); @@ -56,7 +56,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL flash_component_getFactory( else if ( implName.equals(SWFDialog_getImplementationName()) ) { xFactory = createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), + static_cast< XMultiServiceFactory * >( pServiceManager ), OUString::createFromAscii( pImplName ), SWFDialog_createInstance, SWFDialog_getSupportedServiceNames() ); } diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index eec67091f106..2b532d8ff6a9 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -857,7 +857,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali if( aFilter.ExportGraphic( aGraphic, OUString(), aDstStm, 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 ); } diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index fffedaeb33ca..6b75b8333660 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -226,7 +226,7 @@ odfflatxml_component_getFactory( const sal_Char* pImplementationName, return NULL; 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; OUString sImplName = OUString::createFromAscii(pImplementationName); diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 77f792f3d15b..e8d1e1eb91ab 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1502,7 +1502,7 @@ ImplErrorDialog::ImplErrorDialog(const std::set< vcl::PDFWriter::ErrorCode >& rE if( m_pErrors->GetEntryCount() > 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() ); } @@ -1518,7 +1518,7 @@ ImplErrorDialog::~ImplErrorDialog() 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() ); return 0; } diff --git a/filter/source/pdf/pdfuno.cxx b/filter/source/pdf/pdfuno.cxx index 3b0a77093ed2..4ad540392e67 100644 --- a/filter/source/pdf/pdfuno.cxx +++ b/filter/source/pdf/pdfuno.cxx @@ -46,21 +46,21 @@ extern "C" if( aImplName.equals( PDFFilter_getImplementationName() ) ) { - xFactory = createSingleFactory( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ), + xFactory = createSingleFactory( static_cast< XMultiServiceFactory* >( pServiceManager ), OUString::createFromAscii( pImplName ), PDFFilter_createInstance, PDFFilter_getSupportedServiceNames() ); } else if( aImplName.equals( PDFDialog_getImplementationName() ) ) { - xFactory = createSingleFactory( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ), + xFactory = createSingleFactory( static_cast< XMultiServiceFactory* >( pServiceManager ), OUString::createFromAscii( pImplName ), PDFDialog_createInstance, PDFDialog_getSupportedServiceNames() ); } else if( aImplName.equals( PDFInteractionHandler_getImplementationName() ) ) { - xFactory = createSingleFactory( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ), + xFactory = createSingleFactory( static_cast< XMultiServiceFactory* >( pServiceManager ), OUString::createFromAscii( pImplName ), PDFInteractionHandler_createInstance, PDFInteractionHandler_getSupportedServiceNames() ); diff --git a/filter/source/placeware/uno.cxx b/filter/source/placeware/uno.cxx index e871dbea2b69..a14bfaad330a 100644 --- a/filter/source/placeware/uno.cxx +++ b/filter/source/placeware/uno.cxx @@ -45,7 +45,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL placeware_component_getFactory( if ( pServiceManager && implName.equals(PlaceWareExportFilter_getImplementationName()) ) { Reference< XSingleServiceFactory > xFactory( createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), + static_cast< XMultiServiceFactory * >( pServiceManager ), OUString::createFromAscii( pImplName ), PlaceWareExportFilter_createInstance, PlaceWareExportFilter_getSupportedServiceNames() ) ); diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx index 13500d2250f5..cfa263527a6c 100644 --- a/filter/source/t602/filterenv.cxx +++ b/filter/source/t602/filterenv.cxx @@ -43,7 +43,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL t602filter_component_getFactory( if ( pServiceManager && implName.equals(T602ImportFilter_getImplementationName()) ) { Reference< XSingleServiceFactory > xFactory( createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), + static_cast< XMultiServiceFactory * >( pServiceManager ), OUString::createFromAscii( pImplName ), T602ImportFilter_createInstance, T602ImportFilter_getSupportedServiceNames() ) ); @@ -56,7 +56,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL t602filter_component_getFactory( else if ( pServiceManager && implName.equals(T602ImportFilterDialog_getImplementationName()) ) { Reference< XSingleServiceFactory > xFactory( createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), + static_cast< XMultiServiceFactory * >( pServiceManager ), OUString::createFromAscii( pImplName ), T602ImportFilterDialog_createInstance, T602ImportFilterDialog_getSupportedServiceNames() ) ); diff --git a/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx index 07105e3887f1..2abf3c9d8e87 100644 --- a/filter/source/xmlfilteradaptor/genericfilter.cxx +++ b/filter/source/xmlfilteradaptor/genericfilter.cxx @@ -39,7 +39,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfa_component_getFactory( if ( pServiceManager && implName.equals(XmlFilterAdaptor_getImplementationName()) ) { Reference< XSingleServiceFactory > xFactory( createSingleFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), + static_cast< XMultiServiceFactory * >( pServiceManager ), OUString::createFromAscii( pImplName ), XmlFilterAdaptor_createInstance, XmlFilterAdaptor_getSupportedServiceNames() ) ); if (xFactory.is()) diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 7c62fd803efe..fd570b7ef2c5 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -380,7 +380,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltdlg_component_getFactory( if ( implName.equals(XMLFilterDialogComponent_getImplementationName()) ) { xFactory = createOneInstanceFactory( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ), + static_cast< XMultiServiceFactory * >( pServiceManager ), OUString::createFromAscii( pImplName ), XMLFilterDialogComponent_createInstance, XMLFilterDialogComponent_getSupportedServiceNames() ); diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 7d3402b1c42f..84afe7d4e9b7 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -589,7 +589,7 @@ extern "C" css::uno::Reference<XSingleServiceFactory> xFactory( createSingleFactory( - reinterpret_cast<XMultiServiceFactory *> (pServiceManager), + static_cast<XMultiServiceFactory *> (pServiceManager), OUString::createFromAscii( pImplName), CreateFilterInstance, @@ -608,7 +608,7 @@ extern "C" css::uno::Reference<XSingleServiceFactory> xFactory( createSingleFactory( - reinterpret_cast<XMultiServiceFactory *> (pServiceManager), + static_cast<XMultiServiceFactory *> (pServiceManager), OUString::createFromAscii( pImplName), CreateTransformerInstance, |