summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-09-07 08:49:37 +0200
committerNoel Grandin <noel@peralex.com>2016-09-07 10:04:44 +0200
commitc158c00489d35af7f5f9278b8ee545678d6a42e5 (patch)
treeeab18b26c29210979031ef6b9ef58ce0e0575664 /toolkit
parent5e9982668224345f901631d664985e823530e05a (diff)
loplugin:constantparam in framework..vbahelper
Change-Id: I592f73012ae8a4df8488ef04dc0956d9400625bc
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/controls/tree/treedatamodel.cxx12
-rw-r--r--toolkit/source/controls/unocontrolcontainer.cxx8
2 files changed, 10 insertions, 10 deletions
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index e3c44772e896..c94737775ee2 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -56,7 +56,7 @@ public:
MutableTreeDataModel();
virtual ~MutableTreeDataModel();
- void broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >* pNodes, sal_Int32 nNodes );
+ void broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >& rNode );
// XMutableTreeDataModel
virtual css::uno::Reference< css::awt::tree::XMutableTreeNode > SAL_CALL createNode( const css::uno::Any& DisplayValue, sal_Bool ChildrenOnDemand ) throw (css::uno::RuntimeException, std::exception) override;
@@ -151,13 +151,13 @@ MutableTreeDataModel::~MutableTreeDataModel()
{
}
-void MutableTreeDataModel::broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >* pNodes, sal_Int32 nNodes )
+void MutableTreeDataModel::broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >& rNode )
{
::cppu::OInterfaceContainerHelper* pIter = BrdcstHelper.getContainer( cppu::UnoType<XTreeDataModelListener>::get() );
if( pIter )
{
Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
- const Sequence< Reference< XTreeNode > > aNodes( pNodes, nNodes );
+ const Sequence< Reference< XTreeNode > > aNodes { rNode };
TreeDataModelEvent aEvent( xSource, aNodes, xParentNode );
::cppu::OInterfaceIteratorHelper aListIter(*pIter);
@@ -203,7 +203,7 @@ void SAL_CALL MutableTreeDataModel::setRoot( const Reference< XMutableTreeNode >
mxRootNode.set(xImpl.get());
Reference< XTreeNode > xParentNode;
- broadcast( structure_changed, xParentNode, &mxRootNode, 1 );
+ broadcast( structure_changed, xParentNode, mxRootNode );
}
}
@@ -298,7 +298,7 @@ void MutableTreeNode::broadcast_changes()
{
Reference< XTreeNode > xParent( getReference( mpParent ) );
Reference< XTreeNode > xNode( getReference( this ) );
- mxModel->broadcast( nodes_changed, xParent, &xNode, 1 );
+ mxModel->broadcast( nodes_changed, xParent, xNode );
}
}
@@ -307,7 +307,7 @@ void MutableTreeNode::broadcast_changes(const Reference< XTreeNode >& xNode, boo
if( mxModel.is() )
{
Reference< XTreeNode > xParent( getReference( this ) );
- mxModel->broadcast( bNew ? nodes_inserted : nodes_removed, xParent, &xNode, 1 );
+ mxModel->broadcast( bNew ? nodes_inserted : nodes_removed, xParent, xNode );
}
}
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index af2cbb5a3687..e53da45c3d9b 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -503,7 +503,7 @@ void SAL_CALL UnoControlContainer::removeByIdentifier( ::sal_Int32 _nIdentifier
*this
);
- impl_removeControl( _nIdentifier, xControl, nullptr );
+ impl_removeControl( _nIdentifier, xControl );
}
void SAL_CALL UnoControlContainer::replaceByIdentifer( ::sal_Int32 _nIdentifier, const uno::Any& _rElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
@@ -663,7 +663,7 @@ void UnoControlContainer::removingControl( const uno::Reference< awt::XControl >
}
}
-void UnoControlContainer::impl_removeControl( sal_Int32 _nId, const uno::Reference< awt::XControl >& _rxControl, const OUString* _pNameAccessor )
+void UnoControlContainer::impl_removeControl( sal_Int32 _nId, const uno::Reference< awt::XControl >& _rxControl )
{
#ifdef DBG_UTIL
{
@@ -680,7 +680,7 @@ void UnoControlContainer::impl_removeControl( sal_Int32 _nId, const uno::Referen
{
container::ContainerEvent aEvent;
aEvent.Source = *this;
- _pNameAccessor ? ( aEvent.Accessor <<= *_pNameAccessor ) : ( aEvent.Accessor <<= _nId );
+ aEvent.Accessor <<= _nId;
aEvent.Element <<= _rxControl;
maCListeners.elementRemoved( aEvent );
}
@@ -694,7 +694,7 @@ void UnoControlContainer::removeControl( const uno::Reference< awt::XControl >&
UnoControlHolderList::ControlIdentifier id = mpControls->getControlIdentifier( _rxControl );
if ( id != -1 )
- impl_removeControl( id, _rxControl, nullptr );
+ impl_removeControl( id, _rxControl );
}
}