diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-24 11:28:56 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-24 11:28:56 +0100 |
commit | 827811ae7ef72123776ffb3c83175c0578db7257 (patch) | |
tree | 3c7ba99e01dead8794ec22dce75bae3f0cc7ac81 /dbaccess | |
parent | 97e24dc653d5097fc819ca8b30d0c827d4540430 (diff) |
-Werror,-Wunused-private-field
Change-Id: I595f0c2b05b96fbf2055a37e335f8c700044a699
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/core/api/TableDeco.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/query.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/table.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/api/tablecontainer.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/core/inc/ContainerMediator.hxx | 5 | ||||
-rw-r--r-- | dbaccess/source/core/misc/ContainerMediator.cxx | 4 |
6 files changed, 6 insertions, 11 deletions
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index 4bcf8c99a734..fc50e380c597 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -574,7 +574,7 @@ void ODBTableDecorator::refreshColumns() m_xMetaData.is() && m_xMetaData->supportsAlterTableWithDropColumn()); pCol->setParent(*this); - OContainerMediator* pMediator = new OContainerMediator( pCol, m_xColumnDefinitions, m_xConnection ); + OContainerMediator* pMediator = new OContainerMediator( pCol, m_xColumnDefinitions ); m_xColumnMediator = pMediator; pCol->setMediator( pMediator ); m_pColumns = pCol; diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index d0b5874de1d7..abe8735ea2fb 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -131,7 +131,7 @@ void OQuery::rebuildColumns() { xColumnDefinitions = xColSup->getColumns(); if ( xColumnDefinitions.is() ) - m_pColumnMediator = new OContainerMediator( m_pColumns, xColumnDefinitions, m_xConnection ); + m_pColumnMediator = new OContainerMediator( m_pColumns, xColumnDefinitions ); } // fill the columns with columns from the statement diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 0f0d60ce148b..61f6715bb138 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -347,7 +347,7 @@ sdbcx::OCollection* ODBTable::createColumns(const TStringVector& _rNames) getAlterService().is() || (xMeta.is() && xMeta->supportsAlterTableWithDropColumn())); static_cast<OColumnsHelper*>(pCol)->setParent(this); pCol->setParent(*this); - m_pColumnMediator = new OContainerMediator( pCol, m_xColumnDefinitions, getConnection() ); + m_pColumnMediator = new OContainerMediator( pCol, m_xColumnDefinitions ); pCol->setMediator( m_pColumnMediator.get() ); return pCol; } diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index ae2d93634bf9..b02baf958d6a 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -226,7 +226,7 @@ connectivity::sdbcx::ObjectType OTableContainer::createObject(const OUString& _r if ( !m_pTableMediator.is() ) m_pTableMediator = new OContainerMediator( - this, m_xTableDefinitions.get(), m_xConnection ); + this, m_xTableDefinitions.get() ); if ( m_pTableMediator.is() ) m_pTableMediator->notifyElementCreated(_rName,xDest); } diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx index 72e19d610b7d..04d097637d51 100644 --- a/dbaccess/source/core/inc/ContainerMediator.hxx +++ b/dbaccess/source/core/inc/ContainerMediator.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/sdbc/XConnection.hpp> #include <comphelper/broadcasthelper.hxx> #include <cppuhelper/implbase.hxx> @@ -45,7 +44,6 @@ namespace dbaccess PropertyForwardList m_aForwardList; css::uno::Reference< css::container::XNameAccess > m_xSettings; // can not be weak css::uno::Reference< css::container::XContainer > m_xContainer; // can not be weak - css::uno::WeakReference< css::sdbc::XConnection > m_aConnection; protected: virtual ~OContainerMediator(); @@ -53,8 +51,7 @@ namespace dbaccess public: OContainerMediator( const css::uno::Reference< css::container::XContainer >& _xContainer, - const css::uno::Reference< css::container::XNameAccess >& _xSettings, - const css::uno::Reference< css::sdbc::XConnection >& _rxConnection + const css::uno::Reference< css::container::XNameAccess >& _xSettings ); virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& _rEvent ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx index ef69529f5164..06cba6a2161b 100644 --- a/dbaccess/source/core/misc/ContainerMediator.cxx +++ b/dbaccess/source/core/misc/ContainerMediator.cxx @@ -39,11 +39,9 @@ namespace dbaccess using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; -OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContainer, const Reference< XNameAccess >& _xSettings, - const Reference< XConnection >& _rxConnection ) +OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContainer, const Reference< XNameAccess >& _xSettings ) : m_xSettings( _xSettings ) , m_xContainer( _xContainer ) - , m_aConnection( _rxConnection ) { if ( _xSettings.is() && _xContainer.is() ) |