mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up C-style casts from pointers to void

Browse Source 
Change-Id: Ibd269ae3147ce95f3f093e10ab736e8287e7098c
This commit is contained in:
Stephan Bergmann
2015-03-28 19:08:09 +01:00
parent 9826b9cf5b
commit c0de7e43b8
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ucb/source/sorter/sortresult.cxx
View File

@@ -1707,7 +1707,7 @@ void SortedResultSet::ResortModified( EventList* pList )
try { try {
for ( i=0; i<maModList.Count(); i++ ) for ( i=0; i<maModList.Count(); i++ )
{ {
pData = (SortListData*) maModList.GetObject( i ); pData = static_cast<SortListData*>(maModList.GetObject( i ));
nCompare = CompareImpl( mxOther, mxOriginal, nCompare = CompareImpl( mxOther, mxOriginal,
pData->mnOldPos, pData->mnCurPos ); pData->mnOldPos, pData->mnCurPos );
pData->mbModified = false; pData->mbModified = false;
@@ -1774,7 +1774,7 @@ void SortedResultSet::ResortNew( EventList* pList )
try { try {
for ( i = mnLastSort; i<(sal_IntPtr)maS2O.Count(); i++ ) for ( i = mnLastSort; i<(sal_IntPtr)maS2O.Count(); i++ )
{ {
SortListData *pData = (SortListData*) maModList.GetObject( i ); SortListData *pData = static_cast<SortListData*>(maModList.GetObject( i ));
nNewPos = FindPos( pData, 1, mnLastSort ); nNewPos = FindPos( pData, 1, mnLastSort );
if ( nNewPos != i ) if ( nNewPos != i )
{ {

6
ucb/source/ucp/ftp/ftpurl.cxx
View File

@@ -451,7 +451,7 @@ std::vector<FTPDirentry> FTPURL::list(
// now evaluate the error messages // now evaluate the error messages
sal_uInt32 len = data.m_nWritePos; sal_uInt32 len = data.m_nWritePos;
char* fwd = (char*) data.m_pBuffer; char* fwd = static_cast<char*>(data.m_pBuffer);
char *p1, *p2; char *p1, *p2;
p1 = p2 = fwd; p1 = p2 = fwd;
@@ -542,7 +542,7 @@ OUString FTPURL::net_title() const
err = curl_easy_perform(curl); err = curl_easy_perform(curl);
if(err == CURLE_OK) { // get the title from the server if(err == CURLE_OK) { // get the title from the server
char* fwd = (char*) control.m_pBuffer; char* fwd = static_cast<char*>(control.m_pBuffer);
sal_uInt32 len = (sal_uInt32) control.m_nWritePos; sal_uInt32 len = (sal_uInt32) control.m_nWritePos;
aNetTitle = OUString(fwd,len,RTL_TEXTENCODING_UTF8); aNetTitle = OUString(fwd,len,RTL_TEXTENCODING_UTF8);
@@ -632,7 +632,7 @@ extern "C" {
sal_Int32 nRequested = sal_Int32(size*nmemb); sal_Int32 nRequested = sal_Int32(size*nmemb);
CurlInput *curlInput = static_cast<CurlInput*>(stream); CurlInput *curlInput = static_cast<CurlInput*>(stream);
if(curlInput) if(curlInput)
return size_t(curlInput->read(((sal_Int8*)ptr),nRequested)); return size_t(curlInput->read(static_cast<sal_Int8*>(ptr),nRequested));
else else
return 0; return 0;
} }

2
ucb/source/ucp/gio/gio_content.cxx
View File

@@ -344,7 +344,7 @@ MountOperation::MountOperation(const uno::Reference< ucb::XCommandEnvironment >&
void MountOperation::Completed(GObject *source, GAsyncResult *res, gpointer user_data) void MountOperation::Completed(GObject *source, GAsyncResult *res, gpointer user_data)
{ {
MountOperation *pThis = (MountOperation*)user_data; MountOperation *pThis = static_cast<MountOperation*>(user_data);
g_file_mount_enclosing_volume_finish(G_FILE(source), res, &(pThis->mpError)); g_file_mount_enclosing_volume_finish(G_FILE(source), res, &(pThis->mpError));
g_main_loop_quit(pThis->mpLoop); g_main_loop_quit(pThis->mpLoop);
} }

2
ucb/source/ucp/gio/gio_mount.cxx
View File

@@ -176,7 +176,7 @@ static void ooo_mount_operation_ask_password (GMountOperation *op,
GMountOperation *ooo_mount_operation_new(const uno::Reference< ucb::XCommandEnvironment >& rEnv) GMountOperation *ooo_mount_operation_new(const uno::Reference< ucb::XCommandEnvironment >& rEnv)
{ {
OOoMountOperation *pRet = (OOoMountOperation*)g_object_new (OOO_TYPE_MOUNT_OPERATION, NULL); OOoMountOperation *pRet = static_cast<OOoMountOperation*>(g_object_new (OOO_TYPE_MOUNT_OPERATION, NULL));
pRet->pEnv = &rEnv; pRet->pEnv = &rEnv;
return &pRet->parent_instance; return &pRet->parent_instance;
} }