diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-05-04 15:51:56 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-05-04 15:52:57 +0200 |
| commit | 135c63c8f9cc363c0895542b0f3bed48b61ea836 (patch) | |
| tree | 5afa3bcc304e246b38058c2ad7b0d1fd1e76a05f /framework/source/layoutmanager | |
| parent | c48fe716225b1b784d657685396b6cf5fee4fc3d (diff) | |
fdo#48253 Expand SAL_STATIC_CAST and SAL_CONST_CAST
Change-Id: I50f0887ceb4517d7ef234f970ca2ba679d533382
Diffstat (limited to 'framework/source/layoutmanager')
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 4 | ||||
| -rw-r--r-- | framework/source/layoutmanager/toolbarlayoutmanager.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 082d2422693a..993fb2fb56a6 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -788,7 +788,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( sal_Bool bSetVisible ) pMenuBar = (MenuBar *)pInplaceMenuBar->GetMenuBar(); else { - MenuBarWrapper* pMenuBarWrapper = SAL_STATIC_CAST( MenuBarWrapper*, xMenuBar.get() ); + MenuBarWrapper* pMenuBarWrapper = (static_cast< MenuBarWrapper* >(xMenuBar.get()) ); pMenuBar = (MenuBar *)pMenuBarWrapper->GetMenuBarManager()->GetMenuBar(); } @@ -1214,7 +1214,7 @@ throw (uno::RuntimeException) if ( m_xContainerWindow.is() ) { SolarMutexGuard aGuard; - MenuBarWrapper* pMenuBarWrapper = SAL_STATIC_CAST( MenuBarWrapper*, m_xMenuBar.get() ); + MenuBarWrapper* pMenuBarWrapper = (static_cast< MenuBarWrapper* >(m_xMenuBar.get()) ); SystemWindow* pSysWindow = getTopSystemWindow( m_xContainerWindow ); if ( pSysWindow ) { diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 0845c00bbd98..449610dc6a54 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -108,9 +108,9 @@ void SAL_CALL ToolbarLayoutManager::release() throw() uno::Any SAL_CALL ToolbarLayoutManager::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException ) { uno::Any a = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( awt::XDockableWindowListener*, this ), - SAL_STATIC_CAST( ui::XUIConfigurationListener*, this ), - SAL_STATIC_CAST( awt::XWindowListener*, this )); + (static_cast< awt::XDockableWindowListener* >(this)), + (static_cast< ui::XUIConfigurationListener* >(this)), + (static_cast< awt::XWindowListener* >(this))); if ( a.hasValue() ) return a; |