summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-10-18 15:47:38 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-10-22 08:13:38 +0200
commit964ffdc0687c14f9a90105dab4ffdf5eb09b6231 (patch)
treee51c420c7f4c639b68b593e7b6ea256b7089b242 /dbaccess
parentbd3929da20b5a536b82b15af552864e7549f91ef (diff)
loplugin:virtualdead unused param in IContainerApprove
Change-Id: I59edede149d02085125ee946994b6088c3152e7b Reviewed-on: https://gerrit.libreoffice.org/81246 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/core/api/querycontainer.cxx2
-rw-r--r--dbaccess/source/core/api/tablecontainer.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/documentcontainer.cxx4
-rw-r--r--dbaccess/source/core/inc/containerapprove.hxx7
-rw-r--r--dbaccess/source/core/inc/objectnameapproval.hxx2
-rw-r--r--dbaccess/source/core/misc/objectnameapproval.cxx2
6 files changed, 7 insertions, 12 deletions
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index 0acba89f5c9e..2fbf6b551689 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -291,7 +291,7 @@ Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const Contain
Reference< XVeto > xReturn;
try
{
- getElementApproval()->approveElement( sName, xElement.get() );
+ getElementApproval()->approveElement( sName );
}
catch( const Exception& )
{
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index f0adf088281f..3637e6b3bed1 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -268,7 +268,7 @@ ObjectType OTableContainer::appendObject( const OUString& _rForName, const Refer
Reference< XConnection > xConnection( m_xConnection.get(), UNO_QUERY );
PContainerApprove pApprove( new ObjectNameApproval( xConnection, ObjectNameApproval::TypeTable ) );
- pApprove->approveElement( aName, descriptor );
+ pApprove->approveElement( aName );
{
EnsureReset aReset(m_nInAppend);
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index cad8369ba479..c30f15000323 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -65,10 +65,10 @@ class LocalNameApproval : public IContainerApprove
::connectivity::SQLError m_aErrors;
public:
- void approveElement( const OUString& _rName, const Reference< XInterface >& _rxElement ) override;
+ void approveElement( const OUString& _rName ) override;
};
-void LocalNameApproval::approveElement( const OUString& _rName, const Reference< XInterface >& /*_rxElement*/ )
+void LocalNameApproval::approveElement( const OUString& _rName )
{
if ( _rName.indexOf( '/' ) != -1 )
throw IllegalArgumentException(
diff --git a/dbaccess/source/core/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx
index 47da745bdc89..5c0582904381 100644
--- a/dbaccess/source/core/inc/containerapprove.hxx
+++ b/dbaccess/source/core/inc/containerapprove.hxx
@@ -44,16 +44,11 @@ namespace dbaccess
/** approves a given element for insertion into the container
@param _rName
specifies the name under which the element is going to be inserted
- @param _rxElement
- specifies the element which is going to be inserted
@throws Exception
if the name or the object are invalid, or not eligible for insertion
into the container
*/
- virtual void approveElement(
- const OUString& _rName,
- const css::uno::Reference< css::uno::XInterface >& _rxElement
- ) = 0;
+ virtual void approveElement( const OUString& _rName ) = 0;
};
typedef std::shared_ptr< IContainerApprove > PContainerApprove;
diff --git a/dbaccess/source/core/inc/objectnameapproval.hxx b/dbaccess/source/core/inc/objectnameapproval.hxx
index b99933281168..6e0ce4577b03 100644
--- a/dbaccess/source/core/inc/objectnameapproval.hxx
+++ b/dbaccess/source/core/inc/objectnameapproval.hxx
@@ -67,7 +67,7 @@ namespace dbaccess
virtual ~ObjectNameApproval() override;
// IContainerApprove
- virtual void approveElement( const OUString& _rName, const css::uno::Reference< css::uno::XInterface >& _rxElement ) override;
+ virtual void approveElement( const OUString& _rName ) override;
};
diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx
index f1a51b1e3fa2..71e13ec413a1 100644
--- a/dbaccess/source/core/misc/objectnameapproval.cxx
+++ b/dbaccess/source/core/misc/objectnameapproval.cxx
@@ -59,7 +59,7 @@ namespace dbaccess
{
}
- void ObjectNameApproval::approveElement( const OUString& _rName, const Reference< XInterface >& /*_rxElement*/ )
+ void ObjectNameApproval::approveElement( const OUString& _rName )
{
Reference< XConnection > xConnection( m_pImpl->aConnection );
if ( !xConnection.is() )