diff options
105 files changed, 485 insertions, 500 deletions
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx index 71911a9868cb..02f33d897740 100644 --- a/UnoControls/source/controls/framecontrol.cxx +++ b/UnoControls/source/controls/framecontrol.cxx @@ -71,7 +71,7 @@ namespace unocontrols{ FrameControl::FrameControl( const Reference< XMultiServiceFactory >& xFactory ) : BaseControl ( xFactory ) , OBroadcastHelper ( m_aMutex ) - , OPropertySetHelper ( *SAL_STATIC_CAST( OBroadcastHelper *, this ) ) + , OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this)) ) , m_aInterfaceContainer ( m_aMutex ) , m_aConnectionPointContainer ( m_aMutex ) { diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index e85b80642d7c..e1de9744ff11 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -520,7 +520,7 @@ AnimationNode::~AnimationNode() #define IMPL_NODE_FACTORY(N,IN,SN)\ Reference< XInterface > SAL_CALL createInstance_##N( const Reference< XComponentContext > & ) throw (Exception)\ {\ - return Reference < XInterface > ( SAL_STATIC_CAST( ::cppu::OWeakObject * , new AnimationNode( N ) ) );\ + return Reference < XInterface > ( (static_cast< ::cppu::OWeakObject * >(new AnimationNode( N )) ) );\ }\ OUString getImplementationName_##N()\ {\ diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx index 0883936fb857..914ca82b3c84 100644 --- a/bridges/test/testcomp.cxx +++ b/bridges/test/testcomp.cxx @@ -92,7 +92,7 @@ void parseCommandLine( char *argv[] , Any OInstanceProvider::queryInterface( const Type & aType ) throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XInstanceProvider * , this ) ); + (static_cast< XInstanceProvider * >(this)) ); if( a.hasValue() ) { return a; @@ -292,7 +292,7 @@ Sequence< OUString > ServiceImpl::getSupportedServiceNames() Any OCallMe::queryInterface( const Type & aType ) throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XCallMe * , this ) ); + (static_cast< XCallMe * >(this)) ); if( a.hasValue() ) { @@ -386,7 +386,7 @@ void OCallMe::callAgain( const Reference< ::test::XCallMe >& callAgainArg, Any OInterfaceTest::queryInterface( const Type & aType ) throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XInterfaceTest * , this ) ); + (static_cast< XInterfaceTest * >(this)) ); if( a.hasValue() ) { return a; @@ -438,7 +438,7 @@ void OInterfaceTest::call() Any OTestFactory::queryInterface( const Type & aType ) throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XTestFactory * , this ) ); + (static_cast< XTestFactory * >(this)) ); if( a.hasValue() ) { diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index f1ce426ec64a..082341941cb0 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -254,7 +254,7 @@ Any OPropertySetHelper2::queryInterface( const ::com::sun::star::uno::Type & rTy void OPropertySetHelper::disposing() SAL_THROW(()) { // Create an event with this as sender - Reference < XPropertySet > rSource( SAL_STATIC_CAST( XPropertySet * , this ) , UNO_QUERY ); + Reference < XPropertySet > rSource( (static_cast< XPropertySet * >(this)) , UNO_QUERY ); EventObject aEvt; aEvt.Source = rSource; diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx index 858668fbb67b..2c3cc5a7e22a 100644 --- a/cppuhelper/test/testpropshlp.cxx +++ b/cppuhelper/test/testpropshlp.cxx @@ -325,11 +325,11 @@ public: test_OPropertySetHelper( Property * p, sal_Int32 n ) : MutexContainer() , OBroadcastHelper( ((MutexContainer *)this)->aMutex ) -// , OPropertySetHelper( *SAL_STATIC_CAST(OBroadcastHelper *,this)) +// , OPropertySetHelper( *(static_cast< OBroadcastHelper * >(this))) // MSCI 4 bug ! : // OBroadcastHelper == OBroadcastHelperVar<OMultiTypeInterfaceContainerHelper> , OPropertySetHelper( - *SAL_STATIC_CAST(OBroadcastHelper *,this)) + *(static_cast< OBroadcastHelper * >(this))) , bBOOL( sal_False ) , nINT16( 0 ) , nINT32( 0 ) @@ -359,7 +359,7 @@ public: { disposing(); EventObject aEvt; - aEvt.Source = Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * ,this) ); + aEvt.Source = Reference < XInterface > ( (static_cast< OWeakObject * >(this)) ); rBHelper.aLC.disposeAndClear( aEvt ); rBHelper.bDisposed = sal_True; diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 2556df1da48a..41c9f59a419d 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -28,7 +28,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <tools/stream.hxx> // header for SvStream -#include <sal/types.h> // header for SAL_STATIC_CAST #include "cfgchart.hxx" #include <dialmgr.hxx> #include <cuires.hrc> @@ -242,7 +241,7 @@ sal_Bool SvxChartOptions::RetrieveOptions() // set color values for( sal_Int32 i=0; i < nCount; i++ ) { - aCol.SetColor( SAL_STATIC_CAST( ColorData, aColorSeq[ i ] )); + aCol.SetColor( (static_cast< ColorData >(aColorSeq[ i ] ))); aName = aPrefix; aName.Append( String::CreateFromInt32( i + 1 )); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index da24c88a08e7..e188ca08e7d7 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -86,7 +86,7 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage( Window* pParent, const SfxItemSe const SfxPoolItem* pItem = NULL; if ( rInAttrs.GetItemState( SID_SCH_EDITOPTIONS, sal_False, &pItem ) == SFX_ITEM_SET ) { - pColorConfig = SAL_STATIC_CAST( SvxChartColorTableItem*, pItem->Clone() ); + pColorConfig = (static_cast< SvxChartColorTableItem* >(pItem->Clone()) ); } else { @@ -129,7 +129,7 @@ SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet& r sal_Bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs ) { if( pColorConfig ) - rOutAttrs.Put( *SAL_STATIC_CAST( SfxPoolItem*, pColorConfig )); + rOutAttrs.Put( *(static_cast< SfxPoolItem* >(pColorConfig))); return sal_True; } diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx index a290f8b4961b..0d5025477b2a 100644 --- a/editeng/source/editeng/eeobj.cxx +++ b/editeng/source/editeng/eeobj.cxx @@ -51,7 +51,7 @@ EditDataObject::~EditDataObject() // uno::XInterface uno::Any EditDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) { - uno::Any aRet = ::cppu::queryInterface( rType, SAL_STATIC_CAST( datatransfer::XTransferable*, this ) ); + uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< datatransfer::XTransferable* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } diff --git a/extensions/workben/testpgp.cxx b/extensions/workben/testpgp.cxx index bae34b1b425a..e6499dd0c2f1 100644 --- a/extensions/workben/testpgp.cxx +++ b/extensions/workben/testpgp.cxx @@ -246,7 +246,7 @@ sal_Bool SAL_CALL DataSource_Impl::queryInterface ( { if (com::sun::star::uno::queryInterface ( rUik, rIfc, - SAL_STATIC_CAST (XInputStream*, this))) + (static_cast< XInputStream* >(this)))) return sal_True; else return OWeakObject::queryInterface (rUik, rIfc); @@ -357,7 +357,7 @@ sal_Bool SAL_CALL DataSink_Impl::queryInterface ( { if (com::sun::star::uno::queryInterface ( rUik, rIfc, - SAL_STATIC_CAST (XOutputStream*, this))) + (static_cast< XOutputStream* >(this)))) return sal_True; else return OWeakObject::queryInterface (rUik, rIfc); @@ -456,8 +456,8 @@ sal_Bool SAL_CALL DecoderListener_Impl::queryInterface ( { if (com::sun::star::uno::queryInterface ( rUik, rIfc, - SAL_STATIC_CAST (XEventListener*, this), - SAL_STATIC_CAST (XPGPDecoderListener*, this))) + (static_cast< XEventListener* >(this)), + (static_cast< XPGPDecoderListener* >(this)))) return sal_True; else return OWeakObject::queryInterface (rUik, rIfc); diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 674dbec55590..be2843044899 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -210,8 +210,8 @@ ImageProducer::~ImageProducer() ::com::sun::star::uno::Any ImageProducer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::lang::XInitialization*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XImageProducer*, this ) ); + (static_cast< ::com::sun::star::lang::XInitialization* >(this)), + (static_cast< ::com::sun::star::awt::XImageProducer* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index f1e10511cfc4..8319bec42913 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -313,7 +313,7 @@ MenuManager::~MenuManager() MenuItemHandler* pItemHandler = *p; pItemHandler->xMenuItemDispatch.clear(); if ( pItemHandler->pSubMenuManager ) - SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)pItemHandler->pSubMenuManager )->release(); + (static_cast< ::com::sun::star::uno::XInterface* >((OWeakObject*)pItemHandler->pSubMenuManager))->release(); delete pItemHandler; } @@ -394,7 +394,7 @@ throw ( RuntimeException ) { pStatusChangedMenu->xMenuItemDispatch = xMenuItemDispatch; pStatusChangedMenu->aMenuItemURL = aTargetURL.Complete; - xMenuItemDispatch->addStatusListener( SAL_STATIC_CAST( XSTATUSLISTENER*, this ), aTargetURL ); + xMenuItemDispatch->addStatusListener( (static_cast< XSTATUSLISTENER* >(this)), aTargetURL ); } } } @@ -423,7 +423,7 @@ void MenuManager::ClearMenuDispatch(const EVENTOBJECT& Source,bool _bRemoveOnly) m_xURLTransformer->parseStrict( aTargetURL ); pItemHandler->xMenuItemDispatch->removeStatusListener( - SAL_STATIC_CAST( XSTATUSLISTENER*, this ), aTargetURL ); + (static_cast< XSTATUSLISTENER* >(this)), aTargetURL ); } pItemHandler->xMenuItemDispatch.clear(); @@ -471,7 +471,7 @@ void SAL_CALL MenuManager::disposing( const EVENTOBJECT& Source ) throw ( RUNTIM m_xURLTransformer->parseStrict( aTargetURL ); - pMenuItemDisposing->xMenuItemDispatch->removeStatusListener(SAL_STATIC_CAST( XSTATUSLISTENER*, this ), aTargetURL ); + pMenuItemDisposing->xMenuItemDispatch->removeStatusListener((static_cast< XSTATUSLISTENER* >(this)), aTargetURL ); pMenuItemDisposing->xMenuItemDispatch.clear(); } } @@ -847,7 +847,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) { pMenuItemHandler->xMenuItemDispatch = xMenuItemDispatch; pMenuItemHandler->aMenuItemURL = aTargetURL.Complete; - xMenuItemDispatch->addStatusListener( SAL_STATIC_CAST( XSTATUSLISTENER*, this ), aTargetURL ); + xMenuItemDispatch->addStatusListener( (static_cast< XSTATUSLISTENER* >(this)), aTargetURL ); } else pMenu->EnableItem( pMenuItemHandler->nItemId, sal_False ); diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 969d68ff26a5..7a46065d6a18 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -320,7 +320,7 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR // remove listener before we destruct ourself, so we cannot be called back afterwards m_pMenuManager->RemoveListener(); - SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)m_pMenuManager )->release(); + (static_cast< ::com::sun::star::uno::XInterface* >((OWeakObject*)m_pMenuManager))->release(); m_pMenuManager = 0; } diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx index 2243973a70e1..b3b5e12aea5b 100644 --- a/framework/source/fwe/classes/actiontriggercontainer.cxx +++ b/framework/source/fwe/classes/actiontriggercontainer.cxx @@ -56,8 +56,8 @@ throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XMultiServiceFactory*, this ), - SAL_STATIC_CAST( XServiceInfo* , this )); + (static_cast< XMultiServiceFactory* >(this)), + (static_cast< XServiceInfo* >(this))); if( a.hasValue() ) { diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index 51a8671d367b..3aee88fe4f8e 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -63,7 +63,7 @@ namespace framework ActionTriggerPropertySet::ActionTriggerPropertySet( const Reference< XMultiServiceFactory >& /*xServiceManager*/ ) : ThreadHelpBase ( &Application::GetSolarMutex() ) , OBroadcastHelper ( m_aLock.getShareableOslMutex() ) - , OPropertySetHelper ( *SAL_STATIC_CAST( OBroadcastHelper *, this )) + , OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this))) , OWeakObject () , m_xBitmap ( 0 ) , m_xActionTriggerContainer( 0 ) @@ -80,7 +80,7 @@ throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XServiceInfo*, this )); + (static_cast< XServiceInfo* >(this))); if( a.hasValue() ) return a; diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx index d188cea265a7..ad5fc30638c2 100644 --- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx @@ -57,7 +57,7 @@ namespace framework ActionTriggerSeparatorPropertySet::ActionTriggerSeparatorPropertySet( const Reference< XMultiServiceFactory >& /*ServiceManager*/ ) : ThreadHelpBase ( &Application::GetSolarMutex() ) , OBroadcastHelper ( m_aLock.getShareableOslMutex() ) - , OPropertySetHelper ( *SAL_STATIC_CAST( OBroadcastHelper *, this ) ) + , OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this)) ) , OWeakObject ( ) , m_nSeparatorType( 0 ) { @@ -73,7 +73,7 @@ throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XServiceInfo*, this )); + (static_cast< XServiceInfo* >(this))); if( a.hasValue() ) return a; diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index cfc87091c9ee..0e6348beeeea 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -76,11 +76,11 @@ throw ( RuntimeException ) { Any a = ::cppu::queryInterface( aType , - SAL_STATIC_CAST( XMultiServiceFactory* , this ), - SAL_STATIC_CAST( XServiceInfo* , this ), - SAL_STATIC_CAST( XUnoTunnel* , this ), - SAL_STATIC_CAST( XTypeProvider* , this ), - SAL_STATIC_CAST( XNamed* , this )); + (static_cast< XMultiServiceFactory* >(this)), + (static_cast< XServiceInfo* >(this)), + (static_cast< XUnoTunnel* >(this)), + (static_cast< XTypeProvider* >(this)), + (static_cast< XNamed* >(this))); if( a.hasValue() ) { diff --git a/framework/source/fwe/helper/propertysetcontainer.cxx b/framework/source/fwe/helper/propertysetcontainer.cxx index 86872b2310cb..b61e2a545a8e 100644 --- a/framework/source/fwe/helper/propertysetcontainer.cxx +++ b/framework/source/fwe/helper/propertysetcontainer.cxx @@ -72,10 +72,10 @@ throw ( RuntimeException ) { Any a = ::cppu::queryInterface( rType , - SAL_STATIC_CAST( XIndexContainer*, this ), - SAL_STATIC_CAST( XIndexReplace*, this ), - SAL_STATIC_CAST( XIndexAccess*, this ), - SAL_STATIC_CAST( XElementAccess*, this ) ); + (static_cast< XIndexContainer* >(this)), + (static_cast< XIndexReplace* >(this)), + (static_cast< XIndexAccess* >(this)), + (static_cast< XElementAccess* >(this)) ); if( a.hasValue() ) { 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; diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 53a4483bc8f6..b356448844ee 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -409,8 +409,8 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star:: Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); if ( xDispatch.is() ) { - xDispatch->addStatusListener( SAL_STATIC_CAST( XStatusListener*, this ), aTargetURL ); - xDispatch->removeStatusListener( SAL_STATIC_CAST( XStatusListener*, this ), aTargetURL ); + xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL ); + xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL ); m_aURLToDispatchMap.insert( UrlToDispatchMap::value_type( aTargetURL.Complete, xDispatch )); } } diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index a31b9f91c853..1c437f8ea75d 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -240,8 +240,8 @@ void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::un if ( xDispatch.is() ) { - xDispatch->addStatusListener( SAL_STATIC_CAST( XStatusListener*, this ), aTargetURL ); - xDispatch->removeStatusListener( SAL_STATIC_CAST( XStatusListener*, this ), aTargetURL ); + xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL ); + xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL ); } } diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 3016cffe89c8..dc60f115b232 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -341,8 +341,8 @@ void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star if ( xDispatch.is() ) { - xDispatch->addStatusListener( SAL_STATIC_CAST( XStatusListener*, this ), aTargetURL ); - xDispatch->removeStatusListener( SAL_STATIC_CAST( XStatusListener*, this ), aTargetURL ); + xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL ); + xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL ); } svt::PopupMenuControllerBase::updatePopupMenu(); diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 2a9e54f99878..f0917fb8e9da 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -320,8 +320,8 @@ void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com:: if ( xDispatch.is() ) { - xDispatch->addStatusListener( SAL_STATIC_CAST( XStatusListener*, this ), aTargetURL ); - xDispatch->removeStatusListener( SAL_STATIC_CAST( XStatusListener*, this ), aTargetURL ); + xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL ); + xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL ); } // TODO: Fill menu with the information retrieved by the status update diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index f1075e9611fe..0a3922d44d5d 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -262,12 +262,12 @@ Any SAL_CALL MenuBarManager::queryInterface( const Type & rType ) throw ( Runtim { Any a = ::cppu::queryInterface( rType , - SAL_STATIC_CAST( ::com::sun::star::frame::XStatusListener*, this ), - SAL_STATIC_CAST( ::com::sun::star::frame::XFrameActionListener*, this ), - SAL_STATIC_CAST( ::com::sun::star::ui::XUIConfigurationListener*, this ), - SAL_STATIC_CAST( XEventListener*, (XStatusListener *)this ), - SAL_STATIC_CAST( XComponent*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XSystemDependentMenuPeer*, this )); + (static_cast< ::com::sun::star::frame::XStatusListener* >(this)), + (static_cast< ::com::sun::star::frame::XFrameActionListener* >(this)), + (static_cast< ::com::sun::star::ui::XUIConfigurationListener* >(this)), + (static_cast< XEventListener* >((XStatusListener *)this)), + (static_cast< XComponent* >(this)), + (static_cast< ::com::sun::star::awt::XSystemDependentMenuPeer* >(this))); if ( a.hasValue() ) return a; diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index d500be371fc4..ca442fb1bb14 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -797,8 +797,8 @@ void SAL_CALL ToolbarsMenuController::activate( const css::awt::MenuEvent& ) thr Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); if ( xDispatch.is() ) { - xDispatch->addStatusListener( SAL_STATIC_CAST( XStatusListener*, this ), aTargetURL ); - xDispatch->removeStatusListener( SAL_STATIC_CAST( XStatusListener*, this ), aTargetURL ); + xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL ); + xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL ); } } else if ( aCmdVector[i].equalsAscii( CMD_RESTOREVISIBILITY )) diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index d9e279013995..212884d24b76 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -102,7 +102,7 @@ throw( ::com::sun::star::uno::RuntimeException ) { Any a = ::cppu::queryInterface( rType , - SAL_STATIC_CAST( ::com::sun::star::ui::XUIFunctionListener*, this ) ); + (static_cast< ::com::sun::star::ui::XUIFunctionListener* >(this)) ); if( a.hasValue() ) return a; diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index 5583e24b8fe4..3e40e25da82e 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -440,7 +440,7 @@ void ODataInputStream::setSuccessor( const Reference < XConnectable > &r ) throw if( m_succ.is() ) { /// set this instance as the sink ! m_succ->setPredecessor( Reference< XConnectable > ( - SAL_STATIC_CAST( XConnectable * , this ) ) ); + (static_cast< XConnectable * >(this)) ) ); } } } @@ -459,7 +459,7 @@ void ODataInputStream::setPredecessor( const Reference < XConnectable > &r ) m_pred = r; if( m_pred.is() ) { m_pred->setSuccessor( Reference< XConnectable > ( - SAL_STATIC_CAST( XConnectable * , this ) ) ); + (static_cast< XConnectable * >(this)) ) ); } } } @@ -850,7 +850,7 @@ void ODataOutputStream::setSuccessor( const Reference < XConnectable > &r ) { /// set this instance as the sink ! m_succ->setPredecessor( Reference < XConnectable > ( - SAL_STATIC_CAST( XConnectable * , this ) )); + (static_cast< XConnectable * >(this)) )); } } } @@ -867,7 +867,7 @@ void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r ) m_pred = r; if( m_pred.is() ) { m_pred->setSuccessor( Reference< XConnectable > ( - SAL_STATIC_CAST( XConnectable * , this ) )); + (static_cast< XConnectable * >(this)) )); } } } @@ -1097,7 +1097,7 @@ void OObjectOutputStream::writeObject( const Reference< XPersistObject > & xPObj if( bWriteObj ) xPObj->write( Reference< XObjectOutputStream > ( - SAL_STATIC_CAST( XObjectOutputStream * , this ) ) ); + (static_cast< XObjectOutputStream * >(this)) ) ); sal_Int32 nObjLen = m_rMarkable->offsetToMark( nObjLenMark ) -4; m_rMarkable->jumpToMark( nObjLenMark ); @@ -1195,7 +1195,7 @@ Reference< XInterface > SAL_CALL OObjectOutputStream_CreateInstance( throw(Exception) { OObjectOutputStream *p = new OObjectOutputStream; - return Reference< XInterface > ( SAL_STATIC_CAST( OWeakObject * , p ) ); + return Reference< XInterface > ( (static_cast< OWeakObject * >(p)) ); } OUString OObjectOutputStream_getImplementationName() @@ -1383,7 +1383,7 @@ Reference< XPersistObject > OObjectInputStream::readObject() throw (::com::sun: m_aPersistVector[nId] = xLoadedObj; xLoadedObj->read( Reference< XObjectInputStream >( - SAL_STATIC_CAST( XObjectInputStream *, this ) ) ); + (static_cast< XObjectInputStream * >(this)) ) ); } else { @@ -1516,7 +1516,7 @@ Sequence< OUString > OObjectInputStream::getSupportedServiceNames(void) throw () Reference< XInterface > SAL_CALL OObjectInputStream_CreateInstance( const Reference < XComponentContext > & rCtx ) throw(Exception) { OObjectInputStream *p = new OObjectInputStream( rCtx ); - return Reference< XInterface> ( SAL_STATIC_CAST( OWeakObject *, p ) ); + return Reference< XInterface> ( (static_cast< OWeakObject * >(p)) ); } OUString OObjectInputStream_getImplementationName() diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index 49fa8e20e0b6..4070f52551c6 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -367,7 +367,7 @@ void OMarkableOutputStream::setSuccessor( const Reference< XConnectable > &r ) if( m_succ.is() ) { m_succ->setPredecessor( Reference < XConnectable > ( - SAL_STATIC_CAST( XConnectable * , this ) ) ); + (static_cast< XConnectable * >(this)) ) ); } } } @@ -385,7 +385,7 @@ void OMarkableOutputStream::setPredecessor( const Reference< XConnectable > &r ) m_pred = r; if( m_pred.is() ) { m_pred->setSuccessor( Reference < XConnectable > ( - SAL_STATIC_CAST ( XConnectable * , this ) ) ); + (static_cast< XConnectable * >(this )) ) ); } } } @@ -900,7 +900,7 @@ void OMarkableInputStream::setSuccessor( const Reference< XConnectable > &r ) if( m_succ.is() ) { /// set this instance as the sink ! m_succ->setPredecessor( Reference< XConnectable > ( - SAL_STATIC_CAST( XConnectable * , this ) ) ); + (static_cast< XConnectable * >(this)) ) ); } } } @@ -919,7 +919,7 @@ void OMarkableInputStream::setPredecessor( const Reference < XConnectable > &r m_pred = r; if( m_pred.is() ) { m_pred->setSuccessor( Reference< XConnectable > ( - SAL_STATIC_CAST( XConnectable * , this ) ) ); + (static_cast< XConnectable * >(this)) ) ); } } } diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx index 9de67a94537b..5d9fd0f0e770 100644 --- a/io/source/stm/opipe.cxx +++ b/io/source/stm/opipe.cxx @@ -386,7 +386,7 @@ void OPipeImpl::setSuccessor( const Reference < XConnectable > &r ) if( m_succ.is() ) { m_succ->setPredecessor( - Reference< XConnectable > ( SAL_STATIC_CAST( XConnectable * , this ) ) ); + Reference< XConnectable > ( (static_cast< XConnectable * >(this)) ) ); } } } @@ -405,7 +405,7 @@ void OPipeImpl::setPredecessor( const Reference < XConnectable > &r ) m_pred = r; if( m_pred.is() ) { m_pred->setSuccessor( - Reference < XConnectable > ( SAL_STATIC_CAST( XConnectable * , this ) ) ); + Reference < XConnectable > ( (static_cast< XConnectable * >(this)) ) ); } } } @@ -459,7 +459,7 @@ Reference < XInterface > SAL_CALL OPipeImpl_CreateInstance( { OPipeImpl *p = new OPipeImpl; - return Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * , p ) ); + return Reference < XInterface > ( (static_cast< OWeakObject * >(p)) ); } diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx index 4504403a4231..7a54cd234209 100644 --- a/io/test/stm/datatest.cxx +++ b/io/test/stm/datatest.cxx @@ -349,7 +349,7 @@ void ODataStreamTest::testSimple( const Reference < XDataInputStream > &rInput Reference < XInterface > SAL_CALL ODataStreamTest_CreateInstance( const Reference < XMultiServiceFactory > & rSMgr ) throw(Exception) { ODataStreamTest *p = new ODataStreamTest( rSMgr ); - return Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * , p ) ); + return Reference < XInterface > ( (static_cast< OWeakObject * >(p)) ); } Sequence<OUString> ODataStreamTest_getSupportedServiceNames( int i) throw () @@ -627,7 +627,7 @@ Reference < XInterface > SAL_CALL OMyPersistObject_CreateInstance( throw(Exception) { MyPersistObject *p = new MyPersistObject( ); - return Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * , p ) ); + return Reference < XInterface > ( (static_cast< OWeakObject * >(p)) ); } Sequence<OUString> OMyPersistObject_getSupportedServiceNames( ) throw () @@ -1077,7 +1077,7 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream > Reference < XInterface > SAL_CALL OObjectStreamTest_CreateInstance( const Reference < XMultiServiceFactory > & rSMgr ) throw(Exception) { OObjectStreamTest *p = new OObjectStreamTest( rSMgr ); - return Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * , p ) ); + return Reference < XInterface > ( (static_cast< OWeakObject * >(p)) ); } Sequence<OUString> OObjectStreamTest_getSupportedServiceNames( int i) throw () diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx index ab1d771878ef..d0d9976e49c6 100644 --- a/io/test/stm/marktest.cxx +++ b/io/test/stm/marktest.cxx @@ -380,7 +380,7 @@ void OMarkableOutputStreamTest::testSimple( const Reference< XOutputStream > Reference < XInterface > SAL_CALL OMarkableOutputStreamTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw(Exception) { OMarkableOutputStreamTest *p = new OMarkableOutputStreamTest( rSMgr ); - return Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * , p ) ); + return Reference < XInterface > ( (static_cast< OWeakObject * >(p)) ); } @@ -652,7 +652,7 @@ void OMarkableInputStreamTest::testSimple( const Reference< XOutputStream > Reference < XInterface > SAL_CALL OMarkableInputStreamTest_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw(Exception) { OMarkableInputStreamTest *p = new OMarkableInputStreamTest( rSMgr ); - return Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * , p ) ); + return Reference < XInterface > ( (static_cast< OWeakObject * >(p)) ); } diff --git a/io/test/stm/pipetest.cxx b/io/test/stm/pipetest.cxx index ebb89e69c117..c67ff9a86bf1 100644 --- a/io/test/stm/pipetest.cxx +++ b/io/test/stm/pipetest.cxx @@ -413,7 +413,7 @@ void OPipeTest::testMultithreading( const Reference < XInterface > &r ) Reference < XInterface > SAL_CALL OPipeTest_CreateInstance( const Reference< XMultiServiceFactory> & rSMgr ) throw (Exception) { OPipeTest *p = new OPipeTest( rSMgr ); - Reference< XInterface > x ( SAL_STATIC_CAST( OWeakObject * , p ) ); + Reference< XInterface > x ( (static_cast< OWeakObject * >(p)) ); return x; } diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 288c2e75ce74..3db8cf48aff3 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -350,16 +350,6 @@ typedef struct _sal_Sequence #pragma pack(pop) #endif - -/* Historical macros, no need to use, old use cases should be replaced - * by their expansions. - */ -#ifdef __cplusplus -#define SAL_CONST_CAST(type, expr) (const_cast< type >(expr)) -#define SAL_REINTERPRET_CAST(type, expr) (reinterpret_cast< type >(expr)) -#define SAL_STATIC_CAST(type, expr) (static_cast< type >(expr)) -#endif /* __cplusplus */ - /** Definition of function throw clause macros. These have been introduced to reduce code size by balancing out compiler bugs. diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index e80b8bda7a92..287e2f7458e1 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -978,7 +978,7 @@ Reference < XInterface > SAL_CALL SaxWriter_CreateInstance( throw (Exception) { SAXWriter *p = new SAXWriter; - return Reference< XInterface > ( SAL_STATIC_CAST(OWeakObject *, p ) ); + return Reference< XInterface > ( (static_cast< OWeakObject * >(p)) ); } OUString SaxWriter_getServiceName() throw() diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx index aad3b9ed5f7c..dd2e5c38a496 100644 --- a/sax/test/sax/testsax.cxx +++ b/sax/test/sax/testsax.cxx @@ -112,7 +112,7 @@ private: Reference < XInterface > SAL_CALL OSaxParserTest_CreateInstance( const Reference < XMultiServiceFactory > & rSMgr ) throw(Exception) { OSaxParserTest *p = new OSaxParserTest( rSMgr ); - return Reference < XInterface > ( SAL_STATIC_CAST( OWeakObject * , p ) ); + return Reference < XInterface > ( (static_cast< OWeakObject * >(p)) ); } diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 1335e1fb0fa3..6b3d69930e33 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -814,7 +814,7 @@ sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const S String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleName ) { String aURL; - SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() ); + SfxHelp* pHelp = (static_cast< SfxHelp* >(Application::GetHelp()) ); if ( pHelp ) aURL = pHelp->CreateHelpURL_Impl( aCommandURL, rModuleName ); return aURL; @@ -822,7 +822,7 @@ String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleN void SfxHelp::OpenHelpAgent( SfxFrame*, const rtl::OString& sHelpId ) { - SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() ); + SfxHelp* pHelp = (static_cast< SfxHelp* >(Application::GetHelp()) ); if ( pHelp ) pHelp->OpenHelpAgent( sHelpId ); } diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 1bdeddd138ef..25ef143b4c30 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -474,8 +474,8 @@ Any SAL_CALL SfxToolBoxControl::queryInterface( const Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XDockableWindowListener*, this ), - SAL_STATIC_CAST( ::com::sun::star::frame::XSubToolbarController*, this )); + (static_cast< ::com::sun::star::awt::XDockableWindowListener* >(this)), + (static_cast< ::com::sun::star::frame::XSubToolbarController* >(this))); return (aRet.hasValue() ? aRet : svt::ToolboxController::queryInterface( rType )); } diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 9013a674f08a..d1bab1090826 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -234,7 +234,7 @@ public: { ++m_refCount; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComponent( - SAL_STATIC_CAST(::cppu::OWeakObject*, pController ), ::com::sun::star::uno::UNO_QUERY ); + (static_cast< ::cppu::OWeakObject* >(pController)), ::com::sun::star::uno::UNO_QUERY ); if (xComponent.is()) xComponent->addEventListener(this); --m_refCount; diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx index ce4f15157620..447a080a9fc4 100644 --- a/stoc/source/corereflection/criface.cxx +++ b/stoc/source/corereflection/criface.cxx @@ -244,13 +244,13 @@ void IdlAttributeFieldImpl::set( Any & rObj, const Any & rValue ) sal_Bool bAssign; if (pTD->eTypeClass == typelib_TypeClass_ANY) { - uno_copyAndConvertData( pArg, SAL_CONST_CAST( Any *, &rValue ), + uno_copyAndConvertData( pArg, (const_cast< Any * >(&rValue)), pTD, getReflection()->getCpp2Uno().get() ); bAssign = sal_True; } else if (typelib_typedescriptionreference_equals( rValue.getValueTypeRef(), pTD->pWeakRef )) { - uno_copyAndConvertData( pArg, SAL_CONST_CAST( void *, rValue.getValue() ), + uno_copyAndConvertData( pArg, (const_cast< void * >(rValue.getValue()) ), pTD, getReflection()->getCpp2Uno().get() ); bAssign = sal_True; } diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 207088dd5a2b..c0417cb2472c 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -2226,7 +2226,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect( const Reference<XIdlClass>& rxIfaceClass = pParamArray[j]; // Pruefen, ob das Interface schon beruecksichtigt wurde. - XInterface* pIface = SAL_STATIC_CAST( XInterface*, rxIfaceClass.get() ); + XInterface* pIface = (static_cast< XInterface* >(rxIfaceClass.get()) ); if( aCheckedInterfacesMap.count( pIface ) > 0 ) { // Kennen wir schon diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index e54fb6f384d6..4254c5b3978a 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -278,9 +278,9 @@ Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType ) { // PropertySet-Implementation Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST(XInvocation*, this), - SAL_STATIC_CAST(XMaterialHolder*, this), - SAL_STATIC_CAST(XTypeProvider *,this) ); + (static_cast< XInvocation* >(this)), + (static_cast< XMaterialHolder* >(this)), + (static_cast< XTypeProvider * >(this)) ); if( a.hasValue() ) { return a; @@ -293,40 +293,40 @@ Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType ) if ((_xDirect.is() && _xENDirect.is()) || (!_xDirect.is() && (_xENIntrospection.is() || _xENNameAccess.is()))) { - return makeAny( Reference< XExactName >( SAL_STATIC_CAST(XExactName*, this) ) ); + return makeAny( Reference< XExactName >( (static_cast< XExactName* >(this)) ) ); } } else if ( aType == getCppuType( (Reference<XNameContainer>*) NULL ) ) { if( _xNameContainer.is() ) - return makeAny( Reference< XNameContainer >( SAL_STATIC_CAST(XNameContainer*, this) ) ); + return makeAny( Reference< XNameContainer >( (static_cast< XNameContainer* >(this)) ) ); } else if ( aType == getCppuType( (Reference<XNameAccess>*) NULL ) ) { if( _xNameAccess.is() ) - return makeAny( Reference< XNameAccess >( SAL_STATIC_CAST(XNameAccess*, this) ) ); + return makeAny( Reference< XNameAccess >( (static_cast< XNameAccess* >(this)) ) ); } else if ( aType == getCppuType( (Reference<XIndexContainer>*) NULL ) ) { if (_xIndexContainer.is()) - return makeAny( Reference< XIndexContainer >( SAL_STATIC_CAST(XIndexContainer*, this) ) ); + return makeAny( Reference< XIndexContainer >( (static_cast< XIndexContainer* >(this)) ) ); } else if ( aType == getCppuType( (Reference<XIndexAccess>*) NULL ) ) { if (_xIndexAccess.is()) - return makeAny( Reference< XIndexAccess >( SAL_STATIC_CAST(XIndexAccess*, this) ) ); + return makeAny( Reference< XIndexAccess >( (static_cast< XIndexAccess* >(this)) ) ); } else if ( aType == getCppuType( (Reference<XEnumerationAccess>*) NULL ) ) { if (_xEnumerationAccess.is()) - return makeAny( Reference< XEnumerationAccess >( SAL_STATIC_CAST(XEnumerationAccess*, this) ) ); + return makeAny( Reference< XEnumerationAccess >( (static_cast< XEnumerationAccess* >(this)) ) ); } else if ( aType == getCppuType( (Reference<XElementAccess>*) NULL ) ) { if (_xElementAccess.is()) { return makeAny( Reference< XElementAccess >( - SAL_STATIC_CAST(XElementAccess*, SAL_STATIC_CAST(XNameContainer*, this) ) ) ); + (static_cast< XElementAccess* >((static_cast< XNameContainer* >(this))) ) ) ); } } else if ( aType == getCppuType( (Reference<XInvocation2>*) NULL ) ) @@ -336,7 +336,7 @@ Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType ) if ( ( _xDirect.is() && _xDirect2.is()) || (!_xDirect.is() && _xIntrospectionAccess.is() ) ) { - return makeAny( Reference< XInvocation2 >( SAL_STATIC_CAST(XInvocation2*, this) ) ); + return makeAny( Reference< XInvocation2 >( (static_cast< XInvocation2* >(this)) ) ); } } diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index 55ee0d9e4ef2..152fe8dadb3c 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -1898,9 +1898,8 @@ Reference<XInterface > SAL_CALL OServiceManager_CreateInstance( const Reference< XComponentContext > & xContext ) { return Reference<XInterface >( - SAL_STATIC_CAST( - XInterface *, SAL_STATIC_CAST( - OWeakObject *, new stoc_smgr::OServiceManager( xContext ) ) ) ); + static_cast< XInterface * >( + static_cast< OWeakObject * >( new stoc_smgr::OServiceManager( xContext ) ) ) ); } /** @@ -1911,9 +1910,8 @@ Reference<XInterface > SAL_CALL ORegistryServiceManager_CreateInstance( throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { return Reference<XInterface >( - SAL_STATIC_CAST( - XInterface *, SAL_STATIC_CAST( - OWeakObject *, new stoc_smgr::ORegistryServiceManager( xContext ) ) ) ); + static_cast< XInterface * >( + static_cast< OWeakObject * >( new stoc_smgr::ORegistryServiceManager( xContext ) ) ) ); } Reference<XInterface > SAL_CALL OServiceManagerWrapper_CreateInstance( diff --git a/svl/inc/svl/ilstitem.hxx b/svl/inc/svl/ilstitem.hxx index 2973c066c4d8..55abfbb13c7d 100644 --- a/svl/inc/svl/ilstitem.hxx +++ b/svl/inc/svl/ilstitem.hxx @@ -50,7 +50,7 @@ public: ::com::sun::star::uno::Sequence < sal_Int32 > GetSequence() { return m_aList; } ::com::sun::star::uno::Sequence < sal_Int32 > GetConstSequence() const - { return SAL_CONST_CAST(SfxIntegerListItem *, this)->GetSequence(); } + { return (const_cast< SfxIntegerListItem * >(this))->GetSequence(); } void GetList( ::std::vector < sal_Int32 >& rList ) const; diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index 4584d993dc2f..ea64d6448457 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -48,7 +48,7 @@ int CntByteItem::operator ==(const SfxPoolItem & rItem) const DBG_CHKTHIS(CntByteItem, 0); DBG_ASSERT(rItem.ISA(CntByteItem), "CntByteItem::operator ==(): Bad type"); - return m_nValue == SAL_STATIC_CAST(const CntByteItem *, &rItem)->m_nValue; + return m_nValue == (static_cast< const CntByteItem * >(&rItem))->m_nValue; } //============================================================================ @@ -57,9 +57,9 @@ int CntByteItem::Compare(const SfxPoolItem & rWith) const { DBG_CHKTHIS(CntByteItem, 0); DBG_ASSERT(rWith.ISA(CntByteItem), "CntByteItem::Compare(): Bad type"); - return SAL_STATIC_CAST(const CntByteItem *, &rWith)->m_nValue < m_nValue ? + return (static_cast< const CntByteItem * >(&rWith))->m_nValue < m_nValue ? -1 : - SAL_STATIC_CAST(const CntByteItem *, &rWith)->m_nValue + (static_cast< const CntByteItem * >(&rWith))->m_nValue == m_nValue ? 0 : 1; } @@ -179,7 +179,7 @@ int CntUInt16Item::operator ==(const SfxPoolItem & rItem) const DBG_CHKTHIS(CntUInt16Item, 0); DBG_ASSERT(rItem.ISA(CntUInt16Item), "CntUInt16Item::operator ==(): Bad type"); - return m_nValue == SAL_STATIC_CAST(const CntUInt16Item *, &rItem)-> + return m_nValue == (static_cast< const CntUInt16Item * >(&rItem))-> m_nValue; } @@ -190,10 +190,10 @@ int CntUInt16Item::Compare(const SfxPoolItem & rWith) const DBG_CHKTHIS(CntUInt16Item, 0); DBG_ASSERT(rWith.ISA(CntUInt16Item), "CntUInt16Item::Compare(): Bad type"); - return SAL_STATIC_CAST(const CntUInt16Item *, &rWith)->m_nValue + return (static_cast< const CntUInt16Item * >(&rWith))->m_nValue < m_nValue ? -1 : - SAL_STATIC_CAST(const CntUInt16Item *, &rWith)->m_nValue + (static_cast< const CntUInt16Item * >(&rWith))->m_nValue == m_nValue ? 0 : 1; } @@ -312,7 +312,7 @@ int CntInt32Item::operator ==(const SfxPoolItem & rItem) const DBG_CHKTHIS(CntInt32Item, 0); DBG_ASSERT(rItem.ISA(CntInt32Item), "CntInt32Item::operator ==(): Bad type"); - return m_nValue == SAL_STATIC_CAST(const CntInt32Item *, &rItem)-> + return m_nValue == (static_cast< const CntInt32Item * >(&rItem))-> m_nValue; } @@ -322,10 +322,10 @@ int CntInt32Item::Compare(const SfxPoolItem & rWith) const { DBG_CHKTHIS(CntInt32Item, 0); DBG_ASSERT(rWith.ISA(CntInt32Item), "CntInt32Item::Compare(): Bad type"); - return SAL_STATIC_CAST(const CntInt32Item *, &rWith)->m_nValue + return (static_cast< const CntInt32Item * >(&rWith))->m_nValue < m_nValue ? -1 : - SAL_STATIC_CAST(const CntInt32Item *, &rWith)->m_nValue + (static_cast< const CntInt32Item * >(&rWith))->m_nValue == m_nValue ? 0 : 1; } @@ -444,7 +444,7 @@ int CntUInt32Item::operator ==(const SfxPoolItem & rItem) const DBG_CHKTHIS(CntUInt32Item, 0); DBG_ASSERT(rItem.ISA(CntUInt32Item), "CntUInt32Item::operator ==(): Bad type"); - return m_nValue == SAL_STATIC_CAST(const CntUInt32Item *, &rItem)-> + return m_nValue == (static_cast< const CntUInt32Item * >(&rItem))-> m_nValue; } @@ -455,10 +455,10 @@ int CntUInt32Item::Compare(const SfxPoolItem & rWith) const DBG_CHKTHIS(CntUInt32Item, 0); DBG_ASSERT(rWith.ISA(CntUInt32Item), "CntUInt32Item::operator ==(): Bad type"); - return SAL_STATIC_CAST(const CntUInt32Item *, &rWith)->m_nValue + return (static_cast< const CntUInt32Item * >(&rWith))->m_nValue < m_nValue ? -1 : - SAL_STATIC_CAST(const CntUInt32Item *, &rWith)->m_nValue + (static_cast< const CntUInt32Item * >(&rWith))->m_nValue == m_nValue ? 0 : 1; } diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index 3eb89d8b7abe..92bdff92508d 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -133,7 +133,7 @@ SvStream& CntWallpaperItem::Store( SvStream& rStream, sal_uInt16 ) const // !!! Color stream operators do not work - they discard any // transparency info !!! // ??? Why the hell Color::Write(...) isn't const ??? - SAL_CONST_CAST( CntWallpaperItem*, this )->_nColor.Write( rStream, sal_True ); + (const_cast< CntWallpaperItem* >(this))->_nColor.Write( rStream, sal_True ); rStream << _nStyle; return rStream; diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index bb8fc9400e90..9cf67a1371ec 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -164,7 +164,7 @@ SfxItemPresentation CntContentTypeItem::GetPresentation( DBG_ASSERT(pIntlWrapper, "CntContentTypeItem::GetPresentation(): No IntlWrapper"); if (pIntlWrapper) - SAL_CONST_CAST(CntContentTypeItem *, this)->_aPresentation + (const_cast< CntContentTypeItem * >(this))->_aPresentation = INetContentTypes::GetPresentation(GetEnumValue(), pIntlWrapper-> getLocale()); @@ -187,7 +187,7 @@ INetContentType CntContentTypeItem::GetEnumValue() const { // Not yet initialized... Get enum value for string content type. - CntContentTypeItem* pVarThis = SAL_CONST_CAST( CntContentTypeItem*, this ); + CntContentTypeItem* pVarThis = (const_cast< CntContentTypeItem* >(this)); pVarThis->_eType = INetContentTypes::GetContentType( GetValue() ); } diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index 7c71b67d6864..cccd70b85ed2 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -51,7 +51,7 @@ int CntUnencodedStringItem::operator ==(const SfxPoolItem & rItem) const DBG_ASSERT(rItem.ISA(CntUnencodedStringItem), "CntUnencodedStringItem::operator ==(): Bad type"); return m_aValue - == SAL_STATIC_CAST(const CntUnencodedStringItem *, &rItem)-> + == (static_cast< const CntUnencodedStringItem * >(&rItem))-> m_aValue; } diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index abe1586c17db..e7844678c186 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -77,7 +77,7 @@ int SfxInt16Item::operator ==(const SfxPoolItem & rItem) const { DBG_CHKTHIS(SfxInt16Item, 0); DBG_ASSERT(SfxPoolItem::operator ==(rItem), "unequal type"); - return m_nValue == SAL_STATIC_CAST(const SfxInt16Item *, &rItem)-> + return m_nValue == (static_cast< const SfxInt16Item * >(&rItem))-> m_nValue; } @@ -87,10 +87,10 @@ int SfxInt16Item::Compare(const SfxPoolItem & rWith) const { DBG_CHKTHIS(SfxInt16Item, 0); DBG_ASSERT(SfxPoolItem::operator ==(rWith), "unequal type"); - return SAL_STATIC_CAST(const SfxInt16Item *, &rWith)->m_nValue + return (static_cast< const SfxInt16Item * >(&rWith))->m_nValue < m_nValue ? -1 : - SAL_STATIC_CAST(const SfxInt16Item *, &rWith)->m_nValue + (static_cast< const SfxInt16Item * >(&rWith))->m_nValue == m_nValue ? 0 : 1; } diff --git a/svl/source/items/sfontitm.cxx b/svl/source/items/sfontitm.cxx index 1077c939a201..226208f629bd 100644 --- a/svl/source/items/sfontitm.cxx +++ b/svl/source/items/sfontitm.cxx @@ -129,8 +129,8 @@ SvStream & SfxFontItem::Store(SvStream & rStream, sal_uInt16) const << sal_Int8(m_bOutline) << sal_Int8(m_bShadow) << sal_Int8(m_bKerning); } - SAL_CONST_CAST(Color &, m_aColor).Write(rStream, sal_True); - SAL_CONST_CAST(Color &, m_aFillColor).Write(rStream, sal_True); + (const_cast< Color & >(m_aColor)).Write(rStream, sal_True); + (const_cast< Color & >(m_aFillColor)).Write(rStream, sal_True); rStream << sal_Int16(m_bHasFont << 2 | m_bHasColor | m_bHasFillColor << 1); return rStream; diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index d12ab3e0f5a6..bc7efbe430ad 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -147,7 +147,7 @@ std::vector<String>& SfxStringListItem::GetList() const std::vector<String>& SfxStringListItem::GetList () const { - return SAL_CONST_CAST(SfxStringListItem *, this)->GetList(); + return (const_cast< SfxStringListItem * >(this))->GetList(); } //------------------------------------------------------------------------ diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index 6453efc0c52d..016bdb6f1a0f 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -57,7 +57,7 @@ int SfxVisibilityItem::operator ==(const SfxPoolItem & rItem) const { DBG_CHKTHIS(SfxVisibilityItem, 0); DBG_ASSERT(SfxPoolItem::operator ==(rItem), "unequal type"); - return m_nValue.bVisible == SAL_STATIC_CAST(const SfxVisibilityItem *, &rItem)-> + return m_nValue.bVisible == (static_cast< const SfxVisibilityItem * >(&rItem))-> m_nValue.bVisible; } diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx index c776702e9437..7e2955dd23ed 100644 --- a/svtools/source/edit/textview.cxx +++ b/svtools/source/edit/textview.cxx @@ -105,7 +105,7 @@ TETextDataObject::~TETextDataObject() // uno::XInterface uno::Any TETextDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) { - uno::Any aRet = ::cppu::queryInterface( rType, SAL_STATIC_CAST( datatransfer::XTransferable*, this ) ); + uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< datatransfer::XTransferable* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index bbc2bc7abee0..9b8c7757f550 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -63,7 +63,7 @@ namespace unographic { uno::Reference< uno::XInterface > SAL_CALL GraphicProvider_CreateInstance( const uno::Reference< lang::XMultiServiceFactory >& ) { - return SAL_STATIC_CAST( ::cppu::OWeakObject*, new GraphicProvider ); + return (static_cast< ::cppu::OWeakObject* >(new GraphicProvider )); } GraphicProvider::GraphicProvider() diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index 07e054d3dd93..1b0a46c0f7f6 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -54,7 +54,7 @@ namespace unographic { uno::Reference< uno::XInterface > SAL_CALL GraphicRendererVCL_CreateInstance( const uno::Reference< lang::XMultiServiceFactory >& ) { - return SAL_STATIC_CAST( ::cppu::OWeakObject*, new GraphicRendererVCL ); + return (static_cast< ::cppu::OWeakObject* >(new GraphicRendererVCL )); } diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index 22d361a17a1e..6d8578e7952c 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -113,7 +113,7 @@ throw ( uno::RuntimeException ) { uno::Any a = ::cppu::queryInterface( aType, - SAL_STATIC_CAST( XStatusListener*, this )); + (static_cast< XStatusListener* >(this))); if( a.hasValue() ) return a; @@ -156,7 +156,7 @@ bool StateEventHelper::isCommandEnabled() { // Be sure that we cannot die during condition wait uno::Reference< frame::XStatusListener > xSelf( - SAL_STATIC_CAST( frame::XStatusListener*, this )); + (static_cast< frame::XStatusListener* >(this))); uno::Reference< frame::XDispatch > xDispatch; util::URL aTargetURL; diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index fc48708d873a..cdb58e639bb9 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -194,10 +194,10 @@ VCLXMultiLineEdit::~VCLXMultiLineEdit() ::com::sun::star::uno::Any VCLXMultiLineEdit::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XTextComponent*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XTextArea*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XTextLayoutConstrains*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) ); + (static_cast< ::com::sun::star::awt::XTextComponent* >(this)), + (static_cast< ::com::sun::star::awt::XTextArea* >(this)), + (static_cast< ::com::sun::star::awt::XTextLayoutConstrains* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } @@ -558,9 +558,9 @@ VCLXFileControl::~VCLXFileControl() ::com::sun::star::uno::Any VCLXFileControl::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XTextComponent*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XTextLayoutConstrains*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) ); + (static_cast< ::com::sun::star::awt::XTextComponent* >(this)), + (static_cast< ::com::sun::star::awt::XTextLayoutConstrains* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } @@ -1675,8 +1675,8 @@ SVTXNumericField::~SVTXNumericField() ::com::sun::star::uno::Any SVTXNumericField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XNumericField*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) ); + (static_cast< ::com::sun::star::awt::XNumericField* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : SVTXFormattedField::queryInterface( rType )); } @@ -1842,8 +1842,8 @@ SVTXCurrencyField::~SVTXCurrencyField() ::com::sun::star::uno::Any SVTXCurrencyField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XCurrencyField*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) ); + (static_cast< ::com::sun::star::awt::XCurrencyField* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : SVTXFormattedField::queryInterface( rType )); } @@ -2133,8 +2133,8 @@ void VCLXProgressBar::ImplUpdateValue() ::com::sun::star::uno::Any VCLXProgressBar::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XProgressBar*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) ); + (static_cast< ::com::sun::star::awt::XProgressBar* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } diff --git a/toolkit/inc/toolkit/helper/macros.hxx b/toolkit/inc/toolkit/helper/macros.hxx index 3d59e609c421..01d5705c60f5 100644 --- a/toolkit/inc/toolkit/helper/macros.hxx +++ b/toolkit/inc/toolkit/helper/macros.hxx @@ -160,8 +160,8 @@ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \ ::com::sun::star::uno::Any ClassName::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) \ { \ ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, \ - SAL_STATIC_CAST( ::com::sun::star::lang::XEventListener*, this ), \ - SAL_STATIC_CAST( InterfaceName*, this ) ); \ + (static_cast< ::com::sun::star::lang::XEventListener* >(this)), \ + (static_cast< InterfaceName* >(this)) ); \ return (aRet.hasValue() ? aRet : ListenerMultiplexerBase::queryInterface( rType )); \ } \ void ClassName::disposing( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException) \ diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx index f86d430bccc7..8d6cdd58ae26 100644 --- a/toolkit/source/awt/vclxbitmap.cxx +++ b/toolkit/source/awt/vclxbitmap.cxx @@ -43,10 +43,10 @@ ::com::sun::star::uno::Any VCLXBitmap::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XBitmap*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XDisplayBitmap*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) ); + (static_cast< ::com::sun::star::awt::XBitmap* >(this)), + (static_cast< ::com::sun::star::awt::XDisplayBitmap* >(this)), + (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index 5f4685c08077..7f48b8d0a849 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -60,8 +60,8 @@ VCLXContainer::~VCLXContainer() ::com::sun::star::uno::Any VCLXContainer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XVclContainer*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XVclContainerPeer*, this ) ); + (static_cast< ::com::sun::star::awt::XVclContainer* >(this)), + (static_cast< ::com::sun::star::awt::XVclContainerPeer* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx index 73adaa12cd37..e73b1f2cd13e 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -79,10 +79,10 @@ void VCLXDevice::SetCreatedWithToolkit( sal_Bool bCreatedWithToolkit ) ::com::sun::star::uno::Any VCLXDevice::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XDevice*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XUnitConversion*, this ) ); + (static_cast< ::com::sun::star::awt::XDevice* >(this)), + (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)), + (static_cast< ::com::sun::star::awt::XUnitConversion* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx index d44e68b2b0bc..6b9e9cec0e10 100644 --- a/toolkit/source/awt/vclxfont.cxx +++ b/toolkit/source/awt/vclxfont.cxx @@ -82,10 +82,10 @@ sal_Bool VCLXFont::ImplAssertValidFontMetric() ::com::sun::star::uno::Any VCLXFont::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XFont*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XFont2*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) ); + (static_cast< ::com::sun::star::awt::XFont* >(this)), + (static_cast< ::com::sun::star::awt::XFont2* >(this)), + (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index 8923ea34a706..2def418ce61f 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -49,9 +49,9 @@ ::com::sun::star::uno::Any VCLXGraphics::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XGraphics*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ) ); + (static_cast< ::com::sun::star::awt::XGraphics* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)), + (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 26e3900f5cc0..d45d5dc25066 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -273,24 +273,24 @@ throw(::com::sun::star::uno::RuntimeException) if ( bIsPopupMenu ) aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XMenu*, (::com::sun::star::awt::XMenuBar*) this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XPopupMenu*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XPopupMenuExtended*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XMenuExtended*, (::com::sun::star::awt::XPopupMenuExtended*) this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XMenuExtended2*, (::com::sun::star::awt::XPopupMenuExtended*) this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XServiceInfo*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ) ); + (static_cast< ::com::sun::star::awt::XMenu* >((::com::sun::star::awt::XMenuBar*) this) ), + (static_cast< ::com::sun::star::awt::XPopupMenu* >(this)), + (static_cast< ::com::sun::star::awt::XPopupMenuExtended* >(this)), + (static_cast< ::com::sun::star::awt::XMenuExtended* >((::com::sun::star::awt::XPopupMenuExtended*) this) ), + (static_cast< ::com::sun::star::awt::XMenuExtended2* >((::com::sun::star::awt::XPopupMenuExtended*) this) ), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)), + (static_cast< ::com::sun::star::lang::XServiceInfo* >(this)), + (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)) ); else aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XMenu*, (::com::sun::star::awt::XMenuBar*) this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XMenuBar*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XMenuBarExtended*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XMenuExtended*, (::com::sun::star::awt::XMenuBarExtended*) this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XMenuExtended2*, (::com::sun::star::awt::XMenuBarExtended*) this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XServiceInfo*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ) ); + (static_cast< ::com::sun::star::awt::XMenu* >((::com::sun::star::awt::XMenuBar*) this) ), + (static_cast< ::com::sun::star::awt::XMenuBar* >(this)), + (static_cast< ::com::sun::star::awt::XMenuBarExtended* >(this)), + (static_cast< ::com::sun::star::awt::XMenuExtended* >((::com::sun::star::awt::XMenuBarExtended*) this) ), + (static_cast< ::com::sun::star::awt::XMenuExtended2* >((::com::sun::star::awt::XMenuBarExtended*) this) ), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)), + (static_cast< ::com::sun::star::lang::XServiceInfo* >(this)), + (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx index 0a646511a054..d2fda845811c 100644 --- a/toolkit/source/awt/vclxpointer.cxx +++ b/toolkit/source/awt/vclxpointer.cxx @@ -47,9 +47,9 @@ VCLXPointer::~VCLXPointer() ::com::sun::star::uno::Any VCLXPointer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XPointer*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) ); + (static_cast< ::com::sun::star::awt::XPointer* >(this)), + (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 25a6efb54bdf..f76a381461c3 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -80,11 +80,11 @@ ::com::sun::star::uno::Any VCLXPrinterPropertySet::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::beans::XMultiPropertySet*, this ), - SAL_STATIC_CAST( ::com::sun::star::beans::XFastPropertySet*, this ), - SAL_STATIC_CAST( ::com::sun::star::beans::XPropertySet*, (::cppu::OPropertySetHelper*) this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XPrinterPropertySet*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) ); + (static_cast< ::com::sun::star::beans::XMultiPropertySet* >(this)), + (static_cast< ::com::sun::star::beans::XFastPropertySet* >(this)), + (static_cast< ::com::sun::star::beans::XPropertySet* >((::cppu::OPropertySetHelper*) this) ), + (static_cast< ::com::sun::star::awt::XPrinterPropertySet* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface( rType )); } @@ -307,7 +307,7 @@ VCLXPrinter::~VCLXPrinter() ::com::sun::star::uno::Any VCLXPrinter::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XPrinter*, this ) ); + (static_cast< ::com::sun::star::awt::XPrinter* >(this)) ); if ( !aRet.hasValue() ) aRet = VCLXPrinterPropertySet::queryInterface( rType ); @@ -392,7 +392,7 @@ VCLXInfoPrinter::~VCLXInfoPrinter() ::com::sun::star::uno::Any VCLXInfoPrinter::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XInfoPrinter*, this ) ); + (static_cast< ::com::sun::star::awt::XInfoPrinter* >(this)) ); if ( !aRet.hasValue() ) aRet = VCLXPrinterPropertySet::queryInterface( rType ); @@ -422,7 +422,7 @@ IMPL_XTYPEPROVIDER_END ::com::sun::star::uno::Any VCLXPrinterServer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XPrinterServer*, this ) ); + (static_cast< ::com::sun::star::awt::XPrinterServer* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx index 8c2c7397ea92..59611ebcd68b 100644 --- a/toolkit/source/awt/vclxregion.cxx +++ b/toolkit/source/awt/vclxregion.cxx @@ -52,9 +52,9 @@ VCLXRegion::~VCLXRegion() ::com::sun::star::uno::Any VCLXRegion::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XRegion*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) ); + (static_cast< ::com::sun::star::awt::XRegion* >(this)), + (static_cast< ::com::sun::star::lang::XUnoTunnel* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 2e96582691c4..660ca8957add 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -69,7 +69,7 @@ VCLXSystemDependentWindow::~VCLXSystemDependentWindow() ::com::sun::star::uno::Any VCLXSystemDependentWindow::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XSystemDependentWindowPeer*, this ) ); + (static_cast< ::com::sun::star::awt::XSystemDependentWindowPeer* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index b8d13e24f5af..596e411a93ab 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -792,8 +792,8 @@ VCLXCheckBox::VCLXCheckBox() : maActionListeners( *this ), maItemListeners( *th ::com::sun::star::uno::Any VCLXCheckBox::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XButton*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XCheckBox*, this ) ); + (static_cast< ::com::sun::star::awt::XButton* >(this)), + (static_cast< ::com::sun::star::awt::XCheckBox* >(this)) ); return (aRet.hasValue() ? aRet : VCLXGraphicControl::queryInterface( rType )); } @@ -1093,8 +1093,8 @@ VCLXRadioButton::VCLXRadioButton() : maItemListeners( *this ), maActionListeners ::com::sun::star::uno::Any VCLXRadioButton::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XRadioButton*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XButton*, this ) ); + (static_cast< ::com::sun::star::awt::XRadioButton* >(this)), + (static_cast< ::com::sun::star::awt::XButton* >(this)) ); return (aRet.hasValue() ? aRet : VCLXGraphicControl::queryInterface( rType )); } @@ -1354,7 +1354,7 @@ VCLXSpinField::VCLXSpinField() : maSpinListeners( *this ) ::com::sun::star::uno::Any VCLXSpinField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XSpinField*, this ) ); + (static_cast< ::com::sun::star::awt::XSpinField* >(this)) ); return (aRet.hasValue() ? aRet : VCLXEdit::queryInterface( rType )); } @@ -2202,7 +2202,7 @@ VCLXMessageBox::~VCLXMessageBox() ::com::sun::star::uno::Any VCLXMessageBox::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XMessageBox*, this ) ); + (static_cast< ::com::sun::star::awt::XMessageBox* >(this)) ); return (aRet.hasValue() ? aRet : VCLXTopWindow::queryInterface( rType )); } @@ -2290,9 +2290,9 @@ VCLXDialog::~VCLXDialog() ::com::sun::star::uno::Any VCLXDialog::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::document::XVbaMethodParameter*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XDialog2*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XDialog*, this ) ); + (static_cast< ::com::sun::star::document::XVbaMethodParameter* >(this)), + (static_cast< ::com::sun::star::awt::XDialog2* >(this)), + (static_cast< ::com::sun::star::awt::XDialog* >(this)) ); return (aRet.hasValue() ? aRet : VCLXTopWindow::queryInterface( rType )); } @@ -2924,7 +2924,7 @@ VCLXFixedHyperlink::~VCLXFixedHyperlink() ::com::sun::star::uno::Any VCLXFixedHyperlink::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XFixedHyperlink*, this ) ); + (static_cast< ::com::sun::star::awt::XFixedHyperlink* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } @@ -3239,7 +3239,7 @@ VCLXFixedText::~VCLXFixedText() ::com::sun::star::uno::Any VCLXFixedText::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XFixedText*, this ) ); + (static_cast< ::com::sun::star::awt::XFixedText* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } @@ -3381,7 +3381,7 @@ VCLXScrollBar::VCLXScrollBar() : maAdjustmentListeners( *this ) ::com::sun::star::uno::Any VCLXScrollBar::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XScrollBar*, this ) ); + (static_cast< ::com::sun::star::awt::XScrollBar* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } @@ -3865,9 +3865,9 @@ VCLXEdit::VCLXEdit() : maTextListeners( *this ) ::com::sun::star::uno::Any VCLXEdit::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XTextComponent*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XTextEditField*, this ), - SAL_STATIC_CAST( ::com::sun::star::awt::XTextLayoutConstrains*, this ) ); + (static_cast< ::com::sun::star::awt::XTextComponent* >(this)), + (static_cast< ::com::sun::star::awt::XTextEditField* >(this)), + (static_cast< ::com::sun::star::awt::XTextLayoutConstrains* >(this)) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } @@ -4844,7 +4844,7 @@ VCLXDateField::~VCLXDateField() ::com::sun::star::uno::Any VCLXDateField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XDateField*, this ) ); + (static_cast< ::com::sun::star::awt::XDateField* >(this)) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } @@ -5186,7 +5186,7 @@ VCLXTimeField::~VCLXTimeField() ::com::sun::star::uno::Any VCLXTimeField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XTimeField*, this ) ); + (static_cast< ::com::sun::star::awt::XTimeField* >(this)) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } @@ -5490,7 +5490,7 @@ VCLXNumericField::~VCLXNumericField() ::com::sun::star::uno::Any VCLXNumericField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XNumericField*, this ) ); + (static_cast< ::com::sun::star::awt::XNumericField* >(this)) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } @@ -5846,7 +5846,7 @@ MetricField *VCLXMetricField::GetMetricField() throw(::com::sun::star::uno::Runt ::com::sun::star::uno::Any VCLXMetricField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XMetricField*, this ) ); + (static_cast< ::com::sun::star::awt::XMetricField* >(this)) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } @@ -6085,7 +6085,7 @@ VCLXCurrencyField::~VCLXCurrencyField() ::com::sun::star::uno::Any VCLXCurrencyField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XCurrencyField*, this ) ); + (static_cast< ::com::sun::star::awt::XCurrencyField* >(this)) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } @@ -6433,7 +6433,7 @@ VCLXPatternField::~VCLXPatternField() ::com::sun::star::uno::Any VCLXPatternField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XPatternField*, this ) ); + (static_cast< ::com::sun::star::awt::XPatternField* >(this)) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index ca4d27053829..e50d96812ca8 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -722,7 +722,7 @@ IMPL_XTYPEPROVIDER_END uno::Any UnoMultiPageControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) { uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( awt::XTabListener*, this ), SAL_STATIC_CAST( awt::XSimpleTabController*, this ) ); + (static_cast< awt::XTabListener* >(this)), (static_cast< awt::XSimpleTabController* >(this)) ); return (aRet.hasValue() ? aRet : ControlContainerBase::queryAggregation( rType )); } diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index 22c1f328a0a3..72c28a0fd650 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -170,9 +170,9 @@ void StdTabController::ImplActivateControl( sal_Bool bFirst ) const Any StdTabController::queryAggregation( const Type & rType ) throw(RuntimeException) { Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( XTabController*, this ), - SAL_STATIC_CAST( XServiceInfo*, this ), - SAL_STATIC_CAST( XTypeProvider*, this ) ); + (static_cast< XTabController* >(this)), + (static_cast< XServiceInfo* >(this)), + (static_cast< XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : OWeakAggObject::queryAggregation( rType )); } diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index f706dcbfd3d1..b59f1cbfeed1 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -224,10 +224,10 @@ void ImplWriteControls( const ::com::sun::star::uno::Reference< ::com::sun::star ::com::sun::star::uno::Any StdTabControllerModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::awt::XTabControllerModel*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XServiceInfo*, this ), - SAL_STATIC_CAST( ::com::sun::star::io::XPersistObject*, this ), - SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) ); + (static_cast< ::com::sun::star::awt::XTabControllerModel* >(this)), + (static_cast< ::com::sun::star::lang::XServiceInfo* >(this)), + (static_cast< ::com::sun::star::io::XPersistObject* >(this)), + (static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) ); return (aRet.hasValue() ? aRet : OWeakAggObject::queryAggregation( rType )); } diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index 91fcda50e0e9..004fe62bb2e1 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -110,8 +110,8 @@ namespace toolkit uno::Any UnoScrollBarControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) { uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( awt::XAdjustmentListener*, this ), - SAL_STATIC_CAST( awt::XScrollBar*, this ) ); + (static_cast< awt::XAdjustmentListener* >(this)), + (static_cast< awt::XScrollBar* >(this)) ); return (aRet.hasValue() ? aRet : UnoControlBase::queryAggregation( rType )); } diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index a10a799fcd94..c3e3e03616ad 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -792,12 +792,12 @@ void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxT sal_Int32 nDialogStep = 0; aVal >>= nDialogStep; uno::Reference< awt::XControlContainer > xContainer = - SAL_STATIC_CAST( awt::XControlContainer*, this ); + (static_cast< awt::XControlContainer* >(this)); implUpdateVisibility( nDialogStep, xContainer ); uno::Reference< beans::XPropertyChangeListener > xListener = - SAL_STATIC_CAST( beans::XPropertyChangeListener*, - new DialogStepChangedListener( xContainer ) ); + (static_cast< beans::XPropertyChangeListener* >( + new DialogStepChangedListener( xContainer ) ) ); xPSet->addPropertyChangeListener( aPropName, xListener ); } diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 01be8cceefa6..d82e1eb51953 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -1434,8 +1434,8 @@ UnoFixedHyperlinkControl::UnoFixedHyperlinkControl( const Reference< XMultiServi uno::Any UnoFixedHyperlinkControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) { uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( awt::XFixedHyperlink*, this ), - SAL_STATIC_CAST( awt::XLayoutConstrains*, this ) ); + (static_cast< awt::XFixedHyperlink* >(this)), + (static_cast< awt::XLayoutConstrains* >(this)) ); return (aRet.hasValue() ? aRet : UnoControlBase::queryAggregation( rType )); } @@ -1615,8 +1615,8 @@ UnoFixedTextControl::UnoFixedTextControl( const Reference< XMultiServiceFactory uno::Any UnoFixedTextControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) { uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( awt::XFixedText*, this ), - SAL_STATIC_CAST( awt::XLayoutConstrains*, this ) ); + (static_cast< awt::XFixedText* >(this)), + (static_cast< awt::XLayoutConstrains* >(this)) ); return (aRet.hasValue() ? aRet : UnoControlBase::queryAggregation( rType )); } @@ -2824,15 +2824,15 @@ void UnoComboBoxControl::dispose() throw(uno::RuntimeException) uno::Any UnoComboBoxControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) { uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( awt::XComboBox*, this ) ); + (static_cast< awt::XComboBox* >(this)) ); if ( !aRet.hasValue() ) { aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( awt::XItemListener*, this ) ); + (static_cast< awt::XItemListener* >(this)) ); if ( !aRet.hasValue() ) { aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( awt::XItemListListener*, this ) ); + (static_cast< awt::XItemListListener* >(this)) ); } } return (aRet.hasValue() ? aRet : UnoEditControl::queryAggregation( rType )); @@ -3122,7 +3122,7 @@ UnoSpinFieldControl::UnoSpinFieldControl( const Reference< XMultiServiceFactory uno::Any UnoSpinFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) { uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( awt::XSpinField*, this ) ); + (static_cast< awt::XSpinField* >(this)) ); return (aRet.hasValue() ? aRet : UnoEditControl::queryAggregation( rType )); } @@ -3266,7 +3266,7 @@ UnoDateFieldControl::UnoDateFieldControl( const Reference< XMultiServiceFactory uno::Any UnoDateFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) { uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( awt::XDateField*, this ) ); + (static_cast< awt::XDateField* >(this)) ); return (aRet.hasValue() ? aRet : UnoSpinFieldControl::queryAggregation( rType )); } @@ -3507,7 +3507,7 @@ UnoTimeFieldControl::UnoTimeFieldControl( const Reference< XMultiServiceFactory uno::Any UnoTimeFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) { uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( awt::XTimeField*, this ) ); + (static_cast< awt::XTimeField* >(this)) ); return (aRet.hasValue() ? aRet : UnoSpinFieldControl::queryAggregation( rType )); } @@ -3708,7 +3708,7 @@ UnoNumericFieldControl::UnoNumericFieldControl( const Reference< XMultiServiceFa uno::Any UnoNumericFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) { uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( awt::XNumericField*, this ) ); + (static_cast< awt::XNumericField* >(this)) ); return (aRet.hasValue() ? aRet : UnoSpinFieldControl::queryAggregation( rType )); } @@ -3910,7 +3910,7 @@ UnoCurrencyFieldControl::UnoCurrencyFieldControl( const Reference< XMultiService uno::Any UnoCurrencyFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) { uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( awt::XCurrencyField*, this ) ); + (static_cast< awt::XCurrencyField* >(this)) ); return (aRet.hasValue() ? aRet : UnoSpinFieldControl::queryAggregation( rType )); } @@ -4128,7 +4128,7 @@ void UnoPatternFieldControl::ImplSetPeerProperty( const ::rtl::OUString& rPropNa uno::Any UnoPatternFieldControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) { uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( awt::XPatternField*, this ) ); + (static_cast< awt::XPatternField* >(this)) ); return (aRet.hasValue() ? aRet : UnoSpinFieldControl::queryAggregation( rType )); } @@ -4250,7 +4250,7 @@ UnoProgressBarControl::UnoProgressBarControl( const Reference< XMultiServiceFact uno::Any UnoProgressBarControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) { uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( awt::XProgressBar*, this ) ); + (static_cast< awt::XProgressBar* >(this)) ); return (aRet.hasValue() ? aRet : UnoControlBase::queryAggregation( rType )); } diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx index c8dd4b19cbd1..cdcc9327e451 100644 --- a/toolkit/source/helper/listenermultiplexer.cxx +++ b/toolkit/source/helper/listenermultiplexer.cxx @@ -44,7 +44,7 @@ ListenerMultiplexerBase::~ListenerMultiplexerBase() // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any ListenerMultiplexerBase::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { - return ::cppu::queryInterface( rType, SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, this ) ); + return ::cppu::queryInterface( rType, (static_cast< ::com::sun::star::uno::XInterface* >(this)) ); } @@ -60,7 +60,7 @@ EventListenerMultiplexer::EventListenerMultiplexer( ::cppu::OWeakObject& rSource ::com::sun::star::uno::Any EventListenerMultiplexer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::lang::XEventListener*, this ) ); + (static_cast< ::com::sun::star::lang::XEventListener* >(this)) ); return (aRet.hasValue() ? aRet : ListenerMultiplexerBase::queryInterface( rType )); } diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index d6cbbfc02377..6b0c43367ac2 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -351,14 +351,14 @@ sal_Bool SAL_CALL ContentResultSetWrapper //list all interfaces inclusive baseclasses of interfaces QUERYINTERFACE_IMPL_START( ContentResultSetWrapper ) - SAL_STATIC_CAST( XComponent*, this ), - SAL_STATIC_CAST( XCloseable*, this ), - SAL_STATIC_CAST( XResultSetMetaDataSupplier*, this ), - SAL_STATIC_CAST( XPropertySet*, this ), + (static_cast< XComponent* >(this)), + (static_cast< XCloseable* >(this)), + (static_cast< XResultSetMetaDataSupplier* >(this)), + (static_cast< XPropertySet* >(this)), - SAL_STATIC_CAST( XContentAccess*, this ), - SAL_STATIC_CAST( XResultSet*, this ), - SAL_STATIC_CAST( XRow*, this ) + (static_cast< XContentAccess* >(this)), + (static_cast< XResultSet* >(this)), + (static_cast< XRow* >(this)) QUERYINTERFACE_IMPL_END @@ -1424,8 +1424,8 @@ QUERYINTERFACE_IMPL_START( ContentResultSetWrapperListener ) static_cast< XEventListener * >( static_cast< XPropertyChangeListener * >(this)) - , SAL_STATIC_CAST( XPropertyChangeListener*, this ) - , SAL_STATIC_CAST( XVetoableChangeListener*, this ) + , (static_cast< XPropertyChangeListener* >(this)) + , (static_cast< XVetoableChangeListener* >(this)) QUERYINTERFACE_IMPL_END diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index cbdf6dbefeb8..1bd35d0ac5e2 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -136,9 +136,9 @@ void SAL_CALL DynamicResultSetWrapper //-------------------------------------------------------------------------- //list all interfaces inclusive baseclasses of interfaces QUERYINTERFACE_IMPL_START( DynamicResultSetWrapper ) - SAL_STATIC_CAST( XComponent*, this ) //base of XDynamicResultSet - , SAL_STATIC_CAST( XDynamicResultSet*, this ) - , SAL_STATIC_CAST( XSourceInitialization*, this ) + (static_cast< XComponent* >(this)) //base of XDynamicResultSet + , (static_cast< XDynamicResultSet* >(this)) + , (static_cast< XSourceInitialization* >(this)) QUERYINTERFACE_IMPL_END //-------------------------------------------------------------------------- diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index 9e339ee09b92..417cd4aafb56 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -308,7 +308,7 @@ void SAL_CALL UniversalContentBroker::dispose() if ( m_pDisposeEventListeners && m_pDisposeEventListeners->getLength() ) { EventObject aEvt; - aEvt.Source = SAL_STATIC_CAST( XComponent*, this ); + aEvt.Source = (static_cast< XComponent* >(this)); m_pDisposeEventListeners->disposeAndClear( aEvt ); } diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 8c6e2e7a47f5..ad48bd416e66 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -163,16 +163,16 @@ BaseContent::queryInterface( const Type& rType ) throw( RuntimeException ) { Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( lang::XComponent*, this ), - SAL_STATIC_CAST( lang::XTypeProvider*, this ), - SAL_STATIC_CAST( lang::XServiceInfo*, this ), - SAL_STATIC_CAST( XCommandProcessor*, this ), - SAL_STATIC_CAST( container::XChild*, this ), - SAL_STATIC_CAST( beans::XPropertiesChangeNotifier*, this ), - SAL_STATIC_CAST( beans::XPropertyContainer*, this ), - SAL_STATIC_CAST( XContentCreator*,this ), - SAL_STATIC_CAST( beans::XPropertySetInfoChangeNotifier*, this ), - SAL_STATIC_CAST( XContent*,this) ); + (static_cast< lang::XComponent* >(this)), + (static_cast< lang::XTypeProvider* >(this)), + (static_cast< lang::XServiceInfo* >(this)), + (static_cast< XCommandProcessor* >(this)), + (static_cast< container::XChild* >(this)), + (static_cast< beans::XPropertiesChangeNotifier* >(this)), + (static_cast< beans::XPropertyContainer* >(this)), + (static_cast< XContentCreator* >(this)), + (static_cast< beans::XPropertySetInfoChangeNotifier* >(this)), + (static_cast< XContent* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx index 93a2a21531cf..36569bba64f9 100644 --- a/ucb/source/ucp/file/filcmd.cxx +++ b/ucb/source/ucp/file/filcmd.cxx @@ -72,7 +72,7 @@ XCommandInfo_impl::queryInterface( throw( uno::RuntimeException ) { uno::Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( XCommandInfo*,this) ); + (static_cast< XCommandInfo* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx index 77d06879bd3b..50200af6c656 100644 --- a/ucb/source/ucp/file/filid.cxx +++ b/ucb/source/ucp/file/filid.cxx @@ -84,8 +84,8 @@ FileContentIdentifier::queryInterface( throw( uno::RuntimeException ) { uno::Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( lang::XTypeProvider*, this), - SAL_STATIC_CAST( XContentIdentifier*, this) ); + (static_cast< lang::XTypeProvider* >(this)), + (static_cast< XContentIdentifier* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 1a2fc293bdb7..289450b523b3 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -112,9 +112,9 @@ XInputStream_impl::queryInterface( throw( uno::RuntimeException) { uno::Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( io::XInputStream*,this ), - SAL_STATIC_CAST( lang::XTypeProvider*,this ), - SAL_STATIC_CAST( io::XSeekable*,this ) ); + (static_cast< io::XInputStream* >(this)), + (static_cast< lang::XTypeProvider* >(this)), + (static_cast< io::XSeekable* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx index 0ab0aeab6aed..ea674c1cc692 100644 --- a/ucb/source/ucp/file/filinsreq.cxx +++ b/ucb/source/ucp/file/filinsreq.cxx @@ -70,8 +70,8 @@ XInteractionSupplyNameImpl::queryInterface( const Type& rType ) throw( RuntimeException ) { Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( lang::XTypeProvider*, this ), - SAL_STATIC_CAST( XInteractionSupplyName*,this) ); + (static_cast< lang::XTypeProvider* >(this)), + (static_cast< XInteractionSupplyName* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } @@ -109,8 +109,8 @@ XInteractionAbortImpl::queryInterface( const Type& rType ) throw( RuntimeException ) { Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( lang::XTypeProvider*, this ), - SAL_STATIC_CAST( XInteractionAbort*,this) ); + (static_cast< lang::XTypeProvider* >(this)), + (static_cast< XInteractionAbort* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } @@ -169,8 +169,8 @@ XInteractionRequestImpl::queryInterface( const Type& rType ) Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( lang::XTypeProvider*, this ), - SAL_STATIC_CAST( XInteractionRequest*,this) ); + (static_cast< lang::XTypeProvider* >(this)), + (static_cast< XInteractionRequest* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx index 27b630d05dfd..db2adf886c0a 100644 --- a/ucb/source/ucp/file/filprp.cxx +++ b/ucb/source/ucp/file/filprp.cxx @@ -110,8 +110,8 @@ XPropertySetInfo_impl::queryInterface( throw( RuntimeException ) { Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( lang::XTypeProvider*,this), - SAL_STATIC_CAST( beans::XPropertySetInfo*,this) ); + (static_cast< lang::XTypeProvider* >(this)), + (static_cast< beans::XPropertySetInfo* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx index e063c23702cd..a52b0700ce2c 100644 --- a/ucb/source/ucp/file/filrow.cxx +++ b/ucb/source/ucp/file/filrow.cxx @@ -115,8 +115,8 @@ XRow_impl::queryInterface( throw( uno::RuntimeException ) { uno::Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( lang::XTypeProvider*,this), - SAL_STATIC_CAST( sdbc::XRow*,this) ); + (static_cast< lang::XTypeProvider* >(this)), + (static_cast< sdbc::XRow* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index af0d34a7ce12..627536fa2031 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -135,16 +135,16 @@ XResultSet_impl::queryInterface( { uno::Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( lang::XComponent*, this), - SAL_STATIC_CAST( lang::XTypeProvider*, this), - SAL_STATIC_CAST( lang::XEventListener*, this), - SAL_STATIC_CAST( sdbc::XRow*, this), - SAL_STATIC_CAST( sdbc::XResultSet*, this), - SAL_STATIC_CAST( sdbc::XCloseable*, this), - SAL_STATIC_CAST( sdbc::XResultSetMetaDataSupplier*, this), - SAL_STATIC_CAST( beans::XPropertySet*, this ), - SAL_STATIC_CAST( ucb::XContentAccess*, this), - SAL_STATIC_CAST( ucb::XDynamicResultSet*,this) ); + (static_cast< lang::XComponent* >(this)), + (static_cast< lang::XTypeProvider* >(this)), + (static_cast< lang::XEventListener* >(this)), + (static_cast< sdbc::XRow* >(this)), + (static_cast< sdbc::XResultSet* >(this)), + (static_cast< sdbc::XCloseable* >(this)), + (static_cast< sdbc::XResultSetMetaDataSupplier* >(this)), + (static_cast< beans::XPropertySet* >(this)), + (static_cast< ucb::XContentAccess* >(this)), + (static_cast< ucb::XDynamicResultSet* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 1b3bb7f07fb4..2bec4c61bcea 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -53,13 +53,13 @@ XStream_impl::queryInterface( throw( uno::RuntimeException) { uno::Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( lang::XTypeProvider*,this ), - SAL_STATIC_CAST( io::XStream*,this ), - SAL_STATIC_CAST( io::XInputStream*,this ), - SAL_STATIC_CAST( io::XOutputStream*,this ), - SAL_STATIC_CAST( io::XSeekable*,this ), - SAL_STATIC_CAST( io::XTruncate*,this ), - SAL_STATIC_CAST( io::XAsyncOutputMonitor*,this ) ); + (static_cast< lang::XTypeProvider* >(this)), + (static_cast< io::XStream* >(this)), + (static_cast< io::XInputStream* >(this)), + (static_cast< io::XOutputStream* >(this)), + (static_cast< io::XSeekable* >(this)), + (static_cast< io::XTruncate* >(this)), + (static_cast< io::XAsyncOutputMonitor* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index bd9889e8063e..ae819bdde75e 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -132,13 +132,13 @@ FileProvider::queryInterface( { Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( XContentProvider*, this ), - SAL_STATIC_CAST( XInitialization*, this ), - SAL_STATIC_CAST( XContentIdentifierFactory*, this ), - SAL_STATIC_CAST( XServiceInfo*, this ), - SAL_STATIC_CAST( XTypeProvider*, this ), - SAL_STATIC_CAST( XFileIdentifierConverter*,this ), - SAL_STATIC_CAST( XPropertySet*, this ) ); + (static_cast< XContentProvider* >(this)), + (static_cast< XInitialization* >(this)), + (static_cast< XContentIdentifierFactory* >(this)), + (static_cast< XServiceInfo* >(this)), + (static_cast< XTypeProvider* >(this)), + (static_cast< XFileIdentifierConverter* >(this)), + (static_cast< XPropertySet* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } @@ -452,7 +452,7 @@ XPropertySetInfoImpl2::queryInterface( throw( RuntimeException ) { Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( XPropertySetInfo*,this) ); + (static_cast< XPropertySetInfo* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx index 94a3d84bcc01..9e76eee96cda 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx @@ -64,8 +64,8 @@ FTPContentIdentifier::queryInterface( { Any aRet = ::cppu::queryInterface(rType, - SAL_STATIC_CAST(XTypeProvider*,this), - SAL_STATIC_CAST(XContentIdentifier*,this)); + (static_cast< XTypeProvider* >(this)), + (static_cast< XContentIdentifier* >(this))); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx index 47da4e36dbd8..45a6dde67945 100644 --- a/ucb/source/ucp/ftp/ftpintreq.cxx +++ b/ucb/source/ucp/ftp/ftpintreq.cxx @@ -69,8 +69,8 @@ XInteractionApproveImpl::queryInterface( const Type& rType ) { Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( lang::XTypeProvider*, this ), - SAL_STATIC_CAST( XInteractionApprove*,this) ); + (static_cast< lang::XTypeProvider* >(this)), + (static_cast< XInteractionApprove* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } @@ -128,8 +128,8 @@ XInteractionDisapproveImpl::queryInterface( const Type& rType ) { Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( lang::XTypeProvider*, this ), - SAL_STATIC_CAST( XInteractionDisapprove*,this) ); + (static_cast< lang::XTypeProvider* >(this)), + (static_cast< XInteractionDisapprove* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } @@ -188,8 +188,8 @@ XInteractionRequestImpl::queryInterface( const Type& rType ) { Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( lang::XTypeProvider*, this ), - SAL_STATIC_CAST( XInteractionRequest*,this) ); + (static_cast< lang::XTypeProvider* >(this)), + (static_cast< XInteractionRequest* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index 641701600399..8d8d73f28fc3 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -94,12 +94,12 @@ ResultSetBase::queryInterface( { uno::Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( lang::XComponent*, this), - SAL_STATIC_CAST( sdbc::XRow*, this), - SAL_STATIC_CAST( sdbc::XResultSet*, this), - SAL_STATIC_CAST( sdbc::XResultSetMetaDataSupplier*, this), - SAL_STATIC_CAST( beans::XPropertySet*, this ), - SAL_STATIC_CAST( ucb::XContentAccess*, this) ); + (static_cast< lang::XComponent* >(this)), + (static_cast< sdbc::XRow* >(this)), + (static_cast< sdbc::XResultSet* >(this)), + (static_cast< sdbc::XResultSetMetaDataSupplier* >(this)), + (static_cast< beans::XPropertySet* >(this)), + (static_cast< ucb::XContentAccess* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } @@ -468,7 +468,7 @@ public: { uno::Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( beans::XPropertySetInfo*, this ) ); + (static_cast< beans::XPropertySetInfo* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/ucb/source/ucp/ftp/test_activedatasink.cxx b/ucb/source/ucp/ftp/test_activedatasink.cxx index 29b78dcdc3a6..6acc7ee9bf84 100644 --- a/ucb/source/ucp/ftp/test_activedatasink.cxx +++ b/ucb/source/ucp/ftp/test_activedatasink.cxx @@ -43,7 +43,7 @@ using namespace com::sun::star::io; Any SAL_CALL Test_ActiveDataSink::queryInterface( const Type& rType ) throw( RuntimeException ) { Any aRet = ::cppu::queryInterface(rType, - SAL_STATIC_CAST( XActiveDataSink*,this )); + (static_cast< XActiveDataSink* >(this))); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/ucb/source/ucp/ftp/test_multiservicefac.cxx b/ucb/source/ucp/ftp/test_multiservicefac.cxx index acbfe6510848..79429a4276ab 100644 --- a/ucb/source/ucp/ftp/test_multiservicefac.cxx +++ b/ucb/source/ucp/ftp/test_multiservicefac.cxx @@ -48,9 +48,7 @@ Test_MultiServiceFactory::queryInterface( RuntimeException ) { - Any aRet = ::cppu::queryInterface(rType, - SAL_STATIC_CAST( XMultiServiceFactory*, - this )); + Any aRet = ::cppu::queryInterface(rType, (static_cast< XMultiServiceFactory* >( this )) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); diff --git a/ucbhelper/inc/ucbhelper/macros.hxx b/ucbhelper/inc/ucbhelper/macros.hxx index 302be2132f05..4fa1c817344e 100644 --- a/ucbhelper/inc/ucbhelper/macros.hxx +++ b/ucbhelper/inc/ucbhelper/macros.hxx @@ -100,210 +100,210 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface( \ #define XINTERFACE_IMPL_1( Class, Ifc1 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( Ifc1*, this ) \ + (static_cast< Ifc1* >(this)) \ QUERYINTERFACE_IMPL_END // 2 interfaces implemented #define XINTERFACE_IMPL_2( Class, Ifc1, Ifc2 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( Ifc1*, this ), \ - SAL_STATIC_CAST( Ifc2*, this ) \ + (static_cast< Ifc1* >(this)), \ + (static_cast< Ifc2* >(this)) \ QUERYINTERFACE_IMPL_END // 3 interfaces implemented #define XINTERFACE_IMPL_3( Class, Ifc1, Ifc2, Ifc3 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( Ifc1*, this ), \ - SAL_STATIC_CAST( Ifc2*, this ), \ - SAL_STATIC_CAST( Ifc3*, this ) \ + (static_cast< Ifc1* >(this)), \ + (static_cast< Ifc2* >(this)), \ + (static_cast< Ifc3* >(this)) \ QUERYINTERFACE_IMPL_END // 4 interfaces implemented #define XINTERFACE_IMPL_4( Class, Ifc1, Ifc2, Ifc3, Ifc4 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( Ifc1*, this ), \ - SAL_STATIC_CAST( Ifc2*, this ), \ - SAL_STATIC_CAST( Ifc3*, this ), \ - SAL_STATIC_CAST( Ifc4*, this ) \ + (static_cast< Ifc1* >(this)), \ + (static_cast< Ifc2* >(this)), \ + (static_cast< Ifc3* >(this)), \ + (static_cast< Ifc4* >(this)) \ QUERYINTERFACE_IMPL_END // 5 interfaces implemented #define XINTERFACE_IMPL_5( Class, Ifc1, Ifc2, Ifc3, Ifc4, Ifc5 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( Ifc1*, this ), \ - SAL_STATIC_CAST( Ifc2*, this ), \ - SAL_STATIC_CAST( Ifc3*, this ), \ - SAL_STATIC_CAST( Ifc4*, this ), \ - SAL_STATIC_CAST( Ifc5*, this ) \ + (static_cast< Ifc1* >(this)), \ + (static_cast< Ifc2* >(this)), \ + (static_cast< Ifc3* >(this)), \ + (static_cast< Ifc4* >(this)), \ + (static_cast< Ifc5* >(this)) \ QUERYINTERFACE_IMPL_END // 6 interfaces implemented #define XINTERFACE_IMPL_6( Class,I1,I2,I3,I4,I5,I6 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ) \ + (static_cast< I1* >(this)), \ + (static_cast< I2* >(this)), \ + (static_cast< I3* >(this)), \ + (static_cast< I4* >(this)), \ + (static_cast< I5* >(this)), \ + (static_cast< I6* >(this)) \ QUERYINTERFACE_IMPL_END // 7 interfaces implemented #define XINTERFACE_IMPL_7( Class,I1,I2,I3,I4,I5,I6,I7 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ) \ + (static_cast< I1* >(this)), \ + (static_cast< I2* >(this)), \ + (static_cast< I3* >(this)), \ + (static_cast< I4* >(this)), \ + (static_cast< I5* >(this)), \ + (static_cast< I6* >(this)), \ + (static_cast< I7* >(this)) \ QUERYINTERFACE_IMPL_END // 8 interfaces implemented #define XINTERFACE_IMPL_8( Class,I1,I2,I3,I4,I5,I6,I7,I8 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ), \ - SAL_STATIC_CAST( I8*, this ) \ + (static_cast< I1* >(this)), \ + (static_cast< I2* >(this)), \ + (static_cast< I3* >(this)), \ + (static_cast< I4* >(this)), \ + (static_cast< I5* >(this)), \ + (static_cast< I6* >(this)), \ + (static_cast< I7* >(this)), \ + (static_cast< I8* >(this)) \ QUERYINTERFACE_IMPL_END // 9 interfaces implemented #define XINTERFACE_IMPL_9( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ), \ - SAL_STATIC_CAST( I8*, this ), \ - SAL_STATIC_CAST( I9*, this ) \ + (static_cast< I1* >(this)), \ + (static_cast< I2* >(this)), \ + (static_cast< I3* >(this)), \ + (static_cast< I4* >(this)), \ + (static_cast< I5* >(this)), \ + (static_cast< I6* >(this)), \ + (static_cast< I7* >(this)), \ + (static_cast< I8* >(this)), \ + (static_cast< I9* >(this)) \ QUERYINTERFACE_IMPL_END // 10 interfaces implemented #define XINTERFACE_IMPL_10( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ), \ - SAL_STATIC_CAST( I8*, this ), \ - SAL_STATIC_CAST( I9*, this ), \ - SAL_STATIC_CAST( I10*, this ) \ + (static_cast< I1* >(this)), \ + (static_cast< I2* >(this)), \ + (static_cast< I3* >(this)), \ + (static_cast< I4* >(this)), \ + (static_cast< I5* >(this)), \ + (static_cast< I6* >(this)), \ + (static_cast< I7* >(this)), \ + (static_cast< I8* >(this)), \ + (static_cast< I9* >(this)), \ + (static_cast< I10* >(this)) \ QUERYINTERFACE_IMPL_END // 11 interfaces implemented #define XINTERFACE_IMPL_11( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ), \ - SAL_STATIC_CAST( I8*, this ), \ - SAL_STATIC_CAST( I9*, this ), \ - SAL_STATIC_CAST( I10*, this ), \ - SAL_STATIC_CAST( I11*, this ) \ + (static_cast< I1* >(this)), \ + (static_cast< I2* >(this)), \ + (static_cast< I3* >(this)), \ + (static_cast< I4* >(this)), \ + (static_cast< I5* >(this)), \ + (static_cast< I6* >(this)), \ + (static_cast< I7* >(this)), \ + (static_cast< I8* >(this)), \ + (static_cast< I9* >(this)), \ + (static_cast< I10* >(this)), \ + (static_cast< I11* >(this)) \ QUERYINTERFACE_IMPL_END // 12 interfaces implemented #define XINTERFACE_IMPL_12( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ), \ - SAL_STATIC_CAST( I8*, this ), \ - SAL_STATIC_CAST( I9*, this ), \ - SAL_STATIC_CAST( I10*, this ), \ - SAL_STATIC_CAST( I11*, this ), \ - SAL_STATIC_CAST( I12*, this ) \ + (static_cast< I1* >(this)), \ + (static_cast< I2* >(this)), \ + (static_cast< I3* >(this)), \ + (static_cast< I4* >(this)), \ + (static_cast< I5* >(this)), \ + (static_cast< I6* >(this)), \ + (static_cast< I7* >(this)), \ + (static_cast< I8* >(this)), \ + (static_cast< I9* >(this)), \ + (static_cast< I10* >(this)), \ + (static_cast< I11* >(this)), \ + (static_cast< I12* >(this)) \ QUERYINTERFACE_IMPL_END // 13 interfaces implemented #define XINTERFACE_IMPL_13( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ), \ - SAL_STATIC_CAST( I8*, this ), \ - SAL_STATIC_CAST( I9*, this ), \ - SAL_STATIC_CAST( I10*, this ), \ - SAL_STATIC_CAST( I11*, this ), \ - SAL_STATIC_CAST( I12*, this ), \ - SAL_STATIC_CAST( I13*, this ) \ + (static_cast< I1* >(this)), \ + (static_cast< I2* >(this)), \ + (static_cast< I3* >(this)), \ + (static_cast< I4* >(this)), \ + (static_cast< I5* >(this)), \ + (static_cast< I6* >(this)), \ + (static_cast< I7* >(this)), \ + (static_cast< I8* >(this)), \ + (static_cast< I9* >(this)), \ + (static_cast< I10* >(this)), \ + (static_cast< I11* >(this)), \ + (static_cast< I12* >(this)), \ + (static_cast< I13* >(this)) \ QUERYINTERFACE_IMPL_END // 14 interfaces implemented #define XINTERFACE_IMPL_14( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ), \ - SAL_STATIC_CAST( I8*, this ), \ - SAL_STATIC_CAST( I9*, this ), \ - SAL_STATIC_CAST( I10*, this ), \ - SAL_STATIC_CAST( I11*, this ), \ - SAL_STATIC_CAST( I12*, this ), \ - SAL_STATIC_CAST( I13*, this ), \ - SAL_STATIC_CAST( I14*, this ) \ + (static_cast< I1* >(this)), \ + (static_cast< I2* >(this)), \ + (static_cast< I3* >(this)), \ + (static_cast< I4* >(this)), \ + (static_cast< I5* >(this)), \ + (static_cast< I6* >(this)), \ + (static_cast< I7* >(this)), \ + (static_cast< I8* >(this)), \ + (static_cast< I9* >(this)), \ + (static_cast< I10* >(this)), \ + (static_cast< I11* >(this)), \ + (static_cast< I12* >(this)), \ + (static_cast< I13* >(this)), \ + (static_cast< I14* >(this)) \ QUERYINTERFACE_IMPL_END // 15 interfaces implemented #define XINTERFACE_IMPL_15( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9,I10,I11,I12,I13,I14,I15 ) \ XINTERFACE_COMMON_IMPL( Class ) \ QUERYINTERFACE_IMPL_START( Class ) \ - SAL_STATIC_CAST( I1*, this ), \ - SAL_STATIC_CAST( I2*, this ), \ - SAL_STATIC_CAST( I3*, this ), \ - SAL_STATIC_CAST( I4*, this ), \ - SAL_STATIC_CAST( I5*, this ), \ - SAL_STATIC_CAST( I6*, this ), \ - SAL_STATIC_CAST( I7*, this ), \ - SAL_STATIC_CAST( I8*, this ), \ - SAL_STATIC_CAST( I9*, this ), \ - SAL_STATIC_CAST( I10*, this ), \ - SAL_STATIC_CAST( I11*, this ), \ - SAL_STATIC_CAST( I12*, this ), \ - SAL_STATIC_CAST( I13*, this ), \ - SAL_STATIC_CAST( I14*, this ), \ - SAL_STATIC_CAST( I15*, this ) \ + (static_cast< I1* >(this)), \ + (static_cast< I2* >(this)), \ + (static_cast< I3* >(this)), \ + (static_cast< I4* >(this)), \ + (static_cast< I5* >(this)), \ + (static_cast< I6* >(this)), \ + (static_cast< I7* >(this)), \ + (static_cast< I8* >(this)), \ + (static_cast< I9* >(this)), \ + (static_cast< I10* >(this)), \ + (static_cast< I11* >(this)), \ + (static_cast< I12* >(this)), \ + (static_cast< I13* >(this)), \ + (static_cast< I14* >(this)), \ + (static_cast< I15* >(this)) \ QUERYINTERFACE_IMPL_END //========================================================================= diff --git a/ucbhelper/source/provider/fd_inputstream.cxx b/ucbhelper/source/provider/fd_inputstream.cxx index d7f0be087615..cc7cdad266e6 100644 --- a/ucbhelper/source/provider/fd_inputstream.cxx +++ b/ucbhelper/source/provider/fd_inputstream.cxx @@ -66,8 +66,8 @@ namespace ucbhelper ) { Any aRet = ::cppu::queryInterface(rType, - SAL_STATIC_CAST( XInputStream*,this ), - SAL_STATIC_CAST( XSeekable*,this ) ); + (static_cast< XInputStream* >(this)), + (static_cast< XSeekable* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/unotools/inc/unotools/ucblockbytes.hxx b/unotools/inc/unotools/ucblockbytes.hxx index 9ac68b3d4447..fa69b87bf3bb 100644 --- a/unotools/inc/unotools/ucblockbytes.hxx +++ b/unotools/inc/unotools/ucblockbytes.hxx @@ -177,25 +177,25 @@ public: ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > getInputStream_Impl() const { - osl::MutexGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex ); + osl::MutexGuard aGuard( (const_cast< UcbLockBytes* >(this))->m_aMutex ); return m_xInputStream; } ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > getOutputStream_Impl() const { - osl::MutexGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex ); + osl::MutexGuard aGuard( (const_cast< UcbLockBytes* >(this))->m_aMutex ); return m_xOutputStream; } ::com::sun::star::uno::Reference < ::com::sun::star::io::XSeekable > getSeekable_Impl() const { - osl::MutexGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex ); + osl::MutexGuard aGuard( (const_cast< UcbLockBytes* >(this))->m_aMutex ); return m_xSeekable; } sal_Bool hasInputStream_Impl() const { - osl::MutexGuard aGuard( SAL_CONST_CAST(UcbLockBytes*, this)->m_aMutex ); + osl::MutexGuard aGuard( (const_cast< UcbLockBytes* >(this))->m_aMutex ); return m_xInputStream.is(); } diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx index 74a1ed14b984..416ac943b553 100644 --- a/unotools/source/config/xmlaccelcfg.cxx +++ b/unotools/source/config/xmlaccelcfg.cxx @@ -198,7 +198,7 @@ void AttributeListImpl::clear() Any SAL_CALL OReadAccelatorDocumentHandler::queryInterface( const Type & rType ) throw( RuntimeException ) { - Any a = ::cppu::queryInterface( rType ,SAL_STATIC_CAST( XDocumentHandler*, this )); + Any a = ::cppu::queryInterface( rType ,(static_cast< XDocumentHandler* >(this))); if ( a.hasValue() ) return a; else diff --git a/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx index b940ab7d9a5e..2ee02449773f 100644 --- a/vcl/source/app/dndhelp.cxx +++ b/vcl/source/app/dndhelp.cxx @@ -94,10 +94,10 @@ vcl::unohelper::DragAndDropWrapper::~DragAndDropWrapper() uno::Any vcl::unohelper::DragAndDropWrapper::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) { uno::Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( ::com::sun::star::lang::XEventListener*, (::com::sun::star::datatransfer::dnd::XDragGestureListener*)this ), - SAL_STATIC_CAST( ::com::sun::star::datatransfer::dnd::XDragGestureListener*, this ), - SAL_STATIC_CAST( ::com::sun::star::datatransfer::dnd::XDragSourceListener*, this ), - SAL_STATIC_CAST( ::com::sun::star::datatransfer::dnd::XDropTargetListener*, this ) ); + (static_cast< ::com::sun::star::lang::XEventListener* >( (::com::sun::star::datatransfer::dnd::XDragGestureListener*)this) ), + (static_cast< ::com::sun::star::datatransfer::dnd::XDragGestureListener* >(this)), + (static_cast< ::com::sun::star::datatransfer::dnd::XDragSourceListener* >(this)), + (static_cast< ::com::sun::star::datatransfer::dnd::XDropTargetListener* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx index d1f3fe14aaa8..884290876e07 100644 --- a/vcl/source/app/unohelp2.cxx +++ b/vcl/source/app/unohelp2.cxx @@ -74,7 +74,7 @@ namespace vcl { namespace unohelper { // ::com::sun::star::uno::XInterface uno::Any TextDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) { - uno::Any aRet = ::cppu::queryInterface( rType, SAL_STATIC_CAST( datatransfer::XTransferable*, this ) ); + uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< datatransfer::XTransferable* >(this)) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx index 15a5c0388b21..4384a2cfedca 100644 --- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx @@ -105,8 +105,8 @@ BufferedInputStream::~BufferedInputStream() Any SAL_CALL BufferedInputStream::queryInterface( const Type& rType ) throw( RuntimeException ) { Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( XInputStream*,this ), - SAL_STATIC_CAST( XSeekable*,this ) ); + (static_cast< XInputStream* >(this)), + (static_cast< XSeekable* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx index 58ae720b7d11..e48529505585 100644 --- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx +++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx @@ -62,8 +62,8 @@ XInputStream_impl::queryInterface( throw( uno::RuntimeException) { uno::Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( io::XInputStream*,this ), - SAL_STATIC_CAST( io::XSeekable*,this ) ); + (static_cast< io::XInputStream* >(this)), + (static_cast< io::XSeekable* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx index 7a7f93555a7d..d209bb63d5f3 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx @@ -93,12 +93,12 @@ ResultSetBase::queryInterface( throw( uno::RuntimeException ) { uno::Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( lang::XComponent*, this), - SAL_STATIC_CAST( sdbc::XRow*, this), - SAL_STATIC_CAST( sdbc::XResultSet*, this), - SAL_STATIC_CAST( sdbc::XResultSetMetaDataSupplier*, this), - SAL_STATIC_CAST( beans::XPropertySet*, this ), - SAL_STATIC_CAST( ucb::XContentAccess*, this) ); + (static_cast< lang::XComponent* >(this)), + (static_cast< sdbc::XRow* >(this)), + (static_cast< sdbc::XResultSet* >(this)), + (static_cast< sdbc::XResultSetMetaDataSupplier* >(this)), + (static_cast< beans::XPropertySet* >(this)), + (static_cast< ucb::XContentAccess* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } @@ -461,7 +461,7 @@ public: throw( uno::RuntimeException ) { uno::Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( beans::XPropertySetInfo*, this ) ); + (static_cast< beans::XPropertySetInfo* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index a7187e71b098..29bdc809e4a2 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -1082,8 +1082,8 @@ InputStreamTransformer::~InputStreamTransformer() Any SAL_CALL InputStreamTransformer::queryInterface( const Type& rType ) throw( RuntimeException ) { Any aRet = ::cppu::queryInterface( rType, - SAL_STATIC_CAST( XInputStream*,this ), - SAL_STATIC_CAST( XSeekable*,this ) ); + (static_cast< XInputStream* >(this)), + (static_cast< XSeekable* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index 6f8ca210c424..ffebbd1434c5 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -82,9 +82,9 @@ TVFactory::queryInterface( throw( RuntimeException ) { Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( XServiceInfo*, this ), - SAL_STATIC_CAST( XTypeProvider*, this ), - SAL_STATIC_CAST( XMultiServiceFactory*, this ) ); + (static_cast< XServiceInfo* >(this)), + (static_cast< XTypeProvider* >(this)), + (static_cast< XMultiServiceFactory* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 46736516fdf4..af4be054b32e 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -268,11 +268,11 @@ TVBase::queryInterface( throw( RuntimeException ) { Any aRet = cppu::queryInterface( rType, - SAL_STATIC_CAST( XTypeProvider*, this ), - SAL_STATIC_CAST( XNameAccess*, this ), - SAL_STATIC_CAST( XHierarchicalNameAccess*, this ), - SAL_STATIC_CAST( XChangesNotifier*, this ), - SAL_STATIC_CAST( XComponent*, this ) ); + (static_cast< XTypeProvider* >(this)), + (static_cast< XNameAccess* >(this)), + (static_cast< XHierarchicalNameAccess* >(this)), + (static_cast< XChangesNotifier* >(this)), + (static_cast< XComponent* >(this)) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } |