summaryrefslogtreecommitdiff
path: root/connectivity/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-03-31 13:12:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-03-31 13:12:41 +0200
commit5209884f618ab5a20a8aecbfb832e99474b4654d (patch)
treeae4093f6b65445a092704f55fdd3c490f669c922 /connectivity/source
parent581c5075bbbb8068e2285c3392b712f41083cfb4 (diff)
Reduce to static_cast any reinterpret_cast from void pointers
Change-Id: I24dc3a9b16abb1397cdd6a4f6cfafb81cc61d0f9
Diffstat (limited to 'connectivity/source')
-rw-r--r--connectivity/source/commontools/dbexception.cxx6
-rw-r--r--connectivity/source/drivers/calc/Cservices.cxx2
-rw-r--r--connectivity/source/drivers/dbase/Dservices.cxx2
-rw-r--r--connectivity/source/drivers/evoab2/NServices.cxx2
-rw-r--r--connectivity/source/drivers/firebird/Services.cxx2
-rw-r--r--connectivity/source/drivers/flat/Eservices.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/Hservices.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/jservices.cxx2
-rw-r--r--connectivity/source/drivers/kab/KServices.cxx2
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx4
-rw-r--r--connectivity/source/drivers/mysql/Yservices.cxx2
-rw-r--r--connectivity/source/drivers/odbc/oservices.cxx2
12 files changed, 15 insertions, 15 deletions
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 6d43810f20a1..38f6d67815cc 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -178,21 +178,21 @@ bool SQLExceptionInfo::isKindOf(TYPE _eType) const
SQLExceptionInfo::operator const ::com::sun::star::sdbc::SQLException*() const
{
OSL_ENSURE(isKindOf(SQL_EXCEPTION), "SQLExceptionInfo::operator SQLException* : invalid call !");
- return reinterpret_cast<const ::com::sun::star::sdbc::SQLException*>(m_aContent.getValue());
+ return static_cast<const ::com::sun::star::sdbc::SQLException*>(m_aContent.getValue());
}
SQLExceptionInfo::operator const ::com::sun::star::sdbc::SQLWarning*() const
{
OSL_ENSURE(isKindOf(SQL_WARNING), "SQLExceptionInfo::operator SQLException* : invalid call !");
- return reinterpret_cast<const ::com::sun::star::sdbc::SQLWarning*>(m_aContent.getValue());
+ return static_cast<const ::com::sun::star::sdbc::SQLWarning*>(m_aContent.getValue());
}
SQLExceptionInfo::operator const ::com::sun::star::sdb::SQLContext*() const
{
OSL_ENSURE(isKindOf(SQL_CONTEXT), "SQLExceptionInfo::operator SQLException* : invalid call !");
- return reinterpret_cast<const ::com::sun::star::sdb::SQLContext*>(m_aContent.getValue());
+ return static_cast<const ::com::sun::star::sdb::SQLContext*>(m_aContent.getValue());
}
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index 55c2fe0384d1..edcf547705c8 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -46,7 +46,7 @@ struct ProviderRequest
void* pServiceManager,
sal_Char const* pImplementationName
)
- : xServiceManager(reinterpret_cast<XMultiServiceFactory*>(pServiceManager))
+ : xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
{
}
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index 72c6e2a38f0d..35ef6b3b6c07 100644
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -46,7 +46,7 @@ struct ProviderRequest
void* pServiceManager,
sal_Char const* pImplementationName
)
- : xServiceManager(reinterpret_cast<XMultiServiceFactory*>(pServiceManager))
+ : xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
{
}
diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx
index 5113311e3c5f..116a470cce70 100644
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -47,7 +47,7 @@ struct ProviderRequest
void* pServiceManager,
sal_Char const* pImplementationName
)
- : xServiceManager(reinterpret_cast<XMultiServiceFactory*>(pServiceManager))
+ : xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
{
}
diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx
index 0efd42299925..ccee9ca7950c 100644
--- a/connectivity/source/drivers/firebird/Services.cxx
+++ b/connectivity/source/drivers/firebird/Services.cxx
@@ -50,7 +50,7 @@ struct ProviderRequest
void* pServiceManager,
sal_Char const* pImplementationName
)
- : xServiceManager(reinterpret_cast<XMultiServiceFactory*>(pServiceManager))
+ : xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
{
}
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index 1fbe4efe43e4..762bcc805945 100644
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -46,7 +46,7 @@ struct ProviderRequest
void* pServiceManager,
sal_Char const* pImplementationName
)
- : xServiceManager(reinterpret_cast<XMultiServiceFactory*>(pServiceManager))
+ : xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
{
}
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index 1cd0d912e72e..c9cf2e4259fb 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -47,7 +47,7 @@ struct ProviderRequest
void* pServiceManager,
sal_Char const* pImplementationName
)
- : xServiceManager(reinterpret_cast<XMultiServiceFactory*>(pServiceManager))
+ : xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
{
}
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index 38aff165b243..753a6a81d9fc 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -46,7 +46,7 @@ struct ProviderRequest
void* pServiceManager,
sal_Char const* pImplementationName
)
- : xServiceManager(reinterpret_cast<XMultiServiceFactory*>(pServiceManager))
+ : xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
{
}
diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx
index b963a0f38512..c4d9618ea29a 100644
--- a/connectivity/source/drivers/kab/KServices.cxx
+++ b/connectivity/source/drivers/kab/KServices.cxx
@@ -54,7 +54,7 @@ struct ProviderRequest
void* pServiceManager,
sal_Char const* pImplementationName
)
- : xServiceManager(reinterpret_cast<XMultiServiceFactory*>(pServiceManager))
+ : xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
{
}
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index 0c981b048811..a7586fbc47a0 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -224,7 +224,7 @@ using ::com::sun::star::lang::XMultiServiceFactory;
static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
{
- MozillaBootstrap * pBootstrap = reinterpret_cast<MozillaBootstrap*>(OMozillaBootstrap_CreateInstance(rServiceManager));
+ MozillaBootstrap * pBootstrap = static_cast<MozillaBootstrap*>(OMozillaBootstrap_CreateInstance(rServiceManager));
return *pBootstrap;
}
@@ -245,7 +245,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozbootstrap_component_getFactory
aSNS[0] = "com.sun.star.mozilla.MozillaBootstrap";
xFactory = ::cppu::createSingleFactory(
- reinterpret_cast< XMultiServiceFactory* > ( pServiceManager),
+ static_cast< XMultiServiceFactory* > ( pServiceManager),
aImplName, createInstance, aSNS );
}
if ( xFactory.is() )
diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx
index 04a5da00bb42..95360d33eee7 100644
--- a/connectivity/source/drivers/mysql/Yservices.cxx
+++ b/connectivity/source/drivers/mysql/Yservices.cxx
@@ -46,7 +46,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mysql_component_getFactory(
}
Reference< XSingleServiceFactory > xRet;
- const Reference< XMultiServiceFactory > xServiceManager( reinterpret_cast<XMultiServiceFactory*>(pServiceManager) );
+ const Reference< XMultiServiceFactory > xServiceManager( static_cast<XMultiServiceFactory*>(pServiceManager) );
const OUString sImplementationName( OUString::createFromAscii(pImplementationName) );
if( ODriverDelegator::getImplementationName_Static() == sImplementationName )
diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx
index 25b3e3a9e2db..959175161138 100644
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.cxx
@@ -47,7 +47,7 @@ struct ProviderRequest
void* pServiceManager,
sal_Char const* pImplementationName
)
- : xServiceManager(reinterpret_cast<XMultiServiceFactory*>(pServiceManager))
+ : xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName))
{
}