diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-31 13:17:19 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-31 13:17:19 +0200 |
commit | be44ec8c28ce2af9644fcc58317dc1c9b20e2a21 (patch) | |
tree | 0f6fd8c7be516abf407f10b5ebdce068f8834b55 | |
parent | 90da412b2b5955ab6c014ff7bce5058ee5c3bc2d (diff) |
Reduce to static_cast any reinterpret_cast from void pointers
Change-Id: I4df86baf0106283c78942c40a4b5830dd9c91195
-rw-r--r-- | ucb/source/cacher/cachedcontentresultset.cxx | 8 | ||||
-rw-r--r-- | ucb/source/cacher/cacheserv.cxx | 2 | ||||
-rw-r--r-- | ucb/source/core/ucbserv.cxx | 2 | ||||
-rw-r--r-- | ucb/source/sorter/sortmain.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/cmis/cmis_provider.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/prov.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpservices.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpurl.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/gio/gio_provider.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchyservices.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/package/pkgservices.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_services.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/webdavservices.cxx | 2 |
13 files changed, 16 insertions, 16 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index fccb5230accd..c1d6c5f37aa7 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -290,7 +290,7 @@ const Any& SAL_CALL CachedContentResultSet::CCRS_Cache m_xContentIdentifierMapping.clear(); } const Sequence< Any >& rRow = - (* reinterpret_cast< const Sequence< Any > * > + (* static_cast< const Sequence< Any > * > (getRowAny( nRow ).getValue() )); if( nColumnIndex > rRow.getLength() ) @@ -312,7 +312,7 @@ const OUString& SAL_CALL CachedContentResultSet::CCRS_Cache rRow <<= m_xContentIdentifierMapping->mapContentIdentifierString( aValue ); remindMapped( nRow ); } - return (* reinterpret_cast< const OUString * > + return (* static_cast< const OUString * > (getRowAny( nRow ).getValue() )); } catch(const SQLException&) @@ -335,7 +335,7 @@ const Reference< XContentIdentifier >& SAL_CALL CachedContentResultSet::CCRS_Cac rRow <<= m_xContentIdentifierMapping->mapContentIdentifier( aValue ); remindMapped( nRow ); } - return (* reinterpret_cast< const Reference< XContentIdentifier > * > + return (* static_cast< const Reference< XContentIdentifier > * > (getRowAny( nRow ).getValue() )); } catch(const SQLException&) @@ -358,7 +358,7 @@ const Reference< XContent >& SAL_CALL CachedContentResultSet::CCRS_Cache rRow <<= m_xContentIdentifierMapping->mapContent( aValue ); remindMapped( nRow ); } - return (* reinterpret_cast< const Reference< XContent > * > + return (* static_cast< const Reference< XContent > * > (getRowAny( nRow ).getValue() )); } catch (const SQLException&) diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx index ea63ddb6d006..ac110d864ea9 100644 --- a/ucb/source/cacher/cacheserv.cxx +++ b/ucb/source/cacher/cacheserv.cxx @@ -37,7 +37,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cached1_component_getFactory( void * pRet = 0; Reference< XMultiServiceFactory > xSMgr( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ) ); + static_cast< XMultiServiceFactory * >( pServiceManager ) ); Reference< XSingleServiceFactory > xFactory; diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx index df41eaaa1f4c..3b33c8567c01 100644 --- a/ucb/source/core/ucbserv.cxx +++ b/ucb/source/core/ucbserv.cxx @@ -36,7 +36,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucb_component_getFactory( void * pRet = 0; Reference< XMultiServiceFactory > xSMgr( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ) ); + static_cast< XMultiServiceFactory * >( pServiceManager ) ); Reference< XSingleServiceFactory > xFactory; diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx index 75ca0452f1ce..a1b5e1ea8bf6 100644 --- a/ucb/source/sorter/sortmain.cxx +++ b/ucb/source/sorter/sortmain.cxx @@ -32,7 +32,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL srtrs1_component_getFactory( void * pRet = 0; Reference< XMultiServiceFactory > xSMgr( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ) ); + static_cast< XMultiServiceFactory * >( pServiceManager ) ); Reference< XSingleServiceFactory > xFactory; diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index dfe83a00a1c1..7fc710e85fda 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -130,7 +130,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpcmis1_component_getFactory( c void * pRet = 0; uno::Reference< lang::XMultiServiceFactory > xSMgr - (reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); + (static_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; if ( ::cmis::ContentProvider::getImplementationName_Static().equalsAscii( pImplName ) ) diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 526c19a35226..5dc799cf6208 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -53,7 +53,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpfile_component_getFactory( void * pRet = 0; Reference< XMultiServiceFactory > xSMgr( - reinterpret_cast< XMultiServiceFactory * >( pServiceManager ) ); + static_cast< XMultiServiceFactory * >( pServiceManager ) ); Reference< XSingleServiceFactory > xFactory; diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx index 7eed0e37c80d..e70785afced7 100644 --- a/ucb/source/ucp/ftp/ftpservices.cxx +++ b/ucb/source/ucp/ftp/ftpservices.cxx @@ -32,7 +32,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpftp1_component_getFactory( void * pRet = 0; uno::Reference< lang::XMultiServiceFactory > xSMgr( - reinterpret_cast< lang::XMultiServiceFactory * >( + static_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx index 75d7abe80043..8bbcfbdfba7e 100644 --- a/ucb/source/ucp/ftp/ftpurl.cxx +++ b/ucb/source/ucp/ftp/ftpurl.cxx @@ -102,7 +102,7 @@ extern "C" { int memory_write(void *buffer,size_t size,size_t nmemb,void *stream) { MemoryContainer *_stream = - reinterpret_cast<MemoryContainer*>(stream); + static_cast<MemoryContainer*>(stream); if(!_stream) return 0; diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index acc8f1e14325..4832f86e2065 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -117,7 +117,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgio1_component_getFactory( co void * pRet = 0; uno::Reference< lang::XMultiServiceFactory > xSMgr - (reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); + (static_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; #if !GLIB_CHECK_VERSION(2,36,0) g_type_init(); diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx index a3c60af4fec2..fad56988a5bc 100644 --- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx @@ -32,7 +32,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucphier1_component_getFactory( void * pRet = 0; uno::Reference< lang::XMultiServiceFactory > xSMgr( - reinterpret_cast< lang::XMultiServiceFactory * >( + static_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx index 1c15f424f8e9..da77c329b048 100644 --- a/ucb/source/ucp/package/pkgservices.cxx +++ b/ucb/source/ucp/package/pkgservices.cxx @@ -31,7 +31,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucppkg1_component_getFactory( void * pRet = 0; uno::Reference< lang::XMultiServiceFactory > xSMgr( - reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); + static_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx index f0a843550df2..1051e356da53 100644 --- a/ucb/source/ucp/tdoc/tdoc_services.cxx +++ b/ucb/source/ucp/tdoc/tdoc_services.cxx @@ -35,7 +35,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucptdoc1_component_getFactory( void * pRet = 0; uno::Reference< lang::XMultiServiceFactory > xSMgr( - reinterpret_cast< lang::XMultiServiceFactory * >( + static_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; diff --git a/ucb/source/ucp/webdav-neon/webdavservices.cxx b/ucb/source/ucp/webdav-neon/webdavservices.cxx index e0c2cbf9eb94..8cf247511cc1 100644 --- a/ucb/source/ucp/webdav-neon/webdavservices.cxx +++ b/ucb/source/ucp/webdav-neon/webdavservices.cxx @@ -40,7 +40,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpdav1_component_getFactory( void * pRet = 0; uno::Reference< lang::XMultiServiceFactory > xSMgr( - reinterpret_cast< lang::XMultiServiceFactory * >( + static_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; |