Clean up C-style casts from pointers to void

Change-Id: I6c7c31befd61cbf0800a62c08e7395ddf78e4b30

8 files changed, 53 insertions, 53 deletions

diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 5ce6c5c603d3..35f84fec6bea 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -105,7 +105,7 @@ namespace connectivity
                 GParamSpec **pProps;
                 nFields = 0;
                 pProps = g_object_class_list_properties
-                    ( (GObjectClass *) g_type_class_ref( E_TYPE_CONTACT ),
+                    ( static_cast<GObjectClass *>(g_type_class_ref( E_TYPE_CONTACT )),
                          &nProps );
                 pToBeFields = g_new0(ColumnProperty  *, (nProps + OTHER_ZIP)/* new column(s)*/ );
                 for ( guint i = 0; i < nProps; i++ )
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index add296150c6b..62ebbfca0a09 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -156,7 +156,7 @@ whichAddress(int value)
 static EContactAddress *
 getDefaultContactAddress( EContact *pContact,int *value )
 {
-    EContactAddress *ec = (EContactAddress *)e_contact_get(pContact,whichAddress(WORK_ADDR_LINE1));
+    EContactAddress *ec = static_cast<EContactAddress *>(e_contact_get(pContact,whichAddress(WORK_ADDR_LINE1)));
     if ( ec && (strlen(ec->street)>0) )
     {
         *value= *value +WORK_ADDR_LINE1 -1;
@@ -164,7 +164,7 @@ getDefaultContactAddress( EContact *pContact,int *value )
     }
     else
         {
-            ec = (EContactAddress *)e_contact_get(pContact,whichAddress(HOME_ADDR_LINE1));
+            ec = static_cast<EContactAddress *>(e_contact_get(pContact,whichAddress(HOME_ADDR_LINE1)));
             if ( ec && (strlen(ec->street)>0) )
             {
                 *value=*value+HOME_ADDR_LINE1-1;
@@ -173,7 +173,7 @@ getDefaultContactAddress( EContact *pContact,int *value )
         }
 
     *value=*value+OTHER_ADDR_LINE1-1;
-    return (EContactAddress *)e_contact_get(pContact,whichAddress(OTHER_ADDR_LINE1));
+    return static_cast<EContactAddress *>(e_contact_get(pContact,whichAddress(OTHER_ADDR_LINE1)));
 }
 
 static EContactAddress*
@@ -190,7 +190,7 @@ getContactAddress( EContact *pContact, int * address_enum )
         case DEFAULT_ZIP:
             ec = getDefaultContactAddress(pContact,address_enum);break;
            default:
-            ec = (EContactAddress *)e_contact_get(pContact,whichAddress(*address_enum));
+            ec = static_cast<EContactAddress *>(e_contact_get(pContact,whichAddress(*address_enum)));
     }
     return ec;
 }
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 21a9d900b9e5..3a783788f2ef 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -76,7 +76,7 @@ void OPreparedStatement::ensurePrepared()
 
     if (!m_pInSqlda)
     {
-        m_pInSqlda = (XSQLDA*) calloc(1, XSQLDA_LENGTH(10));
+        m_pInSqlda = static_cast<XSQLDA*>(calloc(1, XSQLDA_LENGTH(10)));
         m_pInSqlda->version = SQLDA_VERSION1;
         m_pInSqlda->sqln = 10;
     }
