From 7aa7f4d9e4294959748bccf9e763154740251635 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 4 Sep 2017 08:53:38 +0200 Subject: loplugin:unnecessaryparen include c++ casts Change-Id: I132d3c66f0562e2c37a02eaf4c168d06c2b473eb Reviewed-on: https://gerrit.libreoffice.org/41874 Tested-by: Jenkins Reviewed-by: Noel Grandin --- 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 | 20 +++++------ toolkit/source/awt/vclxregion.cxx | 6 ++-- toolkit/source/awt/vclxsystemdependentwindow.cxx | 2 +- toolkit/source/awt/vclxwindows.cxx | 41 +++++++++++------------ toolkit/source/controls/dialogcontrol.cxx | 3 +- 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 +-- 16 files changed, 81 insertions(+), 81 deletions(-) (limited to 'toolkit') diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx index 4e0143dadc72..da0f08382a36 100644 --- a/toolkit/source/awt/vclxbitmap.cxx +++ b/toolkit/source/awt/vclxbitmap.cxx @@ -33,10 +33,10 @@ css::uno::Any VCLXBitmap::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XBitmap* >(this)), - (static_cast< css::awt::XDisplayBitmap* >(this)), - (static_cast< css::lang::XUnoTunnel* >(this)), - (static_cast< css::lang::XTypeProvider* >(this)) ); + static_cast< css::awt::XBitmap* >(this), + static_cast< css::awt::XDisplayBitmap* >(this), + static_cast< css::lang::XUnoTunnel* >(this), + static_cast< css::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 ec437aadae06..c994a808c564 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -51,8 +51,8 @@ VCLXContainer::~VCLXContainer() css::uno::Any VCLXContainer::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XVclContainer* >(this)), - (static_cast< css::awt::XVclContainerPeer* >(this)) ); + static_cast< css::awt::XVclContainer* >(this), + static_cast< css::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 7c6567f5a771..b6c3fb7f5c05 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -57,10 +57,10 @@ VCLXDevice::~VCLXDevice() css::uno::Any VCLXDevice::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XDevice* >(this)), - (static_cast< css::lang::XUnoTunnel* >(this)), - (static_cast< css::lang::XTypeProvider* >(this)), - (static_cast< css::awt::XUnitConversion* >(this)) ); + static_cast< css::awt::XDevice* >(this), + static_cast< css::lang::XUnoTunnel* >(this), + static_cast< css::lang::XTypeProvider* >(this), + static_cast< css::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 8bd86eb79905..5f8ca8b626ef 100644 --- a/toolkit/source/awt/vclxfont.cxx +++ b/toolkit/source/awt/vclxfont.cxx @@ -73,10 +73,10 @@ bool VCLXFont::ImplAssertValidFontMetric() css::uno::Any VCLXFont::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XFont* >(this)), - (static_cast< css::awt::XFont2* >(this)), - (static_cast< css::lang::XUnoTunnel* >(this)), - (static_cast< css::lang::XTypeProvider* >(this)) ); + static_cast< css::awt::XFont* >(this), + static_cast< css::awt::XFont2* >(this), + static_cast< css::lang::XUnoTunnel* >(this), + static_cast< css::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 5bb70dbbb7a7..6d8559b25820 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -44,9 +44,9 @@ using namespace com::sun::star; uno::Any VCLXGraphics::queryInterface( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XGraphics* >(this)), - (static_cast< css::lang::XTypeProvider* >(this)), - (static_cast< css::lang::XUnoTunnel* >(this)) ); + static_cast< css::awt::XGraphics* >(this), + static_cast< css::lang::XTypeProvider* >(this), + static_cast< css::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 2650fa802cbd..f916d68ec76a 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -212,18 +212,18 @@ css::uno::Any VCLXMenu::queryInterface( if ( bIsPopupMenu ) aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XMenu* >(static_cast(this)) ), - (static_cast< css::awt::XPopupMenu* >(this)), - (static_cast< css::lang::XTypeProvider* >(this)), - (static_cast< css::lang::XServiceInfo* >(this)), - (static_cast< css::lang::XUnoTunnel* >(this)) ); + static_cast< css::awt::XMenu* >(static_cast(this)), + static_cast< css::awt::XPopupMenu* >(this), + static_cast< css::lang::XTypeProvider* >(this), + static_cast< css::lang::XServiceInfo* >(this), + static_cast< css::lang::XUnoTunnel* >(this) ); else aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XMenu* >(static_cast(this)) ), - (static_cast< css::awt::XMenuBar* >(this)), - (static_cast< css::lang::XTypeProvider* >(this)), - (static_cast< css::lang::XServiceInfo* >(this)), - (static_cast< css::lang::XUnoTunnel* >(this)) ); + static_cast< css::awt::XMenu* >(static_cast(this)), + static_cast< css::awt::XMenuBar* >(this), + static_cast< css::lang::XTypeProvider* >(this), + static_cast< css::lang::XServiceInfo* >(this), + static_cast< css::lang::XUnoTunnel* >(this) ); return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType )); } diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx index e7b6d9da4d92..3922483ee9a9 100644 --- a/toolkit/source/awt/vclxregion.cxx +++ b/toolkit/source/awt/vclxregion.cxx @@ -41,9 +41,9 @@ VCLXRegion::~VCLXRegion() css::uno::Any VCLXRegion::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XRegion* >(this)), - (static_cast< css::lang::XUnoTunnel* >(this)), - (static_cast< css::lang::XTypeProvider* >(this)) ); + static_cast< css::awt::XRegion* >(this), + static_cast< css::lang::XUnoTunnel* >(this), + static_cast< css::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 f661f265ce7c..4c1e4ef31275 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -53,7 +53,7 @@ VCLXSystemDependentWindow::~VCLXSystemDependentWindow() css::uno::Any VCLXSystemDependentWindow::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XSystemDependentWindowPeer* >(this)) ); + static_cast< css::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 6725fac94276..ecb8625a09bc 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -787,8 +787,8 @@ VCLXCheckBox::VCLXCheckBox() : maActionListeners( *this ), maItemListeners( *th css::uno::Any VCLXCheckBox::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XButton* >(this)), - (static_cast< css::awt::XCheckBox* >(this)) ); + static_cast< css::awt::XButton* >(this), + static_cast< css::awt::XCheckBox* >(this) ); return (aRet.hasValue() ? aRet : VCLXGraphicControl::queryInterface( rType )); } @@ -1088,8 +1088,8 @@ VCLXRadioButton::VCLXRadioButton() : maItemListeners( *this ), maActionListeners css::uno::Any VCLXRadioButton::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XRadioButton* >(this)), - (static_cast< css::awt::XButton* >(this)) ); + static_cast< css::awt::XRadioButton* >(this), + static_cast< css::awt::XButton* >(this) ); return (aRet.hasValue() ? aRet : VCLXGraphicControl::queryInterface( rType )); } @@ -1349,7 +1349,7 @@ VCLXSpinField::VCLXSpinField() : maSpinListeners( *this ) css::uno::Any VCLXSpinField::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XSpinField* >(this)) ); + static_cast< css::awt::XSpinField* >(this) ); return (aRet.hasValue() ? aRet : VCLXEdit::queryInterface( rType )); } @@ -2170,7 +2170,7 @@ VCLXMessageBox::~VCLXMessageBox() css::uno::Any VCLXMessageBox::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XMessageBox* >(this)) ); + static_cast< css::awt::XMessageBox* >(this) ); return (aRet.hasValue() ? aRet : VCLXTopWindow::queryInterface( rType )); } @@ -2253,8 +2253,8 @@ VCLXDialog::~VCLXDialog() css::uno::Any VCLXDialog::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XDialog2* >(this)), - (static_cast< css::awt::XDialog* >(this)) ); + static_cast< css::awt::XDialog2* >(this), + static_cast< css::awt::XDialog* >(this) ); return (aRet.hasValue() ? aRet : VCLXTopWindow::queryInterface( rType )); } @@ -2828,7 +2828,7 @@ VCLXFixedHyperlink::~VCLXFixedHyperlink() css::uno::Any VCLXFixedHyperlink::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XFixedHyperlink* >(this)) ); + static_cast< css::awt::XFixedHyperlink* >(this) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } @@ -3139,7 +3139,7 @@ VCLXFixedText::~VCLXFixedText() css::uno::Any VCLXFixedText::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XFixedText* >(this)) ); + static_cast< css::awt::XFixedText* >(this) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } @@ -3281,7 +3281,7 @@ VCLXScrollBar::VCLXScrollBar() : maAdjustmentListeners( *this ) css::uno::Any VCLXScrollBar::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XScrollBar* >(this)) ); + static_cast< css::awt::XScrollBar* >(this) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } @@ -3764,9 +3764,9 @@ VCLXEdit::VCLXEdit() : maTextListeners( *this ) css::uno::Any VCLXEdit::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XTextComponent* >(this)), - (static_cast< css::awt::XTextEditField* >(this)), - (static_cast< css::awt::XTextLayoutConstrains* >(this)) ); + static_cast< css::awt::XTextComponent* >(this), + static_cast< css::awt::XTextEditField* >(this), + static_cast< css::awt::XTextLayoutConstrains* >(this) ); return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType )); } @@ -4758,7 +4758,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXDateField::Cre css::uno::Any VCLXDateField::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XDateField* >(this)) ); + static_cast< css::awt::XDateField* >(this) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } @@ -5105,7 +5105,7 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXTimeField::Cre css::uno::Any VCLXTimeField::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XTimeField* >(this)) ); + static_cast< css::awt::XTimeField* >(this) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } @@ -5404,7 +5404,7 @@ VCLXNumericField::~VCLXNumericField() css::uno::Any VCLXNumericField::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XNumericField* >(this)) ); + static_cast< css::awt::XNumericField* >(this) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } @@ -5760,8 +5760,7 @@ MetricField *VCLXMetricField::GetMetricField() // css::uno::XInterface css::uno::Any VCLXMetricField::queryInterface( const css::uno::Type & rType ) { - css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XMetricField* >(this)) ); + css::uno::Any aRet = ::cppu::queryInterface( rType, static_cast< css::awt::XMetricField* >(this) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } @@ -5999,7 +5998,7 @@ VCLXCurrencyField::~VCLXCurrencyField() css::uno::Any VCLXCurrencyField::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XCurrencyField* >(this)) ); + static_cast< css::awt::XCurrencyField* >(this) ); return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType )); } @@ -6348,7 +6347,7 @@ VCLXPatternField::~VCLXPatternField() css::uno::Any VCLXPatternField::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XPatternField* >(this)) ); + static_cast< css::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 8de29806ed17..c499c5648cf5 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -758,7 +758,8 @@ IMPL_XTYPEPROVIDER_END uno::Any UnoMultiPageControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< awt::XTabListener* >(this)), (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 0c1a4d72c4af..d290f413dce0 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -164,9 +164,9 @@ void StdTabController::ImplActivateControl( bool bFirst ) const Any StdTabController::queryAggregation( const Type & rType ) { Any aRet = ::cppu::queryInterface( rType, - (static_cast< XTabController* >(this)), - (static_cast< XServiceInfo* >(this)), - (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 1fd18de2fa94..b382cf9ae158 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -216,10 +216,10 @@ css::uno::Sequence< css::uno::Reference< css::awt::XControlModel > > ImplReadCon css::uno::Any StdTabControllerModel::queryAggregation( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::awt::XTabControllerModel* >(this)), - (static_cast< css::lang::XServiceInfo* >(this)), - (static_cast< css::io::XPersistObject* >(this)), - (static_cast< css::lang::XTypeProvider* >(this)) ); + static_cast< css::awt::XTabControllerModel* >(this), + static_cast< css::lang::XServiceInfo* >(this), + static_cast< css::io::XPersistObject* >(this), + static_cast< css::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 8acda6794406..894eb65b5c99 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -115,8 +115,8 @@ namespace toolkit uno::Any UnoScrollBarControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< awt::XAdjustmentListener* >(this)), - (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 f5d3527fdc06..e4f5b5353fa4 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -759,12 +759,12 @@ void UnoControlContainer::createPeer( const uno::Reference< awt::XToolkit >& rxT sal_Int32 nDialogStep = 0; aVal >>= nDialogStep; uno::Reference< awt::XControlContainer > xContainer = - (static_cast< awt::XControlContainer* >(this)); + static_cast< awt::XControlContainer* >(this); implUpdateVisibility( nDialogStep, xContainer ); uno::Reference< beans::XPropertyChangeListener > xListener = - (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 89ab2d222520..b7f5466ab9ef 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -1645,8 +1645,8 @@ OUString UnoFixedHyperlinkControl::GetComponentServiceName() uno::Any UnoFixedHyperlinkControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< awt::XFixedHyperlink* >(this)), - (static_cast< awt::XLayoutConstrains* >(this)) ); + static_cast< awt::XFixedHyperlink* >(this), + static_cast< awt::XLayoutConstrains* >(this) ); return (aRet.hasValue() ? aRet : UnoControlBase::queryAggregation( rType )); } @@ -1846,8 +1846,8 @@ OUString UnoFixedTextControl::GetComponentServiceName() uno::Any UnoFixedTextControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< awt::XFixedText* >(this)), - (static_cast< awt::XLayoutConstrains* >(this)) ); + static_cast< awt::XFixedText* >(this), + static_cast< awt::XLayoutConstrains* >(this) ); return (aRet.hasValue() ? aRet : UnoControlBase::queryAggregation( rType )); } @@ -3164,15 +3164,15 @@ void UnoComboBoxControl::dispose() uno::Any UnoComboBoxControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< awt::XComboBox* >(this)) ); + static_cast< awt::XComboBox* >(this) ); if ( !aRet.hasValue() ) { aRet = ::cppu::queryInterface( rType, - (static_cast< awt::XItemListener* >(this)) ); + static_cast< awt::XItemListener* >(this) ); if ( !aRet.hasValue() ) { aRet = ::cppu::queryInterface( rType, - (static_cast< awt::XItemListListener* >(this)) ); + static_cast< awt::XItemListListener* >(this) ); } } return (aRet.hasValue() ? aRet : UnoEditControl::queryAggregation( rType )); @@ -3457,7 +3457,7 @@ UnoSpinFieldControl::UnoSpinFieldControl() uno::Any UnoSpinFieldControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< awt::XSpinField* >(this)) ); + static_cast< awt::XSpinField* >(this) ); return (aRet.hasValue() ? aRet : UnoEditControl::queryAggregation( rType )); } @@ -3620,7 +3620,7 @@ OUString UnoDateFieldControl::GetComponentServiceName() uno::Any UnoDateFieldControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< awt::XDateField* >(this)) ); + static_cast< awt::XDateField* >(this) ); return (aRet.hasValue() ? aRet : UnoSpinFieldControl::queryAggregation( rType )); } @@ -3894,7 +3894,7 @@ OUString UnoTimeFieldControl::GetComponentServiceName() uno::Any UnoTimeFieldControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< awt::XTimeField* >(this)) ); + static_cast< awt::XTimeField* >(this) ); return (aRet.hasValue() ? aRet : UnoSpinFieldControl::queryAggregation( rType )); } @@ -4128,7 +4128,7 @@ OUString UnoNumericFieldControl::GetComponentServiceName() uno::Any UnoNumericFieldControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< awt::XNumericField* >(this)) ); + static_cast< awt::XNumericField* >(this) ); return (aRet.hasValue() ? aRet : UnoSpinFieldControl::queryAggregation( rType )); } @@ -4357,7 +4357,7 @@ OUString UnoCurrencyFieldControl::GetComponentServiceName() uno::Any UnoCurrencyFieldControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< awt::XCurrencyField* >(this)) ); + static_cast< awt::XCurrencyField* >(this) ); return (aRet.hasValue() ? aRet : UnoSpinFieldControl::queryAggregation( rType )); } @@ -4604,7 +4604,7 @@ void UnoPatternFieldControl::ImplSetPeerProperty( const OUString& rPropName, con uno::Any UnoPatternFieldControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< awt::XPatternField* >(this)) ); + static_cast< awt::XPatternField* >(this) ); return (aRet.hasValue() ? aRet : UnoSpinFieldControl::queryAggregation( rType )); } @@ -4762,7 +4762,7 @@ OUString UnoProgressBarControl::GetComponentServiceName() uno::Any UnoProgressBarControl::queryAggregation( const uno::Type & rType ) { uno::Any aRet = ::cppu::queryInterface( rType, - (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 39ccf22366ab..7083ee0ca03d 100644 --- a/toolkit/source/helper/listenermultiplexer.cxx +++ b/toolkit/source/helper/listenermultiplexer.cxx @@ -35,7 +35,7 @@ ListenerMultiplexerBase::~ListenerMultiplexerBase() // css::uno::XInterface css::uno::Any ListenerMultiplexerBase::queryInterface( const css::uno::Type & rType ) { - return ::cppu::queryInterface( rType, (static_cast< css::uno::XInterface* >(this)) ); + return ::cppu::queryInterface( rType, static_cast< css::uno::XInterface* >(this) ); } @@ -59,7 +59,7 @@ void SAL_CALL EventListenerMultiplexer::release() throw () css::uno::Any EventListenerMultiplexer::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = ::cppu::queryInterface( rType, - (static_cast< css::lang::XEventListener* >(this)) ); + static_cast< css::lang::XEventListener* >(this) ); return (aRet.hasValue() ? aRet : ListenerMultiplexerBase::queryInterface( rType )); } -- cgit