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: Idb32372009faf2bc2e223f1f8977cb3fc6b182a3
This commit is contained in:
Stephan Bergmann
2015-03-28 19:00:39 +01:00
parent 02cad1c905
commit c30ad3771e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
desktop/source/app/officeipcthread.cxx
View File

@@ -291,15 +291,15 @@ public:
IMPL_STATIC_LINK_NOINSTANCE( ProcessEventsClass_Impl, CallEvent, void*, pEvent ) IMPL_STATIC_LINK_NOINSTANCE( ProcessEventsClass_Impl, CallEvent, void*, pEvent )
{ {
// Application events are processed by the Desktop::HandleAppEvent implementation. // Application events are processed by the Desktop::HandleAppEvent implementation.
Desktop::HandleAppEvent( *((ApplicationEvent*)pEvent) ); Desktop::HandleAppEvent( *static_cast<ApplicationEvent*>(pEvent) );
delete (ApplicationEvent*)pEvent; delete static_cast<ApplicationEvent*>(pEvent);
return 0; return 0;
} }
IMPL_STATIC_LINK_NOINSTANCE( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent ) IMPL_STATIC_LINK_NOINSTANCE( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent )
{ {
// Documents requests are processed by the OfficeIPCThread implementation // Documents requests are processed by the OfficeIPCThread implementation
ProcessDocumentsRequest* pDocsRequest = (ProcessDocumentsRequest*)pEvent; ProcessDocumentsRequest* pDocsRequest = static_cast<ProcessDocumentsRequest*>(pEvent);
if ( pDocsRequest ) if ( pDocsRequest )
{ {

4
desktop/source/lib/init.cxx
View File

@@ -540,7 +540,7 @@ static char* doc_getPartName(LibreOfficeKitDocument* pThis, int nPart)
OUString sName = pDoc->getPartName( nPart ); OUString sName = pDoc->getPartName( nPart );
OString aString = OUStringToOString(sName, RTL_TEXTENCODING_UTF8); OString aString = OUStringToOString(sName, RTL_TEXTENCODING_UTF8);
char* pMemory = (char*) malloc(aString.getLength() + 1); char* pMemory = static_cast<char*>(malloc(aString.getLength() + 1));
strcpy(pMemory, aString.getStr()); strcpy(pMemory, aString.getStr());
return pMemory; return pMemory;
@@ -768,7 +768,7 @@ static char* lo_getError (LibreOfficeKit *pThis)
{ {
LibLibreOffice_Impl* pLib = static_cast<LibLibreOffice_Impl*>(pThis); LibLibreOffice_Impl* pLib = static_cast<LibLibreOffice_Impl*>(pThis);
OString aString = OUStringToOString(pLib->maLastExceptionMsg, RTL_TEXTENCODING_UTF8); OString aString = OUStringToOString(pLib->maLastExceptionMsg, RTL_TEXTENCODING_UTF8);
char* pMemory = (char*) malloc(aString.getLength() + 1); char* pMemory = static_cast<char*>(malloc(aString.getLength() + 1));
strcpy(pMemory, aString.getStr()); strcpy(pMemory, aString.getStr());
return pMemory; return pMemory;
} }

2
desktop/source/offacc/acceptor.cxx
View File

@@ -40,7 +40,7 @@ extern "C" void offacc_workerfunc (void * acc)
{ {
osl_setThreadName("URP Acceptor"); osl_setThreadName("URP Acceptor");
((Acceptor*)acc)->run(); static_cast<Acceptor*>(acc)->run();
} }
Acceptor::Acceptor( const Reference< XComponentContext >& rxContext ) Acceptor::Acceptor( const Reference< XComponentContext >& rxContext )