summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-09-04 08:53:38 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-09-04 10:52:41 +0200
commit7aa7f4d9e4294959748bccf9e763154740251635 (patch)
tree79fc3855ce0cc1141abdda514df374cd42ab259c /framework
parent6f511a5de909b2fb6cb42b851e0cc90f54fbdd59 (diff)
loplugin:unnecessaryparen include c++ casts
Change-Id: I132d3c66f0562e2c37a02eaf4c168d06c2b473eb Reviewed-on: https://gerrit.libreoffice.org/41874 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
-rw-r--r--framework/source/fwe/classes/actiontriggercontainer.cxx6
-rw-r--r--framework/source/fwe/classes/actiontriggerpropertyset.cxx6
-rw-r--r--framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx8
-rw-r--r--framework/source/fwe/classes/rootactiontriggercontainer.cxx10
-rw-r--r--framework/source/fwe/helper/propertysetcontainer.cxx8
-rw-r--r--framework/source/fwi/uielement/rootitemcontainer.cxx4
-rw-r--r--framework/source/helper/uiconfigelementwrapperbase.cxx2
-rw-r--r--framework/source/helper/uielementwrapperbase.cxx2
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx6
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.cxx6
-rw-r--r--framework/source/tabwin/tabwindow.cxx2
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx4
-rw-r--r--framework/source/uielement/fontmenucontroller.cxx4
-rw-r--r--framework/source/uielement/fontsizemenucontroller.cxx4
-rw-r--r--framework/source/uielement/langselectionmenucontroller.cxx4
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx4
-rw-r--r--framework/source/uielement/toolbarwrapper.cxx2
17 files changed, 41 insertions, 41 deletions
diff --git a/framework/source/fwe/classes/actiontriggercontainer.cxx b/framework/source/fwe/classes/actiontriggercontainer.cxx
index 442ccc85e8fd..5d7ed4ab6639 100644
--- a/framework/source/fwe/classes/actiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/actiontriggercontainer.cxx
@@ -46,9 +46,9 @@ Any SAL_CALL ActionTriggerContainer::queryInterface( const Type& aType )
{
Any a = ::cppu::queryInterface(
aType ,
- (static_cast< XMultiServiceFactory* >(this)),
- (static_cast< XServiceInfo* >(this)),
- (static_cast< XTypeProvider* >(this)));
+ static_cast< XMultiServiceFactory* >(this),
+ static_cast< XServiceInfo* >(this),
+ static_cast< XTypeProvider* >(this));
if( a.hasValue() )
{
diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index 4ded47739217..94eb09221c02 100644
--- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -53,7 +53,7 @@ namespace framework
ActionTriggerPropertySet::ActionTriggerPropertySet()
: OBroadcastHelper ( m_aMutex )
- , OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this)))
+ , OPropertySetHelper ( *static_cast< OBroadcastHelper * >(this) )
, OWeakObject ()
, m_xBitmap ( nullptr )
, m_xActionTriggerContainer( nullptr )
@@ -69,8 +69,8 @@ Any SAL_CALL ActionTriggerPropertySet::queryInterface( const Type& aType )
{
Any a = ::cppu::queryInterface(
aType,
- (static_cast< XServiceInfo* >(this)),
- (static_cast< XTypeProvider* >(this)));
+ static_cast< XServiceInfo* >(this),
+ static_cast< XTypeProvider* >(this));
if( a.hasValue() )
return a;
diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index cfeb395b5619..5f6700a68a70 100644
--- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
@@ -47,8 +47,8 @@ namespace framework
ActionTriggerSeparatorPropertySet::ActionTriggerSeparatorPropertySet()
: OBroadcastHelper ( m_aMutex )
- , OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this)) )
- , OWeakObject ( )
+ , OPropertySetHelper ( *static_cast< OBroadcastHelper * >(this) )
+ , OWeakObject ()
, m_nSeparatorType( 0 )
{
}
@@ -62,8 +62,8 @@ Any SAL_CALL ActionTriggerSeparatorPropertySet::queryInterface( const Type& aTyp
{
Any a = ::cppu::queryInterface(
aType,
- (static_cast< XServiceInfo* >(this)),
- (static_cast< XTypeProvider* >(this)));
+ static_cast< XServiceInfo* >(this),
+ static_cast< XTypeProvider* >(this));
if( a.hasValue() )
return a;
diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
index 327f7bdece81..583ec6dc61ca 100644
--- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx
+++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx
@@ -60,11 +60,11 @@ Any SAL_CALL RootActionTriggerContainer::queryInterface( const Type& aType )
{
Any a = ::cppu::queryInterface(
aType ,
- (static_cast< XMultiServiceFactory* >(this)),
- (static_cast< XServiceInfo* >(this)),
- (static_cast< XUnoTunnel* >(this)),
- (static_cast< XTypeProvider* >(this)),
- (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 26d5d80a15cb..9f856691e343 100644
--- a/framework/source/fwe/helper/propertysetcontainer.cxx
+++ b/framework/source/fwe/helper/propertysetcontainer.cxx
@@ -59,10 +59,10 @@ Any SAL_CALL PropertySetContainer::queryInterface( const Type& rType )
{
Any a = ::cppu::queryInterface(
rType ,
- (static_cast< XIndexContainer* >(this)),
- (static_cast< XIndexReplace* >(this)),
- (static_cast< XIndexAccess* >(this)),
- (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/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx
index 8d9f4f130b5a..5b065a835f3c 100644
--- a/framework/source/fwi/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -47,13 +47,13 @@ namespace framework
RootItemContainer::RootItemContainer()
: ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aMutex )
- , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) )
+ , ::cppu::OPropertySetHelper ( *static_cast< ::cppu::OBroadcastHelper* >(this) )
{
}
RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceContainer )
: ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aMutex )
- , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) )
+ , ::cppu::OPropertySetHelper ( *static_cast< ::cppu::OBroadcastHelper* >(this) )
{
// We also have to copy the UIName property
try
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 4c16ffe18890..19d3cdd251bb 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -60,7 +60,7 @@ namespace framework
UIConfigElementWrapperBase::UIConfigElementWrapperBase( sal_Int16 nType )
: ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aMutex )
- , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) )
+ , ::cppu::OPropertySetHelper ( *static_cast< ::cppu::OBroadcastHelper* >(this) )
, m_nType ( nType )
, m_bPersistent ( true )
, m_bInitialized ( false )
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 001675e62c48..d0489f6ea0b7 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -45,7 +45,7 @@ namespace framework
UIElementWrapperBase::UIElementWrapperBase( sal_Int16 nType )
: ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aMutex )
- , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) )
+ , ::cppu::OPropertySetHelper ( *static_cast< ::cppu::OBroadcastHelper* >(this) )
, m_aListenerContainer ( m_aMutex )
, m_nType ( nType )
, m_bInitialized ( false )
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index a8dca9cc3fce..2012ee2576bb 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -102,7 +102,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( LayoutManager, LayoutManager_Base, LayoutManager_
LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) : LayoutManager_Base()
, ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >(m_aMutex)
- , LayoutManager_PBase( *(static_cast< ::cppu::OBroadcastHelper* >(this)) )
+ , LayoutManager_PBase( *static_cast< ::cppu::OBroadcastHelper* >(this) )
, m_xContext( xContext )
, m_xURLTransformer( URLTransformer::create(xContext) )
, m_nLockCount( 0 )
@@ -750,7 +750,7 @@ void LayoutManager::implts_updateUIElementsVisibleState( bool bSetVisible )
pMenuBar = static_cast<MenuBar *>(xInplaceMenuBar->GetMenuBar());
else
{
- MenuBarWrapper* pMenuBarWrapper = (static_cast< MenuBarWrapper* >(xMenuBar.get()) );
+ MenuBarWrapper* pMenuBarWrapper = static_cast< MenuBarWrapper* >(xMenuBar.get());
pMenuBar = static_cast<MenuBar *>(pMenuBarWrapper->GetMenuBarManager()->GetMenuBar());
}
@@ -1166,7 +1166,7 @@ void LayoutManager::implts_resetInplaceMenuBar()
if ( m_xContainerWindow.is() )
{
SolarMutexGuard aGuard;
- MenuBarWrapper* pMenuBarWrapper = (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 571ed4b5801a..9599f8fecbfc 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -94,9 +94,9 @@ void SAL_CALL ToolbarLayoutManager::release() throw()
uno::Any SAL_CALL ToolbarLayoutManager::queryInterface( const uno::Type & rType )
{
uno::Any a = ::cppu::queryInterface( rType,
- (static_cast< awt::XDockableWindowListener* >(this)),
- (static_cast< ui::XUIConfigurationListener* >(this)),
- (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/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index bd4216e1c3c4..9070ce850ca8 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -82,7 +82,7 @@ DEFINE_INIT_SERVICE ( TabWindow, {} )
TabWindow::TabWindow( const css::uno::Reference< css::uno::XComponentContext >& xContext )
: ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aMutex )
- , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) )
+ , ::cppu::OPropertySetHelper ( *static_cast< ::cppu::OBroadcastHelper* >(this) )
, m_bInitialized( false )
, m_bDisposed( false )
, m_nNextTabID( 1 )
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 24a9279944c9..5357e6955859 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -342,8 +342,8 @@ void SAL_CALL ControlMenuController::updatePopupMenu()
Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
if ( xDispatch.is() )
{
- xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
- xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
+ xDispatch->addStatusListener( static_cast< XStatusListener* >(this), aTargetURL );
+ xDispatch->removeStatusListener( static_cast< XStatusListener* >(this), aTargetURL );
m_aURLToDispatchMap.emplace( aTargetURL.Complete, xDispatch );
}
}
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index c1f64b64e259..4997d6d26464 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -208,8 +208,8 @@ void SAL_CALL FontMenuController::updatePopupMenu()
if ( xDispatch.is() )
{
- xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
- xDispatch->removeStatusListener( (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 53889e0785e4..24ac65d25d86 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -301,8 +301,8 @@ void SAL_CALL FontSizeMenuController::updatePopupMenu()
if ( xDispatch.is() )
{
- xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
- xDispatch->removeStatusListener( (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 e659d5edb5de..0938658b5aa1 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -252,8 +252,8 @@ void SAL_CALL LanguageSelectionMenuController::updatePopupMenu()
if ( xDispatch.is() )
{
- xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
- xDispatch->removeStatusListener( (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/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 995fa66d4c7e..e08891f770b9 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -713,8 +713,8 @@ void SAL_CALL ToolbarsMenuController::itemActivated( const css::awt::MenuEvent&
Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
if ( xDispatch.is() )
{
- xDispatch->addStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
- xDispatch->removeStatusListener( (static_cast< XStatusListener* >(this)), aTargetURL );
+ xDispatch->addStatusListener( static_cast< XStatusListener* >(this), aTargetURL );
+ xDispatch->removeStatusListener( static_cast< XStatusListener* >(this), aTargetURL );
}
}
else if ( aCmdVector[i] == CMD_RESTOREVISIBILITY )
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 171c98803d58..1f090b60760d 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -78,7 +78,7 @@ uno::Any SAL_CALL ToolBarWrapper::queryInterface( const uno::Type & rType )
{
Any a = ::cppu::queryInterface(
rType ,
- (static_cast< css::ui::XUIFunctionListener* >(this)) );
+ static_cast< css::ui::XUIFunctionListener* >(this) );
if( a.hasValue() )
return a;