[Libreoffice-commits] .: animations/source bridges/test cppuhelper/source cppuhelper/test cui/source editeng/source extensions/workben forms/source framework/source io/source io/test sal/inc sax/source sax/test sfx2/source stoc/source svl/inc svl/source svtools/source toolkit/inc toolkit/source ucbhelper/inc ucbhelper/source ucb/source UnoControls/source unotools/inc unotools/source vcl/source xmlhelp/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Fri May 4 06:53:18 PDT 2012
UnoControls/source/controls/framecontrol.cxx | 2
animations/source/animcore/animcore.cxx | 2
bridges/test/testcomp.cxx | 8
cppuhelper/source/propshlp.cxx | 2
cppuhelper/test/testpropshlp.cxx | 6
cui/source/options/cfgchart.cxx | 3
cui/source/options/optchart.cxx | 4
editeng/source/editeng/eeobj.cxx | 2
extensions/workben/testpgp.cxx | 8
forms/source/component/imgprod.cxx | 4
framework/source/classes/menumanager.cxx | 10
framework/source/dispatch/menudispatcher.cxx | 2
framework/source/fwe/classes/actiontriggercontainer.cxx | 4
framework/source/fwe/classes/actiontriggerpropertyset.cxx | 4
framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx | 4
framework/source/fwe/classes/rootactiontriggercontainer.cxx | 10
framework/source/fwe/helper/propertysetcontainer.cxx | 8
framework/source/layoutmanager/layoutmanager.cxx | 4
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 6
framework/source/uielement/controlmenucontroller.cxx | 4
framework/source/uielement/fontmenucontroller.cxx | 4
framework/source/uielement/fontsizemenucontroller.cxx | 4
framework/source/uielement/langselectionmenucontroller.cxx | 4
framework/source/uielement/menubarmanager.cxx | 12
framework/source/uielement/toolbarsmenucontroller.cxx | 4
framework/source/uielement/toolbarwrapper.cxx | 2
io/source/stm/odata.cxx | 16
io/source/stm/omark.cxx | 8
io/source/stm/opipe.cxx | 6
io/test/stm/datatest.cxx | 6
io/test/stm/marktest.cxx | 4
io/test/stm/pipetest.cxx | 2
sal/inc/sal/types.h | 10
sax/source/expatwrap/saxwriter.cxx | 2
sax/test/sax/testsax.cxx | 2
sfx2/source/appl/sfxhelp.cxx | 4
sfx2/source/toolbox/tbxitem.cxx | 4
sfx2/source/view/sfxbasecontroller.cxx | 2
stoc/source/corereflection/criface.cxx | 4
stoc/source/inspect/introspection.cxx | 2
stoc/source/invocation/invocation.cxx | 22
stoc/source/servicemanager/servicemanager.cxx | 10
svl/inc/svl/ilstitem.hxx | 2
svl/source/items/cintitem.cxx | 24 -
svl/source/items/cntwall.cxx | 2
svl/source/items/ctypeitm.cxx | 4
svl/source/items/custritm.cxx | 2
svl/source/items/intitem.cxx | 6
svl/source/items/sfontitm.cxx | 4
svl/source/items/slstitm.cxx | 2
svl/source/items/visitem.cxx | 2
svtools/source/edit/textview.cxx | 2
svtools/source/graphic/provider.cxx | 2
svtools/source/graphic/renderer.cxx | 2
svtools/source/uno/contextmenuhelper.cxx | 4
svtools/source/uno/unoiface.cxx | 26 -
toolkit/inc/toolkit/helper/macros.hxx | 4
toolkit/source/awt/vclxbitmap.cxx | 8
toolkit/source/awt/vclxcontainer.cxx | 4
toolkit/source/awt/vclxdevice.cxx | 8
toolkit/source/awt/vclxfont.cxx | 8
toolkit/source/awt/vclxgraphics.cxx | 6
toolkit/source/awt/vclxmenu.cxx | 32 -
toolkit/source/awt/vclxpointer.cxx | 6
toolkit/source/awt/vclxprinter.cxx | 16
toolkit/source/awt/vclxregion.cxx | 6
toolkit/source/awt/vclxsystemdependentwindow.cxx | 2
toolkit/source/awt/vclxwindows.cxx | 42 -
toolkit/source/controls/dialogcontrol.cxx | 2
toolkit/source/controls/stdtabcontroller.cxx | 6
toolkit/source/controls/stdtabcontrollermodel.cxx | 8
toolkit/source/controls/tkscrollbar.cxx | 4
toolkit/source/controls/unocontrolcontainer.cxx | 6
toolkit/source/controls/unocontrols.cxx | 28 -
toolkit/source/helper/listenermultiplexer.cxx | 4
ucb/source/cacher/contentresultsetwrapper.cxx | 18
ucb/source/cacher/dynamicresultsetwrapper.cxx | 6
ucb/source/core/ucb.cxx | 2
ucb/source/ucp/file/bc.cxx | 20
ucb/source/ucp/file/filcmd.cxx | 2
ucb/source/ucp/file/filid.cxx | 4
ucb/source/ucp/file/filinpstr.cxx | 6
ucb/source/ucp/file/filinsreq.cxx | 12
ucb/source/ucp/file/filprp.cxx | 4
ucb/source/ucp/file/filrow.cxx | 4
ucb/source/ucp/file/filrset.cxx | 20
ucb/source/ucp/file/filstr.cxx | 14
ucb/source/ucp/file/prov.cxx | 16
ucb/source/ucp/ftp/ftpcontentidentifier.cxx | 4
ucb/source/ucp/ftp/ftpintreq.cxx | 12
ucb/source/ucp/ftp/ftpresultsetbase.cxx | 14
ucb/source/ucp/ftp/test_activedatasink.cxx | 2
ucb/source/ucp/ftp/test_multiservicefac.cxx | 4
ucbhelper/inc/ucbhelper/macros.hxx | 240 +++++-----
ucbhelper/source/provider/fd_inputstream.cxx | 4
unotools/inc/unotools/ucblockbytes.hxx | 8
unotools/source/config/xmlaccelcfg.cxx | 2
vcl/source/app/dndhelp.cxx | 8
vcl/source/app/unohelp2.cxx | 2
xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx | 4
xmlhelp/source/cxxhelp/provider/inputstream.cxx | 4
xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 14
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 4
xmlhelp/source/treeview/tvfactory.cxx | 6
xmlhelp/source/treeview/tvread.cxx | 10
105 files changed, 485 insertions(+), 500 deletions(-)
New commits:
commit 135c63c8f9cc363c0895542b0f3bed48b61ea836
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri May 4 15:51:56 2012 +0200
fdo#48253 Expand SAL_STATIC_CAST and SAL_CONST_CAST
Change-Id: I50f0887ceb4517d7ef234f970ca2ba679d533382
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 71911a9..02f33d8 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 e85b806..e1de974 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 0883936..914ca82 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 f1ce426..0823419 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 858668f..2c3cc5a 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 2556df1..41c9f59 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 da24c88..e188ca0 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 a290f8b..0d50254 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 bae34b1..e6499dd 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 674dbec..be28430 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 f1e1051..8319bec 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 969d68f..7a46065 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 2243973..b3b5e12 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 51a8671..3aee88f 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 d188cea..ad5fc30 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 cfc8709..0e6348b 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 86872b2..b61e2a5 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 082d242..993fb2f 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 0845c00..449610d 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 53a4483..b356448 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 a31b9f9..1c437f8 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 3016cff..dc60f11 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 2a9e54f..f0917fb 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 f1075e9..0a3922d 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 d500be3..ca442fb 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 d9e2790..212884d 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 5583e24..3e40e25 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 49fa8e2..4070f52 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 9de67a9..5d9fd0f 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 4504403..7a54cd2 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 ab1d771..d0d9976 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 ebb89e6..c67ff9a 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 288c2e7..3db8cf4 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 e80b8bd..287e2f7 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 aad3b9e..dd2e5c3 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 1335e1f..6b3d699 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 1bdeddd..25ef143 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 9013a67..d1bab10 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 ce4f151..447a080 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 207088d..c0417cb 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 e54fb6f..4254c5b 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 55ee0d9..152fe8d 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 2973c06..55abfbb 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 4584d99..ea64d64 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 3eb89d8..92bdff9 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 bb8fc94..9cf67a1 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 7c71b67..cccd70b 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 abe1586..e784467 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 1077c93..226208f 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 d12ab3e..bc7efbe 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 6453efc..016bdb6 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 c776702..7e2955d 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 bbc2bc7..9b8c775 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 07e054d..1b0a46c 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 22d361a..6d8578e 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 fc48708..cdb58e6 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 3d59e60..01d5705 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 f86d430..8d6cdd5 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 5f4685c..7f48b8d 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 73adaa1..e73b1f2 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 d44e68b..6b9e9ce 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 8923ea3..2def418 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 26e3900..d45d5dc 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 0a64651..d2fda84 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 25a6efb..f76a381 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 8c2c739..59611eb 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 2e96582..660ca89 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 b8d13e2..596e411 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 ca4d270..e50d968 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 22c1f32..72c28a0 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 f706dcb..b59f1cb 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 91fcda5..004fe62 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 a10a799..c3e3e03 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
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list