@@ -99,7 +99,7 @@ void OPreparedStatement::ensurePrepared()
     {
         short nItems = m_pInSqlda->sqld;
         free(m_pInSqlda);
-        m_pInSqlda = (XSQLDA*) calloc(1, XSQLDA_LENGTH(nItems));
+        m_pInSqlda = static_cast<XSQLDA*>(calloc(1, XSQLDA_LENGTH(nItems)));
         m_pInSqlda->version = SQLDA_VERSION1;
         m_pInSqlda->sqln = nItems;
         isc_dsql_describe_bind(m_statusVector,
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index 36780738b44a..9291b7bdf5b2 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -131,7 +131,7 @@ void OStatementCommonBase::prepareAndDescribeStatement(const OUString& sql,
 
     if (!pOutSqlda)
     {
-        pOutSqlda = (XSQLDA*) calloc(1, XSQLDA_LENGTH(10));
+        pOutSqlda = static_cast<XSQLDA*>(calloc(1, XSQLDA_LENGTH(10)));
         pOutSqlda->version = SQLDA_VERSION1;
         pOutSqlda->sqln = 10;
     }
@@ -185,7 +185,7 @@ void OStatementCommonBase::prepareAndDescribeStatement(const OUString& sql,
                 {
                     int n = pOutSqlda->sqld;
                     free(pOutSqlda);
-                    pOutSqlda = (XSQLDA*) calloc(1, XSQLDA_LENGTH(n));
+                    pOutSqlda = static_cast<XSQLDA*>(calloc(1, XSQLDA_LENGTH(n)));
                     pOutSqlda->version = SQLDA_VERSION1;
                     pOutSqlda->sqln = n;
                     aErr = isc_dsql_describe(m_statusVector,
diff --git a/connectivity/source/drivers/firebird/Util.cxx b/connectivity/source/drivers/firebird/Util.cxx
index 3e9e54356a04..c8f182d37924 100644
--- a/connectivity/source/drivers/firebird/Util.cxx
+++ b/connectivity/source/drivers/firebird/Util.cxx
@@ -205,43 +205,43 @@ void firebird::mallocSQLVAR(XSQLDA* pSqlda)
         int dtype = (pVar->sqltype & ~1); /* drop flag bit for now */
         switch(dtype) {
         case SQL_TEXT:
-            pVar->sqldata = (char *)malloc(sizeof(char)*pVar->sqllen);
+            pVar->sqldata = static_cast<char *>(malloc(sizeof(char)*pVar->sqllen));
             break;
         case SQL_VARYING:
-            pVar->sqldata = (char *)malloc(sizeof(char)*pVar->sqllen + 2);
+            pVar->sqldata = static_cast<char *>(malloc(sizeof(char)*pVar->sqllen + 2));
             break;
         case SQL_SHORT:
-            pVar->sqldata = (char*) malloc(sizeof(sal_Int16));
+            pVar->sqldata = static_cast<char*>(malloc(sizeof(sal_Int16)));
             break;
         case SQL_LONG:
-            pVar->sqldata = (char*) malloc(sizeof(sal_Int32));
+            pVar->sqldata = static_cast<char*>(malloc(sizeof(sal_Int32)));
             break;
         case SQL_FLOAT:
-            pVar->sqldata = (char *)malloc(sizeof(float));
+            pVar->sqldata = static_cast<char *>(malloc(sizeof(float)));
             break;
         case SQL_DOUBLE:
-            pVar->sqldata = (char *)malloc(sizeof(double));
+            pVar->sqldata = static_cast<char *>(malloc(sizeof(double)));
             break;
         case SQL_D_FLOAT:
-            pVar->sqldata = (char *)malloc(sizeof(double));
+            pVar->sqldata = static_cast<char *>(malloc(sizeof(double)));
             break;
         case SQL_TIMESTAMP:
-            pVar->sqldata = (char*) malloc(sizeof(ISC_TIMESTAMP));
+            pVar->sqldata = static_cast<char*>(malloc(sizeof(ISC_TIMESTAMP)));
             break;
         case SQL_BLOB:
-            pVar->sqldata = (char*) malloc(sizeof(ISC_QUAD));
+            pVar->sqldata = static_cast<char*>(malloc(sizeof(ISC_QUAD)));
             break;
         case SQL_ARRAY:
             assert(false); // TODO: implement
             break;
         case SQL_TYPE_TIME:
-            pVar->sqldata = (char*) malloc(sizeof(ISC_TIME));
+            pVar->sqldata = static_cast<char*>(malloc(sizeof(ISC_TIME)));
             break;
         case SQL_TYPE_DATE:
-            pVar->sqldata = (char*) malloc(sizeof(ISC_DATE));
+            pVar->sqldata = static_cast<char*>(malloc(sizeof(ISC_DATE)));
             break;
         case SQL_INT64:
-            pVar->sqldata = (char *)malloc(sizeof(sal_Int64));
+            pVar->sqldata = static_cast<char *>(malloc(sizeof(sal_Int64)));
             break;
         case SQL_NULL:
             assert(false); // TODO: implement
@@ -257,7 +257,7 @@ void firebird::mallocSQLVAR(XSQLDA* pSqlda)
         if (pVar->sqltype & 1)
         {
             /* allocate variable to hold NULL status */
-            pVar->sqlind = (short *)malloc(sizeof(short));
+            pVar->sqlind = static_cast<short *>(malloc(sizeof(short)));
         }
     }
 }
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 47ebd57033d7..e88a3aec9a96 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -344,7 +344,7 @@ void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_
         else
         {
             pData = allocBindBuf(parameterIndex, _sData.getLength() * 4);
-            sal_uInt32* pCursor = (sal_uInt32*)pData;
+            sal_uInt32* pCursor = static_cast<sal_uInt32*>(pData);
             nCharLen = 0;
             for (sal_Int32 i = 0; i != _sData.getLength();)
             {
diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx
index 308bdfa3202c..d7ea63e939a1 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -192,62 +192,62 @@ void OTools::bindValue( OConnection* _pConnection,
                 case SQL_CHAR:
                 case SQL_VARCHAR:
                 {
-                    OString aString(OUStringToOString(*(OUString*)_pValue,_nTextEncoding));
+                    OString aString(OUStringToOString(*static_cast<OUString const *>(_pValue),_nTextEncoding));
                     *pLen = SQL_NTS;
-                    *((OString*)_pData) = aString;
+                    *static_cast<OString*>(_pData) = aString;
                     _nMaxLen = (SQLSMALLINT)aString.getLength();
 
                     // Pointer on Char*
                     _pData = (void*)aString.getStr();
                 }   break;
                 case SQL_BIGINT:
-                    *((sal_Int64*)_pData) = *(sal_Int64*)_pValue;
+                    *static_cast<sal_Int64*>(_pData) = *static_cast<sal_Int64 const *>(_pValue);
                     *pLen = sizeof(sal_Int64);
                     break;
                 case SQL_DECIMAL:
                 case SQL_NUMERIC:
                 {
-                    OString aString = OString::number(*(double*)_pValue);
+                    OString aString = OString::number(*static_cast<double const *>(_pValue));
                     _nMaxLen = (SQLSMALLINT)aString.getLength();
                     *pLen = _nMaxLen;
-                    *((OString*)_pData) = aString;
+                    *static_cast<OString*>(_pData) = aString;
                     // Pointer on Char*
-                    _pData = (void*)((OString*)_pData)->getStr();
+                    _pData = (void*)static_cast<OString*>(_pData)->getStr();
                 }   break;
                 case SQL_BIT:
                 case SQL_TINYINT:
-                    *((sal_Int8*)_pData) = *(sal_Int8*)_pValue;
+                    *static_cast<sal_Int8*>(_pData) = *static_cast<sal_Int8 const *>(_pValue);
                     *pLen = sizeof(sal_Int8);
                     break;
 
                 case SQL_SMALLINT:
-                    *((sal_Int16*)_pData) = *(sal_Int16*)_pValue;
+                    *static_cast<sal_Int16*>(_pData) = *static_cast<sal_Int16 const *>(_pValue);
                     *pLen = sizeof(sal_Int16);
                     break;
                 case SQL_INTEGER:
-                    *((sal_Int32*)_pData) = *(sal_Int32*)_pValue;
+                    *static_cast<sal_Int32*>(_pData) = *static_cast<sal_Int32 const *>(_pValue);
                     *pLen = sizeof(sal_Int32);
                     break;
                 case SQL_FLOAT:
-                    *((float*)_pData) = *(float*)_pValue;
+                    *static_cast<float*>(_pData) = *static_cast<float const *>(_pValue);
                     *pLen = sizeof(float);
                     break;
                 case SQL_REAL:
                 case SQL_DOUBLE:
-                    *((double*)_pData) = *(double*)_pValue;
+                    *static_cast<double*>(_pData) = *static_cast<double const *>(_pValue);
                     *pLen = sizeof(double);
                     break;
                 case SQL_BINARY:
                 case SQL_VARBINARY:
                     {
-                        _pData = (void*)((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getConstArray();
-                        *pLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength();
+                        _pData = (void*)static_cast<const ::com::sun::star::uno::Sequence< sal_Int8 > *>(_pValue)->getConstArray();
+                        *pLen = static_cast<const ::com::sun::star::uno::Sequence< sal_Int8 > *>(_pValue)->getLength();
                     }   break;
                 case SQL_LONGVARBINARY:
                 {
                     _pData = reinterpret_cast<void*>(columnIndex);
                     sal_Int32 nLen = 0;
-                    nLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength();
+                    nLen = static_cast<const ::com::sun::star::uno::Sequence< sal_Int8 > *>(_pValue)->getLength();
                     *pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
                 }
                     break;
@@ -255,20 +255,20 @@ void OTools::bindValue( OConnection* _pConnection,
                 {
                     _pData = reinterpret_cast<void*>(columnIndex);
                     sal_Int32 nLen = 0;
-                    nLen = ((OUString*)_pValue)->getLength();
+                    nLen = static_cast<OUString const *>(_pValue)->getLength();
                     *pLen = (SQLLEN)SQL_LEN_DATA_AT_EXEC(nLen);
                 }   break;
                 case SQL_DATE:
                     *pLen = sizeof(DATE_STRUCT);
-                    *((DATE_STRUCT*)_pData) = *(DATE_STRUCT*)_pValue;
+                    *static_cast<DATE_STRUCT*>(_pData) = *static_cast<DATE_STRUCT const *>(_pValue);
                     break;
                 case SQL_TIME:
                     *pLen = sizeof(TIME_STRUCT);
-                    *((TIME_STRUCT*)_pData) = *(TIME_STRUCT*)_pValue;
+                    *static_cast<TIME_STRUCT*>(_pData) = *static_cast<TIME_STRUCT const *>(_pValue);
                     break;
                 case SQL_TIMESTAMP:
                     *pLen = sizeof(TIMESTAMP_STRUCT);
-                    *((TIMESTAMP_STRUCT*)_pData) = *(TIMESTAMP_STRUCT*)_pValue;
+                    *static_cast<TIMESTAMP_STRUCT*>(_pData) = *static_cast<TIMESTAMP_STRUCT const *>(_pValue);
                     break;
             }
         }
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 5f08e9d0afd8..bb9db8431df3 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -1168,54 +1168,54 @@ bool implSetObject(	const Reference< XParameters >& _rxParameters,
             break;
 
         case typelib_TypeClass_STRING:
-            _rxParameters->setString(_nColumnIndex, *(OUString*)_rValue.getValue());
+            _rxParameters->setString(_nColumnIndex, *static_cast<OUString const *>(_rValue.getValue()));
             break;
 
         case typelib_TypeClass_BOOLEAN:
-            _rxParameters->setBoolean(_nColumnIndex, *(sal_Bool *)_rValue.getValue());
+            _rxParameters->setBoolean(_nColumnIndex, *static_cast<sal_Bool const *>(_rValue.getValue()));
             break;
 
         case typelib_TypeClass_BYTE:
-            _rxParameters->setByte(_nColumnIndex, *(sal_Int8 *)_rValue.getValue());
+            _rxParameters->setByte(_nColumnIndex, *static_cast<sal_Int8 const *>(_rValue.getValue()));
             break;
 
         case typelib_TypeClass_UNSIGNED_SHORT:
         case typelib_TypeClass_SHORT:
-            _rxParameters->setShort(_nColumnIndex, *(sal_Int16*)_rValue.getValue());
+            _rxParameters->setShort(_nColumnIndex, *static_cast<sal_Int16 const *>(_rValue.getValue()));
             break;
 
         case typelib_TypeClass_CHAR:
-            _rxParameters->setString(_nColumnIndex, OUString((sal_Unicode *)_rValue.getValue(),1));
+            _rxParameters->setString(_nColumnIndex, OUString(static_cast<sal_Unicode const *>(_rValue.getValue()),1));
             break;
 
         case typelib_TypeClass_UNSIGNED_LONG:
         case typelib_TypeClass_LONG:
-            _rxParameters->setInt(_nColumnIndex, *(sal_Int32*)_rValue.getValue());
+            _rxParameters->setInt(_nColumnIndex, *static_cast<sal_Int32 const *>(_rValue.getValue()));
             break;
 
         case typelib_TypeClass_FLOAT:
-            _rxParameters->setFloat(_nColumnIndex, *(float*)_rValue.getValue());
+            _rxParameters->setFloat(_nColumnIndex, *static_cast<float const *>(_rValue.getValue()));
             break;
 
         case typelib_TypeClass_DOUBLE:
-            _rxParameters->setDouble(_nColumnIndex, *(double*)_rValue.getValue());
+            _rxParameters->setDouble(_nColumnIndex, *static_cast<double const *>(_rValue.getValue()));
             break;
 
         case typelib_TypeClass_SEQUENCE:
             if (_rValue.getValueType() == ::getCppuType((const Sequence< sal_Int8 > *)0))
             {
-                _rxParameters->setBytes(_nColumnIndex, *(Sequence<sal_Int8>*)_rValue.getValue());
+                _rxParameters->setBytes(_nColumnIndex, *static_cast<Sequence<sal_Int8> const *>(_rValue.getValue()));
             }
             else
                 bSuccessfullyReRouted = false;
             break;
         case typelib_TypeClass_STRUCT:
             if (_rValue.getValueType() == cppu::UnoType<com::sun::star::util::DateTime>::get())
-                _rxParameters->setTimestamp(_nColumnIndex, *(com::sun::star::util::DateTime*)_rValue.getValue());
+                _rxParameters->setTimestamp(_nColumnIndex, *static_cast<com::sun::star::util::DateTime const *>(_rValue.getValue()));
             else if (_rValue.getValueType() == cppu::UnoType<com::sun::star::util::Date>::get())
-                _rxParameters->setDate(_nColumnIndex, *(com::sun::star::util::Date*)_rValue.getValue());
+                _rxParameters->setDate(_nColumnIndex, *static_cast<com::sun::star::util::Date const *>(_rValue.getValue()));
             else if (_rValue.getValueType() == cppu::UnoType<com::sun::star::util::Time>::get())
-                _rxParameters->setTime(_nColumnIndex, *(com::sun::star::util::Time*)_rValue.getValue());
+                _rxParameters->setTime(_nColumnIndex, *static_cast<com::sun::star::util::Time const *>(_rValue.getValue()));
             else
                 bSuccessfullyReRouted = false;
             break;