Kaydet (Commit) 64f6190d authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Reduce to static_cast any reinterpret_cast from void pointers

Change-Id: I0b1cbc96f85b6345b8abc843e5d609f9cc8a24b9
üst 6b97231b
...@@ -1081,7 +1081,7 @@ OUString HtmlExport::DocumentMetadata() const ...@@ -1081,7 +1081,7 @@ OUString HtmlExport::DocumentMetadata() const
" ", RTL_TEXTENCODING_UTF8, " ", RTL_TEXTENCODING_UTF8,
&aNonConvertableCharacters); &aNonConvertableCharacters);
OString aData(reinterpret_cast<const char*>(aStream.GetData()), aStream.GetSize()); OString aData(static_cast<const char*>(aStream.GetData()), aStream.GetSize());
return OStringToOUString(aData, RTL_TEXTENCODING_UTF8); return OStringToOUString(aData, RTL_TEXTENCODING_UTF8);
} }
......
...@@ -827,7 +827,7 @@ bool SdTransferable::SetTableRTF( SdDrawDocument* pModel, const DataFlavor& rFla ...@@ -827,7 +827,7 @@ bool SdTransferable::SetTableRTF( SdDrawDocument* pModel, const DataFlavor& rFla
{ {
SvMemoryStream aMemStm( 65535, 65535 ); SvMemoryStream aMemStm( 65535, 65535 );
sdr::table::SdrTableObj::ExportAsRTF( aMemStm, *pTableObj ); sdr::table::SdrTableObj::ExportAsRTF( aMemStm, *pTableObj );
return SetAny( Any( Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) ) ), rFlavor ); return SetAny( Any( Sequence< sal_Int8 >( static_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) ) ), rFlavor );
} }
} }
} }
......
...@@ -1226,7 +1226,7 @@ void SdPageObjsTLB::DoDrag() ...@@ -1226,7 +1226,7 @@ void SdPageObjsTLB::DoDrag()
SdrObject* pObject = NULL; SdrObject* pObject = NULL;
void* pUserData = GetCurEntry()->GetUserData(); void* pUserData = GetCurEntry()->GetUserData();
if (pUserData != NULL && pUserData != reinterpret_cast<void*>(1)) if (pUserData != NULL && pUserData != reinterpret_cast<void*>(1))
pObject = reinterpret_cast<SdrObject*>(pUserData); pObject = static_cast<SdrObject*>(pUserData);
if (pObject != NULL) if (pObject != NULL)
{ {
// For shapes without a user supplied name (the automatically // For shapes without a user supplied name (the automatically
...@@ -1413,8 +1413,8 @@ TriState SdPageObjsTLB::NotifyMoving( ...@@ -1413,8 +1413,8 @@ TriState SdPageObjsTLB::NotifyMoving(
while (GetParent(pDestination) != NULL && GetParent(GetParent(pDestination)) != NULL) while (GetParent(pDestination) != NULL && GetParent(GetParent(pDestination)) != NULL)
pDestination = GetParent(pDestination); pDestination = GetParent(pDestination);
SdrObject* pTargetObject = reinterpret_cast<SdrObject*>(pDestination->GetUserData()); SdrObject* pTargetObject = static_cast<SdrObject*>(pDestination->GetUserData());
SdrObject* pSourceObject = reinterpret_cast<SdrObject*>(pEntry->GetUserData()); SdrObject* pSourceObject = static_cast<SdrObject*>(pEntry->GetUserData());
if (pSourceObject == reinterpret_cast<SdrObject*>(1)) if (pSourceObject == reinterpret_cast<SdrObject*>(1))
pSourceObject = NULL; pSourceObject = NULL;
......
...@@ -465,7 +465,7 @@ MasterPagesSelector::UserData* MasterPagesSelector::GetUserData (int nIndex) con ...@@ -465,7 +465,7 @@ MasterPagesSelector::UserData* MasterPagesSelector::GetUserData (int nIndex) con
const ::osl::MutexGuard aGuard (maMutex); const ::osl::MutexGuard aGuard (maMutex);
if (nIndex>0 && static_cast<unsigned int>(nIndex)<=PreviewValueSet::GetItemCount()) if (nIndex>0 && static_cast<unsigned int>(nIndex)<=PreviewValueSet::GetItemCount())
return reinterpret_cast<UserData*>(PreviewValueSet::GetItemData((sal_uInt16)nIndex)); return static_cast<UserData*>(PreviewValueSet::GetItemData((sal_uInt16)nIndex));
else else
return NULL; return NULL;
} }
......
...@@ -907,7 +907,7 @@ sal_Int8 Clipboard::ExecuteOrAcceptShapeDrop ( ...@@ -907,7 +907,7 @@ sal_Int8 Clipboard::ExecuteOrAcceptShapeDrop (
{ {
case DC_ACCEPT: case DC_ACCEPT:
nResult = pDrawViewShell->AcceptDrop( nResult = pDrawViewShell->AcceptDrop(
*reinterpret_cast<const AcceptDropEvent*>(pDropEvent), *static_cast<const AcceptDropEvent*>(pDropEvent),
rTargetHelper, rTargetHelper,
pTargetWindow, pTargetWindow,
nPage, nPage,
...@@ -916,7 +916,7 @@ sal_Int8 Clipboard::ExecuteOrAcceptShapeDrop ( ...@@ -916,7 +916,7 @@ sal_Int8 Clipboard::ExecuteOrAcceptShapeDrop (
case DC_EXECUTE: case DC_EXECUTE:
nResult = pDrawViewShell->ExecuteDrop( nResult = pDrawViewShell->ExecuteDrop(
*reinterpret_cast<const ExecuteDropEvent*>(pDropEvent), *static_cast<const ExecuteDropEvent*>(pDropEvent),
rTargetHelper, rTargetHelper,
pTargetWindow, pTargetWindow,
nPage, nPage,
......
...@@ -71,7 +71,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sd_component_getFactory( ...@@ -71,7 +71,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sd_component_getFactory(
if( pServiceManager ) if( pServiceManager )
{ {
uno::Reference< lang::XMultiServiceFactory > xMSF( reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); uno::Reference< lang::XMultiServiceFactory > xMSF( static_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
uno::Reference<lang::XSingleServiceFactory> xFactory; uno::Reference<lang::XSingleServiceFactory> xFactory;
uno::Reference<lang::XSingleComponentFactory> xComponentFactory; uno::Reference<lang::XSingleComponentFactory> xComponentFactory;
......
...@@ -667,7 +667,7 @@ bool ViewShell::Notify(NotifyEvent& rNEvt, ::sd::Window* pWin) ...@@ -667,7 +667,7 @@ bool ViewShell::Notify(NotifyEvent& rNEvt, ::sd::Window* pWin)
if( rNEvt.GetType() == MouseNotifyEvent::COMMAND ) if( rNEvt.GetType() == MouseNotifyEvent::COMMAND )
{ {
// note: dynamic_cast is not possible as GetData() returns a void* // note: dynamic_cast is not possible as GetData() returns a void*
CommandEvent* pCmdEvent = reinterpret_cast< CommandEvent* >(rNEvt.GetData()); CommandEvent* pCmdEvent = static_cast< CommandEvent* >(rNEvt.GetData());
nRet = HandleScrollCommand(*pCmdEvent, pWin); nRet = HandleScrollCommand(*pCmdEvent, pWin);
} }
return nRet; return nRet;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment