summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-03-31 13:16:26 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-03-31 13:16:26 +0200
commit749e5cdf3895526380ba0d24af0dd1c4bbdc9ea6 (patch)
tree638329880fab882168eab1a4257a0397be2b1c5c
parent64f6190d84055f4c19b024017079fea0dce999a4 (diff)
Reduce to static_cast any reinterpret_cast from void pointers
Change-Id: I872e6010b1068fe0f19f5f934c1124c7073160e1
-rw-r--r--sfx2/source/appl/newhelp.cxx28
-rw-r--r--sfx2/source/dialog/backingwindow.cxx2
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx14
-rw-r--r--sfx2/source/sidebar/Deck.cxx2
4 files changed, 23 insertions, 23 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index aee3adfd646b..fb1464b0f08f 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -471,7 +471,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeIndexBox(vcl::Window *
void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
{
- IndexEntry_Impl* pEntry = reinterpret_cast<IndexEntry_Impl*>(GetEntryData( rUDEvt.GetItemId() ));
+ IndexEntry_Impl* pEntry = static_cast<IndexEntry_Impl*>(GetEntryData( rUDEvt.GetItemId() ));
if ( pEntry && pEntry->m_bSubEntry )
{
// indent sub entries
@@ -510,11 +510,11 @@ void IndexBox_Impl::SelectExecutableEntry()
{
sal_Int32 nOldPos = nPos;
OUString aEntryText;
- IndexEntry_Impl* pEntry = reinterpret_cast<IndexEntry_Impl*>(GetEntryData( nPos ));
+ IndexEntry_Impl* pEntry = static_cast<IndexEntry_Impl*>(GetEntryData( nPos ));
sal_Int32 nCount = GetEntryCount();
while ( nPos < nCount && ( !pEntry || pEntry->m_aURL.isEmpty() ) )
{
- pEntry = reinterpret_cast<IndexEntry_Impl*>(GetEntryData( ++nPos ));
+ pEntry = static_cast<IndexEntry_Impl*>(GetEntryData( ++nPos ));
aEntryText = GetEntry( nPos );
}
@@ -697,7 +697,7 @@ void IndexTabPage_Impl::ClearIndex()
{
sal_uInt16 nCount = m_pIndexCB->GetEntryCount();
for ( sal_uInt16 i = 0; i < nCount; ++i )
- delete reinterpret_cast<IndexEntry_Impl*>(m_pIndexCB->GetEntryData(i));
+ delete static_cast<IndexEntry_Impl*>(m_pIndexCB->GetEntryData(i));
m_pIndexCB->Clear();
}
@@ -769,7 +769,7 @@ void IndexTabPage_Impl::SetFactory( const OUString& rFactory )
OUString IndexTabPage_Impl::GetSelectEntry() const
{
OUString aRet;
- IndexEntry_Impl* pEntry = reinterpret_cast<IndexEntry_Impl*>(m_pIndexCB->GetEntryData( m_pIndexCB->GetEntryPos( m_pIndexCB->GetText() ) ));
+ IndexEntry_Impl* pEntry = static_cast<IndexEntry_Impl*>(m_pIndexCB->GetEntryData( m_pIndexCB->GetEntryPos( m_pIndexCB->GetText() ) ));
if ( pEntry )
aRet = pEntry->m_aURL;
return aRet;
@@ -975,7 +975,7 @@ void SearchTabPage_Impl::ClearSearchResults()
{
sal_uInt16 nCount = m_pResultsLB->GetEntryCount();
for ( sal_uInt16 i = 0; i < nCount; ++i )
- delete reinterpret_cast<OUString*>(m_pResultsLB->GetEntryData(i));
+ delete static_cast<OUString*>(m_pResultsLB->GetEntryData(i));
m_pResultsLB->Clear();
m_pResultsLB->Update();
}
@@ -1071,7 +1071,7 @@ void SearchTabPage_Impl::SetDoubleClickHdl( const Link& rLink )
OUString SearchTabPage_Impl::GetSelectEntry() const
{
OUString aRet;
- OUString* pData = reinterpret_cast<OUString*>(m_pResultsLB->GetSelectEntryData());
+ OUString* pData = static_cast<OUString*>(m_pResultsLB->GetSelectEntryData());
if ( pData )
aRet = *pData;
return aRet;
@@ -1149,7 +1149,7 @@ BookmarksBox_Impl::~BookmarksBox_Impl()
for ( sal_uInt16 i = 0; i < nCount; ++i )
{
OUString aTitle = GetEntry(i);
- OUString* pURL = reinterpret_cast<OUString*>(GetEntryData(i));
+ OUString* pURL = static_cast<OUString*>(GetEntryData(i));
aHistOpt.AppendItem(eHELPBOOKMARKS, *pURL, sEmpty, aTitle, sEmpty, sEmpty);
delete pURL;
}
@@ -1174,7 +1174,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
aDlg.SetTitle( GetEntry( nPos ) );
if ( aDlg.Execute() == RET_OK )
{
- OUString* pURL = reinterpret_cast<OUString*>(GetEntryData( nPos ));
+ OUString* pURL = static_cast<OUString*>(GetEntryData( nPos ));
RemoveEntry( nPos );
OUString aImageURL = IMAGE_URL;
aImageURL += INetURLObject( *pURL ).GetHost();
@@ -1298,7 +1298,7 @@ void BookmarksTabPage_Impl::SetDoubleClickHdl( const Link& rLink )
OUString BookmarksTabPage_Impl::GetSelectEntry() const
{
OUString aRet;
- OUString* pData = reinterpret_cast<OUString*>(m_pBookmarksBox->GetSelectEntryData());
+ OUString* pData = static_cast<OUString*>(m_pBookmarksBox->GetSelectEntryData());
if ( pData )
aRet = *pData;
return aRet;
@@ -1424,7 +1424,7 @@ SfxHelpIndexWindow_Impl::~SfxHelpIndexWindow_Impl()
DELETEZ( pBPage );
for ( sal_uInt16 i = 0; i < m_pActiveLB->GetEntryCount(); ++i )
- delete reinterpret_cast<OUString*>(m_pActiveLB->GetEntryData(i));
+ delete static_cast<OUString*>(m_pActiveLB->GetEntryData(i));
SvtViewOptions aViewOpt( E_TABDIALOG, CONFIGNAME_INDEXWIN );
aViewOpt.SetPageID( (sal_Int32)m_pTabCtrl->GetCurPageId() );
@@ -1467,7 +1467,7 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory()
for ( sal_uInt16 i = 0; i < m_pActiveLB->GetEntryCount(); ++i )
{
- OUString* pFactory = reinterpret_cast<OUString*>(m_pActiveLB->GetEntryData(i));
+ OUString* pFactory = static_cast<OUString*>(m_pActiveLB->GetEntryData(i));
*pFactory = pFactory->toAsciiLowerCase();
if ( *pFactory == pIPage->GetFactory() )
{
@@ -1540,7 +1540,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, InitHdl)
IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl)
{
- OUString* pFactory = reinterpret_cast<OUString*>(m_pActiveLB->GetSelectEntryData());
+ OUString* pFactory = static_cast<OUString*>(m_pActiveLB->GetSelectEntryData());
if ( pFactory )
{
SetFactory( OUString( *pFactory ).toAsciiLowerCase(), false );
@@ -1723,7 +1723,7 @@ bool SfxHelpIndexWindow_Impl::IsValidFactory( const OUString& _rFactory )
bool bValid = false;
for ( sal_uInt16 i = 0; i < m_pActiveLB->GetEntryCount(); ++i )
{
- OUString* pFactory = reinterpret_cast<OUString*>(m_pActiveLB->GetEntryData(i));
+ OUString* pFactory = static_cast<OUString*>(m_pActiveLB->GetEntryData(i));
if ( *pFactory == _rFactory )
{
bValid = true;
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index e7162427aab6..a22285b0fbf7 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -673,7 +673,7 @@ struct ImplDelayedDispatch
static sal_IntPtr implDispatchDelayed( void*, void* pArg )
{
- struct ImplDelayedDispatch* pDispatch = reinterpret_cast<ImplDelayedDispatch*>(pArg);
+ struct ImplDelayedDispatch* pDispatch = static_cast<ImplDelayedDispatch*>(pArg);
try
{
pDispatch->xDispatch->dispatch( pDispatch->aDispatchURL, pDispatch->aArgs );
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index bcf9973acee9..ea60a11b51af 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1975,7 +1975,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
SvMemoryStream aMemStm( 1024, 1024 );
WriteTransferableObjectDescriptor( aMemStm, aDesc );
- aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Tell() );
+ aAny <<= Sequence< sal_Int8 >( static_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Tell() );
}
else
throw datatransfer::UnsupportedFlavorException();
@@ -2019,7 +2019,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
aMemStm.SetVersion( SOFFICE_FILEFORMAT_CURRENT );
xMetaFile->Write( aMemStm );
- aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aMemStm.GetData() ),
+ aAny <<= Sequence< sal_Int8 >( static_cast< const sal_Int8* >( aMemStm.GetData() ),
aMemStm.Seek( STREAM_SEEK_TO_END ) );
}
}
@@ -2039,7 +2039,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
aMemStm.SetVersion( SOFFICE_FILEFORMAT_CURRENT );
xMetaFile->Write( aMemStm );
- aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aMemStm.GetData() ),
+ aAny <<= Sequence< sal_Int8 >( static_cast< const sal_Int8* >( aMemStm.GetData() ),
aMemStm.Seek( STREAM_SEEK_TO_END ) );
}
}
@@ -2061,7 +2061,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
if (xStream)
{
xStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT );
- aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( xStream->GetData() ),
+ aAny <<= Sequence< sal_Int8 >( static_cast< const sal_Int8* >( xStream->GetData() ),
xStream->Seek( STREAM_SEEK_TO_END ) );
}
}
@@ -2097,7 +2097,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
if (xStream)
{
xStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT );
- aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( xStream->GetData() ),
+ aAny <<= Sequence< sal_Int8 >( static_cast< const sal_Int8* >( xStream->GetData() ),
xStream->Seek( STREAM_SEEK_TO_END ) );
}
}
@@ -2137,7 +2137,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
if (xStream)
{
xStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT );
- aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( xStream->GetData() ),
+ aAny <<= Sequence< sal_Int8 >( static_cast< const sal_Int8* >( xStream->GetData() ),
xStream->Seek( STREAM_SEEK_TO_END ) );
}
}
@@ -2161,7 +2161,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
if (xStream)
{
xStream->SetVersion( SOFFICE_FILEFORMAT_CURRENT );
- aAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( xStream->GetData() ),
+ aAny <<= Sequence< sal_Int8 >( static_cast< const sal_Int8* >( xStream->GetData() ),
xStream->Seek( STREAM_SEEK_TO_END ) );
}
}
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index ed4ad3cc285a..1013f9d7a39f 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -172,7 +172,7 @@ bool Deck::Notify (NotifyEvent& rEvent)
{
if (rEvent.GetType() == MouseNotifyEvent::COMMAND)
{
- CommandEvent* pCommandEvent = reinterpret_cast<CommandEvent*>(rEvent.GetData());
+ CommandEvent* pCommandEvent = static_cast<CommandEvent*>(rEvent.GetData());
if (pCommandEvent != NULL)
switch (pCommandEvent->GetCommand())
{