summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-03-31 13:13:29 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-03-31 13:13:29 +0200
commitf42825fa8af2a2e0760ea6097fcc13ea889d087a (patch)
tree38a7780374bd7ecb219063d470fcf82c192e7946
parenta5a1cf96afec1803dbe41469ab8dc93292337c70 (diff)
Reduce to static_cast any reinterpret_cast from void pointers
Change-Id: I326330225be36118dffd3fe02141964736d62b9f
-rw-r--r--dbaccess/source/core/dataaccess/intercept.cxx2
-rw-r--r--dbaccess/source/ui/app/AppDetailView.cxx8
-rw-r--r--dbaccess/source/ui/browser/dbexchange.cxx2
-rw-r--r--dbaccess/source/ui/misc/ToolBoxHelper.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableRowExchange.cxx2
5 files changed, 8 insertions, 8 deletions
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index f4f305fa1f64..19d9273309a2 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -183,7 +183,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& _URL,const Sequence<PropertyVal
IMPL_LINK( OInterceptor, OnDispatch, void*, _pDispatcher )
{
- boost::scoped_ptr<DispatchHelper> pHelper( reinterpret_cast< DispatchHelper* >( _pDispatcher ) );
+ boost::scoped_ptr<DispatchHelper> pHelper( static_cast< DispatchHelper* >( _pDispatcher ) );
try
{
if ( m_pContentHolder && m_pContentHolder->prepareClose() && m_xSlaveDispatchProvider.is() )
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 9d15ea495e8f..256f0ed61905 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -297,7 +297,7 @@ void OCreationList::updateHelpText()
{
sal_uInt16 nHelpTextId = 0;
if ( GetCurEntry() )
- nHelpTextId = reinterpret_cast< TaskEntry* >( GetCurEntry()->GetUserData() )->nHelpID;
+ nHelpTextId = static_cast< TaskEntry* >( GetCurEntry()->GetUserData() )->nHelpID;
m_rTaskWindow.setHelpText( nHelpTextId );
}
@@ -305,7 +305,7 @@ void OCreationList::onSelected( SvTreeListEntry* _pEntry ) const
{
OSL_ENSURE( _pEntry, "OCreationList::onSelected: invalid entry!" );
URL aCommand;
- aCommand.Complete = reinterpret_cast< TaskEntry* >( _pEntry->GetUserData() )->sUNOCommand;
+ aCommand.Complete = static_cast< TaskEntry* >( _pEntry->GetUserData() )->sUNOCommand;
m_rTaskWindow.getDetailView()->getBorderWin().getView()->getAppController().executeChecked( aCommand, Sequence< PropertyValue >() );
}
@@ -431,7 +431,7 @@ IMPL_LINK(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, /*_pTreeBox*/)
{
SvTreeListEntry* pEntry = m_aCreation.GetHdlEntry();
if ( pEntry )
- m_aHelpText.SetText( ModuleRes( reinterpret_cast< TaskEntry* >( pEntry->GetUserData() )->nHelpID ) );
+ m_aHelpText.SetText( ModuleRes( static_cast< TaskEntry* >( pEntry->GetUserData() )->nHelpID ) );
return 1L;
}
@@ -512,7 +512,7 @@ void OTasksWindow::Clear()
SvTreeListEntry* pEntry = m_aCreation.First();
while ( pEntry )
{
- delete reinterpret_cast< TaskEntry* >( pEntry->GetUserData() );
+ delete static_cast< TaskEntry* >( pEntry->GetUserData() );
pEntry = m_aCreation.Next(pEntry);
}
m_aCreation.Clear();
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx
index 5df1f04e30c9..d92610986691 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -138,7 +138,7 @@ namespace dbaui
{
if (nUserObjectId == SotClipboardFormatId::RTF || nUserObjectId == SotClipboardFormatId::HTML )
{
- ODatabaseImportExport* pExport = reinterpret_cast<ODatabaseImportExport*>(pUserObject);
+ ODatabaseImportExport* pExport = static_cast<ODatabaseImportExport*>(pUserObject);
if ( pExport && rxOStm.Is() )
{
pExport->setStream(&rxOStm);
diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
index bb18fc04b0fc..ac5e461bd951 100644
--- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx
+++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx
@@ -80,7 +80,7 @@ namespace dbaui
{
if ( m_pToolBox && _pEvt && _pEvt->GetId() == VCLEVENT_APPLICATION_DATACHANGED )
{
- DataChangedEvent* pData = reinterpret_cast<DataChangedEvent*>(_pEvt->GetData());
+ DataChangedEvent* pData = static_cast<DataChangedEvent*>(_pEvt->GetData());
if ( pData && ((( pData->GetType() == DataChangedEventType::SETTINGS ) ||
( pData->GetType() == DataChangedEventType::DISPLAY )) &&
( pData->GetFlags() & AllSettingsFlags::STYLE )))
diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
index b6d036b13889..b1ce44b6f6b4 100644
--- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
@@ -34,7 +34,7 @@ namespace dbaui
{
if(nUserObjectId == SotClipboardFormatId::SBA_TABED)
{
- ::std::vector< ::boost::shared_ptr<OTableRow> >* pRows = reinterpret_cast< ::std::vector< ::boost::shared_ptr<OTableRow> >* >(pUserObject);
+ ::std::vector< ::boost::shared_ptr<OTableRow> >* pRows = static_cast< ::std::vector< ::boost::shared_ptr<OTableRow> >* >(pUserObject);
if(pRows)
{
(*rxOStm).WriteInt32( pRows->size() ); // first stream the size