connectivity/source/drivers/ado/AColumn.cxx | 5 +++-- connectivity/source/drivers/ado/AConnection.cxx | 5 +++-- connectivity/source/drivers/ado/ADriver.cxx | 2 +- connectivity/source/drivers/ado/AGroup.cxx | 5 +++-- connectivity/source/drivers/ado/AIndex.cxx | 5 +++-- connectivity/source/drivers/ado/AKey.cxx | 5 +++-- connectivity/source/drivers/ado/ATable.cxx | 5 +++-- connectivity/source/drivers/ado/AUser.cxx | 5 +++-- connectivity/source/drivers/ado/AView.cxx | 5 +++-- connectivity/source/drivers/dbase/DIndex.cxx | 2 +- connectivity/source/drivers/file/FDatabaseMetaData.cxx | 2 +- connectivity/source/drivers/file/FResultSet.cxx | 7 ++++--- connectivity/source/drivers/file/FStatement.cxx | 2 +- connectivity/source/drivers/file/FTable.cxx | 5 +++-- connectivity/source/inc/ado/AColumn.hxx | 2 +- connectivity/source/inc/ado/AConnection.hxx | 2 +- connectivity/source/inc/ado/AGroup.hxx | 2 +- connectivity/source/inc/ado/AIndex.hxx | 2 +- connectivity/source/inc/ado/AKey.hxx | 2 +- connectivity/source/inc/ado/ATable.hxx | 2 +- connectivity/source/inc/ado/AUser.hxx | 2 +- connectivity/source/inc/ado/AView.hxx | 2 +- connectivity/source/inc/file/FResultSet.hxx | 2 +- connectivity/source/inc/file/FTable.hxx | 2 +- include/comphelper/types.hxx | 2 +- 25 files changed, 46 insertions(+), 36 deletions(-)
New commits: commit 03747db026a5b4959ec0700d9addf0482e6f5977 Author: Arkadiy Illarionov <qar...@gmail.com> AuthorDate: Sat Sep 7 00:15:12 2019 +0300 Commit: Arkadiy Illarionov <qar...@gmail.com> CommitDate: Sat Sep 7 00:05:26 2019 +0200 tdf#39593 use isUnoTunnelId in connectivity Change-Id: I458049e23e9fc1855cb4ba9519b9b940f170b024 Reviewed-on: https://gerrit.libreoffice.org/78732 Tested-by: Jenkins Reviewed-by: Arkadiy Illarionov <qar...@gmail.com> diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index 236d758760d1..c7d5a5fce5c2 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -23,6 +23,7 @@ #include <cppuhelper/typeprovider.hxx> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <comphelper/extract.hxx> +#include <comphelper/servicehelper.hxx> #include <comphelper/types.hxx> #include <ado/ACatalog.hxx> @@ -74,7 +75,7 @@ OAdoColumn::OAdoColumn(bool _bCase,OConnection* _pConnection) } -Sequence< sal_Int8 > OAdoColumn::getUnoTunnelImplementationId() +Sequence< sal_Int8 > OAdoColumn::getUnoTunnelId() { static ::cppu::OImplementationId implId; @@ -85,7 +86,7 @@ Sequence< sal_Int8 > OAdoColumn::getUnoTunnelImplementationId() sal_Int64 OAdoColumn::getSomething( const Sequence< sal_Int8 > & rId ) { - return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + return isUnoTunnelId<OAdoColumn>(rId) ? reinterpret_cast< sal_Int64 >( this ) : OColumn_ADO::getSomething(rId); } diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 32e0bcd4d2b6..c9251a9be88b 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/sdbc/TransactionIsolation.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/lang/DisposedException.hpp> +#include <comphelper/servicehelper.hxx> #include <cppuhelper/typeprovider.hxx> #include <connectivity/dbexception.hxx> #include <osl/file.hxx> @@ -487,14 +488,14 @@ void OConnection::disposing() sal_Int64 SAL_CALL OConnection::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { - return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + return isUnoTunnelId<OConnection>(rId) ? reinterpret_cast< sal_Int64 >( this ) : OConnection_BASE::getSomething(rId); } -Sequence< sal_Int8 > OConnection::getUnoTunnelImplementationId() +Sequence< sal_Int8 > OConnection::getUnoTunnelId() { static ::cppu::OImplementationId implId; diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index d97d018bc202..eae5ee686996 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -199,7 +199,7 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( co Reference< css::lang::XUnoTunnel> xTunnel(connection,UNO_QUERY); if(xTunnel.is()) { - OConnection* pSearchConnection = reinterpret_cast< OConnection* >( xTunnel->getSomething(OConnection::getUnoTunnelImplementationId()) ); + OConnection* pSearchConnection = reinterpret_cast< OConnection* >( xTunnel->getSomething(OConnection::getUnoTunnelId()) ); auto foundConnection = std::any_of(m_xConnections.begin(), m_xConnections.end(), [&pSearchConnection](const css::uno::WeakReferenceHelper& rxConnection) { diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx index 0b251a6f2cf3..b41fbdbba05d 100644 --- a/connectivity/source/drivers/ado/AGroup.cxx +++ b/connectivity/source/drivers/ado/AGroup.cxx @@ -20,6 +20,7 @@ #include <ado/AGroup.hxx> #include <ado/AUsers.hxx> +#include <comphelper/servicehelper.hxx> #include <cppuhelper/typeprovider.hxx> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> @@ -81,7 +82,7 @@ void OAdoGroup::refreshUsers() m_pUsers.reset(new OUsers(m_pCatalog, m_aMutex, aVector, aUsers, isCaseSensitive())); } -Sequence< sal_Int8 > OAdoGroup::getUnoTunnelImplementationId() +Sequence< sal_Int8 > OAdoGroup::getUnoTunnelId() { static ::cppu::OImplementationId implId; @@ -92,7 +93,7 @@ Sequence< sal_Int8 > OAdoGroup::getUnoTunnelImplementationId() sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId ) { - return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + return isUnoTunnelId<OAdoGroup>(rId) ? reinterpret_cast< sal_Int64 >( this ) : OGroup_ADO::getSomething(rId); } diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx index 0888fa1bf2b8..61a047bc9b00 100644 --- a/connectivity/source/drivers/ado/AIndex.cxx +++ b/connectivity/source/drivers/ado/AIndex.cxx @@ -23,6 +23,7 @@ #include <cppuhelper/typeprovider.hxx> #include <ado/AColumns.hxx> #include <TConnection.hxx> +#include <comphelper/servicehelper.hxx> #include <comphelper/types.hxx> using namespace ::comphelper; @@ -70,7 +71,7 @@ void OAdoIndex::refreshColumns() } -Sequence< sal_Int8 > OAdoIndex::getUnoTunnelImplementationId() +Sequence< sal_Int8 > OAdoIndex::getUnoTunnelId() { static ::cppu::OImplementationId implId; @@ -81,7 +82,7 @@ Sequence< sal_Int8 > OAdoIndex::getUnoTunnelImplementationId() sal_Int64 OAdoIndex::getSomething( const Sequence< sal_Int8 > & rId ) { - return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + return isUnoTunnelId<OAdoIndex>(rId) ? reinterpret_cast< sal_Int64 >( this ) : sdbcx::OIndex::getSomething(rId); } diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx index 25ffeb6eece6..764765b35620 100644 --- a/connectivity/source/drivers/ado/AKey.cxx +++ b/connectivity/source/drivers/ado/AKey.cxx @@ -20,6 +20,7 @@ #include <ado/AKey.hxx> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> +#include <comphelper/servicehelper.hxx> #include <cppuhelper/typeprovider.hxx> #include <ado/AColumns.hxx> #include <ado/AConnection.hxx> @@ -66,7 +67,7 @@ void OAdoKey::refreshColumns() m_pColumns.reset(new OColumns(*this, m_aMutex, aVector, aColumns, isCaseSensitive(), m_pConnection)); } -Sequence< sal_Int8 > OAdoKey::getUnoTunnelImplementationId() +Sequence< sal_Int8 > OAdoKey::getUnoTunnelId() { static ::cppu::OImplementationId implId; @@ -77,7 +78,7 @@ Sequence< sal_Int8 > OAdoKey::getUnoTunnelImplementationId() sal_Int64 OAdoKey::getSomething( const Sequence< sal_Int8 > & rId ) { - return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + return isUnoTunnelId<OAdoKey>(rId) ? reinterpret_cast< sal_Int64 >( this ) : OKey_ADO::getSomething(rId); } diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index 34597d55fff5..807dbb19055c 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/sdbc/ColumnValue.hpp> #include <ado/Awrapado.hxx> #include <TConnection.hxx> +#include <comphelper/servicehelper.hxx> #include <comphelper/types.hxx> using namespace ::comphelper; @@ -123,7 +124,7 @@ void OAdoTable::refreshIndexes() m_xIndexes = new OIndexes(*this,m_aMutex,aVector,aIndexes,isCaseSensitive(),m_pCatalog->getConnection()); } -Sequence< sal_Int8 > OAdoTable::getUnoTunnelImplementationId() +Sequence< sal_Int8 > OAdoTable::getUnoTunnelId() { static ::cppu::OImplementationId implId; @@ -134,7 +135,7 @@ Sequence< sal_Int8 > OAdoTable::getUnoTunnelImplementationId() sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId ) { - return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + return isUnoTunnelId<OAdoTable>(rId) ? reinterpret_cast< sal_Int64 >( this ) : OTable_TYPEDEF::getSomething(rId); } diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index 4e595de36bac..724334cea696 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.cxx @@ -20,6 +20,7 @@ #include <ado/AUser.hxx> #include <ado/ACatalog.hxx> #include <ado/AGroups.hxx> +#include <comphelper/servicehelper.hxx> #include <cppuhelper/typeprovider.hxx> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> @@ -65,7 +66,7 @@ void OAdoUser::refreshGroups() m_pGroups.reset(new OGroups(m_pCatalog, m_aMutex, aVector, aGroups, isCaseSensitive())); } -Sequence< sal_Int8 > OAdoUser::getUnoTunnelImplementationId() +Sequence< sal_Int8 > OAdoUser::getUnoTunnelId() { static ::cppu::OImplementationId implId; @@ -76,7 +77,7 @@ Sequence< sal_Int8 > OAdoUser::getUnoTunnelImplementationId() sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId ) { - return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + return isUnoTunnelId<OAdoUser>(rId) ? reinterpret_cast< sal_Int64 >( this ) : OUser_TYPEDEF::getSomething(rId); } diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx index c2f0bc86d601..b53c1a026200 100644 --- a/connectivity/source/drivers/ado/AView.cxx +++ b/connectivity/source/drivers/ado/AView.cxx @@ -22,6 +22,7 @@ #include <ado/adoimp.hxx> #include <cppuhelper/typeprovider.hxx> #include <ado/Awrapado.hxx> +#include <comphelper/servicehelper.hxx> #include <comphelper/types.hxx> #include <TConnection.hxx> @@ -40,7 +41,7 @@ OAdoView::OAdoView(bool _bCase,ADOView* _pView) : OView_ADO(_bCase,nullptr) { } -Sequence< sal_Int8 > OAdoView::getUnoTunnelImplementationId() +Sequence< sal_Int8 > OAdoView::getUnoTunnelId() { static ::cppu::OImplementationId implId; @@ -51,7 +52,7 @@ Sequence< sal_Int8 > OAdoView::getUnoTunnelImplementationId() sal_Int64 OAdoView::getSomething( const Sequence< sal_Int8 > & rId ) { - return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + return isUnoTunnelId<OAdoView>(rId) ? reinterpret_cast< sal_Int64 >( this ) : OView_ADO::getSomething(rId); } diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index ee77ea8b2e6f..2626830cb4f7 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -574,7 +574,7 @@ void ODbaseIndex::CreateImpl() if(xSet->last()) { Reference< XUnoTunnel> xTunnel(xSet, UNO_QUERY_THROW); - ODbaseResultSet* pDbaseRes = reinterpret_cast< ODbaseResultSet* >( xTunnel->getSomething(ODbaseResultSet::getUnoTunnelImplementationId()) ); + ODbaseResultSet* pDbaseRes = reinterpret_cast< ODbaseResultSet* >( xTunnel->getSomething(ODbaseResultSet::getUnoTunnelId()) ); assert(pDbaseRes); //"No dbase resultset found? What's going on here! nRowsLeft = xSet->getRow(); diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx index 9bb1cfc920b7..c5fdadbbf5d0 100644 --- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx +++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx @@ -404,7 +404,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( Reference<XUnoTunnel> xTunnel(xTable,UNO_QUERY); if(xTunnel.is()) { - OFileTable* pTable = reinterpret_cast< OFileTable* >( xTunnel->getSomething(OFileTable::getUnoTunnelImplementationId()) ); + OFileTable* pTable = reinterpret_cast< OFileTable* >( xTunnel->getSomething(OFileTable::getUnoTunnelId()) ); if(pTable && !pTable->isReadOnly()) { aRow[6] = ODatabaseMetaDataResultSet::getInsertValue(); diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index d1f7bedd9151..29c2d1caeb95 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <comphelper/sequence.hxx> +#include <comphelper/servicehelper.hxx> #include <cppuhelper/typeprovider.hxx> #include <connectivity/dbconversion.hxx> #include <connectivity/dbtools.hxx> @@ -1387,7 +1388,7 @@ void OResultSet::OpenImpl() m_nFilePos = 0; } -Sequence< sal_Int8 > OResultSet::getUnoTunnelImplementationId() +Sequence< sal_Int8 > OResultSet::getUnoTunnelId() { static ::cppu::OImplementationId implId; @@ -1398,7 +1399,7 @@ Sequence< sal_Int8 > OResultSet::getUnoTunnelImplementationId() sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId ) { - return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + return isUnoTunnelId<OResultSet>(rId) ? reinterpret_cast< sal_Int64 >( this ) : 0; } @@ -1538,7 +1539,7 @@ Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInf void OResultSet::doTableSpecials(const OSQLTable& _xTable) { Reference<css::lang::XUnoTunnel> xTunnel(_xTable, UNO_QUERY_THROW); - m_pTable = reinterpret_cast< OFileTable* >(xTunnel->getSomething(OFileTable::getUnoTunnelImplementationId())); + m_pTable = reinterpret_cast< OFileTable* >(xTunnel->getSomething(OFileTable::getUnoTunnelId())); assert(m_pTable.is()); } diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 975b0d12d7a0..3d45af9f3648 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -403,7 +403,7 @@ void OStatement_Base::construct(const OUString& sql) Reference< css::lang::XUnoTunnel> xTunnel(rTabs.begin()->second,UNO_QUERY); if(xTunnel.is()) { - m_pTable = reinterpret_cast<OFileTable*>(xTunnel->getSomething(OFileTable::getUnoTunnelImplementationId())); + m_pTable = reinterpret_cast<OFileTable*>(xTunnel->getSomething(OFileTable::getUnoTunnelId())); } OSL_ENSURE(m_pTable.is(),"No table!"); if ( m_pTable.is() ) diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx index f85a33e5e5f9..11c46f73f455 100644 --- a/connectivity/source/drivers/file/FTable.cxx +++ b/connectivity/source/drivers/file/FTable.cxx @@ -22,6 +22,7 @@ #include <file/FColumns.hxx> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> +#include <comphelper/servicehelper.hxx> #include <cppuhelper/typeprovider.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> @@ -120,7 +121,7 @@ void SAL_CALL OFileTable::disposing() FileClose(); } -Sequence< sal_Int8 > OFileTable::getUnoTunnelImplementationId() +Sequence< sal_Int8 > OFileTable::getUnoTunnelId() { static ::cppu::OImplementationId s_Id; @@ -131,7 +132,7 @@ Sequence< sal_Int8 > OFileTable::getUnoTunnelImplementationId() sal_Int64 OFileTable::getSomething( const Sequence< sal_Int8 > & rId ) { - return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + return isUnoTunnelId<OFileTable>(rId) ? reinterpret_cast< sal_Int64 >( this ) : OTable_TYPEDEF::getSomething(rId); } diff --git a/connectivity/source/inc/ado/AColumn.hxx b/connectivity/source/inc/ado/AColumn.hxx index d4a4cb1b9e68..cc49f3b364c4 100644 --- a/connectivity/source/inc/ado/AColumn.hxx +++ b/connectivity/source/inc/ado/AColumn.hxx @@ -49,7 +49,7 @@ namespace connectivity virtual void construct() override; // css::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; - static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + static css::uno::Sequence< sal_Int8 > getUnoTunnelId(); WpADOColumn getColumnImpl() const; }; diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx index a9c34814debe..21bc9129c2c8 100644 --- a/connectivity/source/inc/ado/AConnection.hxx +++ b/connectivity/source/inc/ado/AConnection.hxx @@ -78,7 +78,7 @@ namespace connectivity //XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; - static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + static css::uno::Sequence< sal_Int8 > getUnoTunnelId(); // XServiceInfo DECLARE_SERVICE_INFO(); // OComponentHelper diff --git a/connectivity/source/inc/ado/AGroup.hxx b/connectivity/source/inc/ado/AGroup.hxx index 79c067d4462e..b08487195291 100644 --- a/connectivity/source/inc/ado/AGroup.hxx +++ b/connectivity/source/inc/ado/AGroup.hxx @@ -50,7 +50,7 @@ namespace connectivity // css::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; - static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + static css::uno::Sequence< sal_Int8 > getUnoTunnelId(); // XAuthorizable virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) override; diff --git a/connectivity/source/inc/ado/AIndex.hxx b/connectivity/source/inc/ado/AIndex.hxx index eb5790173aa6..783c904cf27c 100644 --- a/connectivity/source/inc/ado/AIndex.hxx +++ b/connectivity/source/inc/ado/AIndex.hxx @@ -43,7 +43,7 @@ namespace connectivity OAdoIndex(bool _bCase, OConnection* _pConnection); // css::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; - static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + static css::uno::Sequence< sal_Int8 > getUnoTunnelId(); WpADOIndex getImpl() const { return m_aIndex;} }; diff --git a/connectivity/source/inc/ado/AKey.hxx b/connectivity/source/inc/ado/AKey.hxx index 2c4acba3fd73..e14cb210c3f0 100644 --- a/connectivity/source/inc/ado/AKey.hxx +++ b/connectivity/source/inc/ado/AKey.hxx @@ -46,7 +46,7 @@ namespace connectivity // css::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; - static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + static css::uno::Sequence< sal_Int8 > getUnoTunnelId(); WpADOKey getImpl() const { return m_aKey;} // map the update/delete rules diff --git a/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx index 4e569f6561b3..51a9fd14588b 100644 --- a/connectivity/source/inc/ado/ATable.hxx +++ b/connectivity/source/inc/ado/ATable.hxx @@ -58,7 +58,7 @@ namespace connectivity virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() const override; // css::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; - static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + static css::uno::Sequence< sal_Int8 > getUnoTunnelId(); // XRename virtual void SAL_CALL rename( const OUString& newName ) override; diff --git a/connectivity/source/inc/ado/AUser.hxx b/connectivity/source/inc/ado/AUser.hxx index a3f2c97e7fd9..046c2055cd04 100644 --- a/connectivity/source/inc/ado/AUser.hxx +++ b/connectivity/source/inc/ado/AUser.hxx @@ -53,7 +53,7 @@ namespace connectivity // css::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; - static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + static css::uno::Sequence< sal_Int8 > getUnoTunnelId(); // XUser virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) override; // XAuthorizable diff --git a/connectivity/source/inc/ado/AView.hxx b/connectivity/source/inc/ado/AView.hxx index 43ad6a9a3cf2..1bc3dd00bf2d 100644 --- a/connectivity/source/inc/ado/AView.hxx +++ b/connectivity/source/inc/ado/AView.hxx @@ -45,7 +45,7 @@ namespace connectivity // css::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; - static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + static css::uno::Sequence< sal_Int8 > getUnoTunnelId(); WpADOView getImpl() const { return m_aView;} }; diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 155f7a6e2413..61bc7f033775 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -250,7 +250,7 @@ namespace connectivity virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; // css::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; - static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + static css::uno::Sequence< sal_Int8 > getUnoTunnelId(); //XEventlistener virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx index d9ae501bd3f4..df3e9714b52c 100644 --- a/connectivity/source/inc/file/FTable.hxx +++ b/connectivity/source/inc/file/FTable.hxx @@ -90,7 +90,7 @@ namespace connectivity // m_pFileStream && !m_pFileStream->IsWritable(); } // css::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; - static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + static css::uno::Sequence< sal_Int8 > getUnoTunnelId(); sal_Int32 getFilePos() const { return m_nFilePos; } diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx index 3f9f16707c70..e25c38d80d3c 100644 --- a/include/comphelper/types.hxx +++ b/include/comphelper/types.hxx @@ -56,7 +56,7 @@ namespace comphelper { css::uno::Reference< css::lang::XUnoTunnel > xTunnel(_rxIFace, css::uno::UNO_QUERY); if (xTunnel.is()) - return reinterpret_cast< TYPE* >(xTunnel->getSomething(TYPE::getUnoTunnelImplementationId())); + return reinterpret_cast< TYPE* >(xTunnel->getSomething(TYPE::getUnoTunnelId())); return nullptr; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits