summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-29 13:55:54 +0200
committerNoel Grandin <noel@peralex.com>2014-10-01 13:08:42 +0200
commit787ca46d94cfcd6349f42954d6abbeed030a5398 (patch)
tree9e20a3d462c83b63a938966bf4613d00392dc20c /framework
parentf56a5b9029006c27532279da91366d34d26cde54 (diff)
loplugin: cstylecast
Change-Id: Idac41288539ff171e1c9fb0e12b172a311878ed6
Diffstat (limited to 'framework')
-rw-r--r--framework/source/classes/fwktabwindow.cxx2
-rw-r--r--framework/source/helper/persistentwindowstate.cxx6
-rw-r--r--framework/source/helper/titlebarupdate.cxx6
-rw-r--r--framework/source/inc/pattern/window.hxx6
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx36
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.cxx24
-rw-r--r--framework/source/services/autorecovery.cxx4
-rw-r--r--framework/source/services/frame.cxx8
-rw-r--r--framework/source/services/tabwindowservice.cxx10
9 files changed, 51 insertions, 51 deletions
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 54fde624f95f..9ce7abfd6cf9 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -56,7 +56,7 @@ FwkTabControl::FwkTabControl(vcl::Window* pParent)
void FwkTabControl::BroadcastEvent( sal_uLong nEvent )
{
if ( VCLEVENT_TABPAGE_ACTIVATE == nEvent || VCLEVENT_TABPAGE_DEACTIVATE == nEvent )
- ImplCallEventListeners( nEvent, (void*)(sal_uIntPtr)GetCurPageId() );
+ ImplCallEventListeners( nEvent, reinterpret_cast<void*>(GetCurPageId()) );
else
{
SAL_WARN( "fwk", "FwkTabControl::BroadcastEvent(): illegal event" );
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index 2c1d3038beb1..1599447eef8c 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -240,7 +240,7 @@ OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::
sal_uLong nMask = WINDOWSTATE_MASK_ALL;
nMask &= ~(WINDOWSTATE_MASK_MINIMIZED);
sWindowState = OStringToOUString(
- ((SystemWindow*)pWindow)->GetWindowState(nMask),
+ static_cast<SystemWindow*>(pWindow)->GetWindowState(nMask),
RTL_TEXTENCODING_UTF8);
}
// <- SOLAR SAFE ------------------------
@@ -272,8 +272,8 @@ void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Refere
if (!bSystemWindow && !bWorkWindow)
return;
- SystemWindow* pSystemWindow = (SystemWindow*)pWindow;
- WorkWindow* pWorkWindow = (WorkWindow* )pWindow;
+ SystemWindow* pSystemWindow = static_cast<SystemWindow*>(pWindow);
+ WorkWindow* pWorkWindow = static_cast<WorkWindow* >(pWindow);
// dont save this special state!
if (pWorkWindow->IsMinimized())
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index abd968674c08..762630911984 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -185,7 +185,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
( pWindow->GetType() == WINDOW_WORKWINDOW )
)
{
- WorkWindow* pWorkWindow = (WorkWindow*)pWindow;
+ WorkWindow* pWorkWindow = static_cast<WorkWindow*>(pWindow);
pWorkWindow->SetApplicationID( sApplicationID );
}
// <- VCL SYNCHRONIZED
@@ -302,7 +302,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra
( pWindow->GetType() == WINDOW_WORKWINDOW )
)
{
- WorkWindow* pWorkWindow = (WorkWindow*)pWindow;
+ WorkWindow* pWorkWindow = static_cast<WorkWindow*>(pWindow);
pWorkWindow->SetIcon( (sal_uInt16)nIcon );
css::uno::Reference< css::frame::XModel > xModel = xController->getModel();
@@ -336,7 +336,7 @@ void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFr
( pWindow->GetType() == WINDOW_WORKWINDOW )
)
{
- WorkWindow* pWorkWindow = (WorkWindow*)pWindow;
+ WorkWindow* pWorkWindow = static_cast<WorkWindow*>(pWindow);
pWorkWindow->SetText( sTitle );
}
// <- VCL SYNCHRONIZED
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index 43afe9d9f20a..7ff8d45dfaa7 100644
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/window.hxx
@@ -57,7 +57,7 @@ static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& x
{
sal_uLong nMask = WINDOWSTATE_MASK_ALL;
nMask &= ~(WINDOWSTATE_MASK_MINIMIZED);
- sWindowState = ((SystemWindow*)pWindow)->GetWindowState(nMask);
+ sWindowState = static_cast<SystemWindow*>(pWindow)->GetWindowState(nMask);
}
}
// <- SOLAR SAFE ----------------------------
@@ -85,11 +85,11 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind
(
// dont overwrite a might existing minimized mode!
(pWindow->GetType() != WINDOW_WORKWINDOW) ||
- (!((WorkWindow*)pWindow)->IsMinimized() )
+ (!static_cast<WorkWindow*>(pWindow)->IsMinimized() )
)
)
{
- ((SystemWindow*)pWindow)->SetWindowState(OUStringToOString(sWindowState,RTL_TEXTENCODING_UTF8));
+ static_cast<SystemWindow*>(pWindow)->SetWindowState(OUStringToOString(sWindowState,RTL_TEXTENCODING_UTF8));
}
// <- SOLAR SAFE ----------------------------
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index eb5891947eb7..af6cb6179231 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -172,7 +172,7 @@ void LayoutManager::impl_clearUpMenuBar()
{
MenuBar* pSetMenuBar = 0;
if ( m_xInplaceMenuBar.is() )
- pSetMenuBar = (MenuBar *)m_pInplaceMenuBar->GetMenuBar();
+ pSetMenuBar = static_cast<MenuBar *>(m_pInplaceMenuBar->GetMenuBar());
else
{
Reference< awt::XMenuBar > xMenuBar;
@@ -194,7 +194,7 @@ void LayoutManager::impl_clearUpMenuBar()
VCLXMenu* pAwtMenuBar = VCLXMenu::GetImplementation( xMenuBar );
if ( pAwtMenuBar )
- pSetMenuBar = (MenuBar*)pAwtMenuBar->GetMenu();
+ pSetMenuBar = static_cast<MenuBar*>(pAwtMenuBar->GetMenu());
}
MenuBar* pTopMenuBar = pSysWindow->GetMenuBar();
@@ -759,11 +759,11 @@ void LayoutManager::implts_updateUIElementsVisibleState( bool bSetVisible )
MenuBar* pMenuBar( 0 );
if ( xInplaceMenuBar.is() )
- pMenuBar = (MenuBar *)pInplaceMenuBar->GetMenuBar();
+ pMenuBar = static_cast<MenuBar *>(pInplaceMenuBar->GetMenuBar());
else
{
MenuBarWrapper* pMenuBarWrapper = (static_cast< MenuBarWrapper* >(xMenuBar.get()) );
- pMenuBar = (MenuBar *)pMenuBarWrapper->GetMenuBarManager()->GetMenuBar();
+ pMenuBar = static_cast<MenuBar *>(pMenuBarWrapper->GetMenuBarManager()->GetMenuBar());
}
SystemWindow* pSysWindow = getTopSystemWindow( xContainerWindow );
@@ -865,12 +865,12 @@ void LayoutManager::implts_createProgressBar()
xContainerWindow = m_xContainerWindow;
aWriteLock.clear();
- bool bRecycled = xProgressBarBackup.is();
+ bool bRecycled = xProgressBarBackup.is();
ProgressBarWrapper* pWrapper = 0;
if ( bRecycled )
- pWrapper = (ProgressBarWrapper*)xProgressBarBackup.get();
+ pWrapper = static_cast<ProgressBarWrapper*>(xProgressBarBackup.get());
else if ( xProgressBar.is() )
- pWrapper = (ProgressBarWrapper*)xProgressBar.get();
+ pWrapper = static_cast<ProgressBarWrapper*>(xProgressBar.get());
else
pWrapper = new ProgressBarWrapper();
@@ -925,7 +925,7 @@ void LayoutManager::implts_backupProgressBarWrapper()
// The internal used ProgressBarWrapper can handle a NULL reference.
if ( m_xProgressBarBackup.is() )
{
- ProgressBarWrapper* pWrapper = (ProgressBarWrapper*)m_xProgressBarBackup.get();
+ ProgressBarWrapper* pWrapper = static_cast<ProgressBarWrapper*>(m_xProgressBarBackup.get());
if ( pWrapper )
pWrapper->setStatusBar( Reference< awt::XWindow >(), false );
}
@@ -960,7 +960,7 @@ void LayoutManager::implts_setStatusBarPosSize( const ::Point& rPos, const ::Siz
xWindow = Reference< awt::XWindow >( xStatusBar->getRealInterface(), UNO_QUERY );
else if ( xProgressBar.is() )
{
- ProgressBarWrapper* pWrapper = (ProgressBarWrapper*)xProgressBar.get();
+ ProgressBarWrapper* pWrapper = static_cast<ProgressBarWrapper*>(xProgressBar.get());
if ( pWrapper )
xWindow = pWrapper->getStatusBar();
}
@@ -977,7 +977,7 @@ void LayoutManager::implts_setStatusBarPosSize( const ::Point& rPos, const ::Siz
vcl::Window* pOldParentWindow = pWindow->GetParent();
if ( pParentWindow != pOldParentWindow )
pWindow->SetParent( pParentWindow );
- ((StatusBar *)pWindow)->SetPosSizePixel( rPos, rSize );
+ static_cast<StatusBar *>(pWindow)->SetPosSizePixel( rPos, rSize );
}
}
}
@@ -1003,7 +1003,7 @@ bool LayoutManager::implts_showProgressBar()
}
else if ( xProgressBar.is() )
{
- ProgressBarWrapper* pWrapper = (ProgressBarWrapper*)xProgressBar.get();
+ ProgressBarWrapper* pWrapper = static_cast<ProgressBarWrapper*>(xProgressBar.get());
if ( pWrapper )
xWindow = pWrapper->getStatusBar();
}
@@ -1040,7 +1040,7 @@ bool LayoutManager::implts_hideProgressBar()
if ( xProgressBar.is() )
{
Reference< awt::XWindow > xStatusBar;
- ProgressBarWrapper* pWrapper = (ProgressBarWrapper*)xProgressBar.get();
+ ProgressBarWrapper* pWrapper = static_cast<ProgressBarWrapper*>(xProgressBar.get());
if ( pWrapper )
xWindow = pWrapper->getStatusBar();
Reference< ui::XUIElement > xStatusBarElement = m_aStatusBarElement.m_xUIElement;
@@ -1181,7 +1181,7 @@ throw (uno::RuntimeException)
if ( pSysWindow )
{
if ( pMenuBarWrapper )
- pSysWindow->SetMenuBar((MenuBar *)pMenuBarWrapper->GetMenuBarManager()->GetMenuBar(), m_xFrame);
+ pSysWindow->SetMenuBar(static_cast<MenuBar *>(pMenuBarWrapper->GetMenuBarManager()->GetMenuBar()), m_xFrame);
else
pSysWindow->SetMenuBar(0);
}
@@ -1486,7 +1486,7 @@ throw (RuntimeException, std::exception)
VCLXMenu* pAwtMenuBar = VCLXMenu::GetImplementation( xMenuBar );
if ( pAwtMenuBar )
{
- MenuBar* pMenuBar = (MenuBar*)pAwtMenuBar->GetMenu();
+ MenuBar* pMenuBar = static_cast<MenuBar*>(pAwtMenuBar->GetMenu());
if ( pMenuBar )
{
pSysWindow->SetMenuBar(pMenuBar, m_xFrame);
@@ -2475,7 +2475,7 @@ throw (uno::RuntimeException, std::exception)
xWindow = Reference< awt::XWindow >( xStatusBar->getRealInterface(), UNO_QUERY );
else if ( xProgressBar.is() && !xStatusBar.is() && bProgressBarVisible )
{
- ProgressBarWrapper* pWrapper = (ProgressBarWrapper*)xProgressBar.get();
+ ProgressBarWrapper* pWrapper = static_cast<ProgressBarWrapper*>(xProgressBar.get());
if ( pWrapper )
xWindow = pWrapper->getStatusBar();
}
@@ -2560,12 +2560,12 @@ bool LayoutManager::implts_resetMenuBar()
MenuBar* pSetMenuBar = 0;
if ( m_xInplaceMenuBar.is() )
- pSetMenuBar = (MenuBar *)m_pInplaceMenuBar->GetMenuBar();
+ pSetMenuBar = static_cast<MenuBar *>(m_pInplaceMenuBar->GetMenuBar());
else
{
MenuBarWrapper* pMenuBarWrapper = static_cast< MenuBarWrapper* >( m_xMenuBar.get() );
if ( pMenuBarWrapper )
- pSetMenuBar = (MenuBar *)pMenuBarWrapper->GetMenuBarManager()->GetMenuBar();
+ pSetMenuBar = static_cast<MenuBar*>(pMenuBarWrapper->GetMenuBarManager()->GetMenuBar());
}
aWriteLock.clear();
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -2634,7 +2634,7 @@ void LayoutManager::implts_notifyListeners( short nEvent, uno::Any aInfoParam )
{
try
{
- ((frame::XLayoutManagerListener*)pIterator.next())->layoutEvent( aSource, nEvent, aInfoParam );
+ static_cast<frame::XLayoutManagerListener*>(pIterator.next())->layoutEvent( aSource, nEvent, aInfoParam );
}
catch( const uno::RuntimeException& )
{
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index a41640004164..3ef8ec5699b1 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -536,7 +536,7 @@ bool ToolbarLayoutManager::createToolbar( const OUString& rResourceURL )
vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
{
- ToolBox* pToolbar = (ToolBox *)pWindow;
+ ToolBox* pToolbar = static_cast<ToolBox *>(pWindow);
sal_uInt16 nMenuType = pToolbar->GetMenuType();
if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, "ConfigureDialog" ))
pToolbar->SetMenuType( nMenuType & ~TOOLBOX_MENUTYPE_CUSTOMIZE );
@@ -825,7 +825,7 @@ bool ToolbarLayoutManager::dockToolbar( const OUString& rResourceURL, ui::Dockin
pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
{
- pToolBox = (ToolBox *)pWindow;
+ pToolBox = static_cast<ToolBox *>(pWindow);
// We have to set the alignment of the toolbox. It's possible that the toolbox is moved from a
// horizontal to a vertical docking area!
@@ -917,7 +917,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent )
{
OUString aToolbarName;
OUString aCommand;
- ToolBox* pToolBox = getToolboxPtr( ((VclWindowEvent*)pEvent)->GetWindow() );
+ ToolBox* pToolBox = getToolboxPtr( static_cast<VclWindowEvent*>(pEvent)->GetWindow() );
if ( pToolBox )
{
@@ -965,7 +965,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent )
{
if ( !implts_isToolbarCreationActive() )
{
- ToolBox* pToolBox = getToolboxPtr( ((VclWindowEvent*)pEvent)->GetWindow() );
+ ToolBox* pToolBox = getToolboxPtr( static_cast<VclWindowEvent*>(pEvent)->GetWindow() );
if ( pToolBox )
{
OUString aToolbarName = retrieveToolbarNameFromHelpURL( pToolBox );
@@ -1163,7 +1163,7 @@ void ToolbarLayoutManager::implts_createAddonsToolBars()
pWindow->SetText( aGenericAddonTitle );
if ( pWindow->GetType() == WINDOW_TOOLBOX )
{
- ToolBox* pToolbar = (ToolBox *)pWindow;
+ ToolBox* pToolbar = static_cast<ToolBox *>(pWindow);
pToolbar->SetMenuType();
}
}
@@ -1417,7 +1417,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno
if ( rElement.m_bNoClose )
pWindow->SetStyle( pWindow->GetStyle() & ~WB_CLOSEABLE );
if ( pWindow->GetType() == WINDOW_TOOLBOX )
- pToolBox = (ToolBox *)pWindow;
+ pToolBox = static_cast<ToolBox *>(pWindow);
}
if ( pToolBox )
{
@@ -2473,7 +2473,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn(
uno::Reference< awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i];
vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
- aMinSize = ((ToolBox *)pWindow)->CalcMinimumWindowSizePixel();
+ aMinSize = static_cast<ToolBox *>(pWindow)->CalcMinimumWindowSizePixel();
}
if (( aMinSize.Width() > 0 ) && ( aMinSize.Height() > 0 ))
@@ -2636,7 +2636,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize(
pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow );
pDockWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pDockWindow && pDockWindow->GetType() == WINDOW_TOOLBOX )
- pToolBox = (ToolBox *)pDockWindow;
+ pToolBox = static_cast<ToolBox *>(pDockWindow);
aDockingAreaRect = ::Rectangle( pDockingAreaWindow->GetPosPixel(), pDockingAreaWindow->GetSizePixel() );
if ( pToolBox )
@@ -3293,7 +3293,7 @@ throw (uno::RuntimeException, std::exception)
pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
{
- ToolBox* pToolBox = (ToolBox *)pWindow;
+ ToolBox* pToolBox = static_cast<ToolBox *>(pWindow);
aUIElement.m_aFloatingData.m_nLines = pToolBox->GetFloatingLines();
aUIElement.m_aFloatingData.m_bIsHorizontal = isToolboxHorizontalAligned( pToolBox );
}
@@ -3386,7 +3386,7 @@ throw (uno::RuntimeException, std::exception)
vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
ToolBox* pToolBox = 0;
if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
- pToolBox = (ToolBox *)pWindow;
+ pToolBox = static_cast<ToolBox *>(pWindow);
if ( eDockingArea != -1 )
{
@@ -3539,7 +3539,7 @@ throw (uno::RuntimeException, std::exception)
vcl::Window* pWindow = VCLUnoHelper::GetWindow( uno::Reference< awt::XWindow >( e.Source, uno::UNO_QUERY ));
ToolBox* pToolBox = 0;
if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
- pToolBox = (ToolBox *)pWindow;
+ pToolBox = static_cast<ToolBox *>(pWindow);
if ( pToolBox )
{
@@ -3640,7 +3640,7 @@ throw (uno::RuntimeException, std::exception)
pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
- pToolBox = (ToolBox *)pWindow;
+ pToolBox = static_cast<ToolBox *>(pWindow);
}
if ( !bDockingInProgress )
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 8c186c482fd4..9102d73e26fc 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -3561,7 +3561,7 @@ void AutoRecovery::implts_informListener( sal_Int32 eJ
{
// Helper shares mutex with us -> threadsafe!
::cppu::OInterfaceContainerHelper* pListenerForURL = 0;
- OUString sJob = AutoRecovery::implst_getJobDescription(eJob);
+ OUString sJob = AutoRecovery::implst_getJobDescription(eJob);
// inform listener, which are registered for any URLs(!)
pListenerForURL = m_lListener.getContainer(sJob);
@@ -3572,7 +3572,7 @@ void AutoRecovery::implts_informListener( sal_Int32 eJ
{
try
{
- css::uno::Reference< css::frame::XStatusListener > xListener(((css::frame::XStatusListener*)pIt.next()), css::uno::UNO_QUERY);
+ css::uno::Reference< css::frame::XStatusListener > xListener(static_cast<css::frame::XStatusListener*>(pIt.next()), css::uno::UNO_QUERY);
xListener->statusChanged(aEvent);
}
catch(const css::uno::RuntimeException&)
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 144368b54b79..1ac2e80ad111 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -1758,7 +1758,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close
{
try
{
- ((css::util::XCloseListener*)pIterator.next())->queryClosing( aSource, bDeliverOwnership );
+ static_cast<css::util::XCloseListener*>(pIterator.next())->queryClosing( aSource, bDeliverOwnership );
}
catch( const css::uno::RuntimeException& )
{
@@ -1792,7 +1792,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close
{
try
{
- ((css::util::XCloseListener*)pIterator.next())->notifyClosing( aSource );
+ static_cast<css::util::XCloseListener*>(pIterator.next())->notifyClosing( aSource );
}
catch( const css::uno::RuntimeException& )
{
@@ -2857,7 +2857,7 @@ void Frame::implts_sendFrameActionEvent( const css::frame::FrameAction& aAction
{
try
{
- ((css::frame::XFrameActionListener*)aIterator.next())->frameAction( aFrameActionEvent );
+ static_cast<css::frame::XFrameActionListener*>(aIterator.next())->frameAction( aFrameActionEvent );
}
catch( const css::uno::RuntimeException& )
{
@@ -2975,7 +2975,7 @@ void Frame::implts_setIconOnWindow()
( pWindow->GetType() == WINDOW_WORKWINDOW )
)
{
- WorkWindow* pWorkWindow = (WorkWindow*)pWindow;
+ WorkWindow* pWorkWindow = static_cast<WorkWindow*>(pWindow);
pWorkWindow->SetIcon( (sal_uInt16)nIcon );
}
}
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index b7d7b1b5849b..5f761a487f0e 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -452,24 +452,24 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent )
{
try
{
- css::awt::XTabListener* pListener = (css::awt::XTabListener*)pIterator.next();
+ css::awt::XTabListener* pListener = static_cast<css::awt::XTabListener*>(pIterator.next());
switch (nEventId)
{
case VCLEVENT_TABPAGE_ACTIVATE :
- pListener->activated( (sal_Int32)(sal_uLong)pWinEvt->GetData() );
+ pListener->activated( (sal_Int32)reinterpret_cast<sal_uLong>(pWinEvt->GetData()) );
break;
case VCLEVENT_TABPAGE_DEACTIVATE :
- pListener->deactivated( (sal_Int32)(sal_uLong)pWinEvt->GetData() );
+ pListener->deactivated( (sal_Int32)reinterpret_cast<sal_uLong>(pWinEvt->GetData()) );
break;
case VCLEVENT_TABPAGE_INSERTED :
- pListener->inserted( (sal_Int32)(sal_uLong)pWinEvt->GetData() );
+ pListener->inserted( (sal_Int32)reinterpret_cast<sal_uLong>(pWinEvt->GetData()) );
break;
case VCLEVENT_TABPAGE_REMOVED :
- pListener->removed( (sal_Int32)(sal_uLong)pWinEvt->GetData() );
+ pListener->removed( (sal_Int32)reinterpret_cast<sal_uLong>(pWinEvt->GetData()) );
break;
case VCLEVENT_TABPAGE_PAGETEXTCHANGED :