diff options
48 files changed, 102 insertions, 130 deletions
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index 61c837697576..891dd74b757e 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -135,9 +135,8 @@ namespace Sequence< sal_Int8 > OToolBoxWindowItem::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } sal_Int64 SAL_CALL OToolBoxWindowItem::getSomething( const Sequence< sal_Int8 >& _rId ) diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx index b3d4a372d2b2..d663a2bd8116 100644 --- a/comphelper/source/misc/accimplaccess.cxx +++ b/comphelper/source/misc/accimplaccess.cxx @@ -41,9 +41,8 @@ namespace comphelper Sequence<sal_Int8> OAccessibleImplementationAccess::getUnoTunnelId() { - static cppu::OImplementationId implID; - - return implID.getImplementationId(); + static const comphelper::UnoIdInit implID; + return implID.getSeq(); } diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index eb08aa4fe82c..614c91b7440b 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.cxx @@ -165,9 +165,8 @@ sal_Int64 SAL_CALL OConnectionWrapper::getSomething( const Sequence< sal_Int8 >& Sequence< sal_Int8 > OConnectionWrapper::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } namespace diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx index 6e7709cc2e1a..e15b5ad464d9 100644 --- a/connectivity/source/commontools/TConnection.cxx +++ b/connectivity/source/commontools/TConnection.cxx @@ -64,9 +64,8 @@ sal_Int64 SAL_CALL OMetaConnection::getSomething( const css::uno::Sequence< sal_ Sequence< sal_Int8 > OMetaConnection::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } ::dbtools::OPropertyMap& OMetaConnection::getPropMap() diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index 2f0f5ca53f2e..5315f858c7b2 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -81,9 +81,8 @@ OAdoColumn::OAdoColumn(bool _bCase,OConnection* _pConnection) Sequence< sal_Int8 > OAdoColumn::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } // css::lang::XUnoTunnel diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 0669955356bf..394fe0ed3666 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -499,9 +499,8 @@ sal_Int64 SAL_CALL OConnection::getSomething( const css::uno::Sequence< sal_Int8 Sequence< sal_Int8 > OConnection::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx index 3a5a736431c0..2504616a9f6d 100644 --- a/connectivity/source/drivers/ado/AGroup.cxx +++ b/connectivity/source/drivers/ado/AGroup.cxx @@ -84,9 +84,8 @@ void OAdoGroup::refreshUsers() Sequence< sal_Int8 > OAdoGroup::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } // css::lang::XUnoTunnel diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx index 3445ab78a240..44d562bfea61 100644 --- a/connectivity/source/drivers/ado/AIndex.cxx +++ b/connectivity/source/drivers/ado/AIndex.cxx @@ -73,9 +73,8 @@ void OAdoIndex::refreshColumns() Sequence< sal_Int8 > OAdoIndex::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } // css::lang::XUnoTunnel diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx index 6c3db4537e85..d27d93e8ce3f 100644 --- a/connectivity/source/drivers/ado/AKey.cxx +++ b/connectivity/source/drivers/ado/AKey.cxx @@ -69,9 +69,8 @@ void OAdoKey::refreshColumns() Sequence< sal_Int8 > OAdoKey::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } // css::lang::XUnoTunnel diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index 6b2175a46b29..d656dad7ff45 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.cxx @@ -130,9 +130,8 @@ void OAdoTable::refreshIndexes() Sequence< sal_Int8 > OAdoTable::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } // css::lang::XUnoTunnel diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index 4d86ce97d63f..da73707489ae 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.cxx @@ -68,9 +68,8 @@ void OAdoUser::refreshGroups() Sequence< sal_Int8 > OAdoUser::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } // css::lang::XUnoTunnel diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx index 5460bab249c2..32ed99a112ff 100644 --- a/connectivity/source/drivers/ado/AView.cxx +++ b/connectivity/source/drivers/ado/AView.cxx @@ -43,9 +43,8 @@ OAdoView::OAdoView(bool _bCase,ADOView* _pView) : OView_ADO(_bCase,nullptr) Sequence< sal_Int8 > OAdoView::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } // css::lang::XUnoTunnel diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index 382142ece38e..676ffa051371 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -612,9 +612,8 @@ void SAL_CALL OCalcTable::disposing() Sequence< sal_Int8 > OCalcTable::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } // css::lang::XUnoTunnel diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index f2dce48c62b7..0c269bf847d6 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -102,9 +102,8 @@ void ODbaseIndex::refreshColumns() Sequence< sal_Int8 > ODbaseIndex::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } // XUnoTunnel diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index a270d3ad007f..32b599e03129 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -733,9 +733,8 @@ Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) Sequence< sal_Int8 > ODbaseTable::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } // css::lang::XUnoTunnel diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index 3b0dacea6f37..4d28d218bca6 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -408,9 +408,8 @@ sal_Int64 SAL_CALL OConnection::getSomething( const Sequence< sal_Int8 >& rId ) Sequence< sal_Int8 > OConnection::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } void OConnection::throwUrlNotValid(const OUString & _rsUrl,const OUString & _rsMessage) diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 7c2649d8fc8f..13a678656fae 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -1382,9 +1382,8 @@ void OResultSet::OpenImpl() Sequence< sal_Int8 > OResultSet::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } // css::lang::XUnoTunnel diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx index 7da609bb4ae0..6a6c10886c89 100644 --- a/connectivity/source/drivers/file/FTable.cxx +++ b/connectivity/source/drivers/file/FTable.cxx @@ -121,9 +121,8 @@ void SAL_CALL OFileTable::disposing() Sequence< sal_Int8 > OFileTable::getUnoTunnelId() { - static ::cppu::OImplementationId s_Id; - - return s_Id.getImplementationId(); + static const comphelper::UnoIdInit s_Id; + return s_Id.getSeq(); } // css::lang::XUnoTunnel diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index dd827eca52a7..a4ed730c896c 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -388,8 +388,8 @@ sal_Int64 SAL_CALL Connection::getSomething(const css::uno::Sequence<sal_Int8>& // static css::uno::Sequence<sal_Int8> Connection::getUnoTunnelId() { - static const cppu::OImplementationId implId; - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } //----- XConnection ---------------------------------------------------------- diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 43116033add6..efc24d3bed4b 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -553,9 +553,8 @@ Any SAL_CALL OFlatTable::queryInterface( const Type & rType ) Sequence< sal_Int8 > OFlatTable::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } // css::lang::XUnoTunnel diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 76d0c5b332ee..21179a69778f 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -118,9 +118,8 @@ sdbcx::OCollection* OHSQLTable::createIndexes(const ::std::vector< OUString>& _r Sequence< sal_Int8 > OHSQLTable::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } // css::lang::XUnoTunnel diff --git a/connectivity/source/drivers/mysql_jdbc/YTable.cxx b/connectivity/source/drivers/mysql_jdbc/YTable.cxx index 22c6bfa6df6c..83a8cb2081af 100644 --- a/connectivity/source/drivers/mysql_jdbc/YTable.cxx +++ b/connectivity/source/drivers/mysql_jdbc/YTable.cxx @@ -119,9 +119,8 @@ sdbcx::OCollection* OMySQLTable::createIndexes(const ::std::vector<OUString>& _r Sequence<sal_Int8> OMySQLTable::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } // css::lang::XUnoTunnel diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx index a1e97ab836ed..8248973a80af 100644 --- a/connectivity/source/drivers/writer/WTable.cxx +++ b/connectivity/source/drivers/writer/WTable.cxx @@ -213,9 +213,8 @@ void SAL_CALL OWriterTable::disposing() uno::Sequence<sal_Int8> OWriterTable::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } sal_Int64 OWriterTable::getSomething(const uno::Sequence<sal_Int8>& rId) diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx index 0d70aa0b41af..4741b5896612 100644 --- a/connectivity/source/sdbcx/VDescriptor.cxx +++ b/connectivity/source/sdbcx/VDescriptor.cxx @@ -94,9 +94,8 @@ namespace connectivity::sdbcx Sequence< sal_Int8 > ODescriptor::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 798783587995..22369333205a 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -445,9 +445,8 @@ sal_Int64 SAL_CALL ORowSet::getSomething( const Sequence< sal_Int8 >& rId ) Sequence< sal_Int8 > ORowSet::getUnoTunnelId() { - static ::cppu::OImplementationId s_Id; - - return s_Id.getImplementationId(); + static const comphelper::UnoIdInit s_Id; + return s_Id.getSeq(); } // css::XAggregation @@ -2901,9 +2900,8 @@ void ORowSetClone::close() Sequence< sal_Int8 > ORowSetClone::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } // css::XUnoTunnel diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index e4b3a07e697d..9cf3538de89c 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -463,9 +463,8 @@ sal_Int64 SAL_CALL ODBTableDecorator::getSomething( const Sequence< sal_Int8 >& Sequence< sal_Int8 > ODBTableDecorator::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } void ODBTableDecorator::fillPrivileges() const diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index bd0c59c75fbf..012efe81793f 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -148,8 +148,8 @@ sal_Int64 SAL_CALL OQueryDescriptor_Base::getSomething( const Sequence< sal_Int8 css::uno::Sequence<sal_Int8> OQueryDescriptor_Base::getUnoTunnelId() { - static cppu::OImplementationId aId; - return aId.getImplementationId(); + static const comphelper::UnoIdInit aId; + return aId.getSeq(); } css::uno::Sequence<sal_Int8> OQueryDescriptor_Base::getImplementationId() diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 94cb5646032d..11ca5852b99a 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -307,9 +307,8 @@ sal_Int64 SAL_CALL ODBTable::getSomething( const Sequence< sal_Int8 >& rId ) Sequence< sal_Int8 > ODBTable::getUnoTunnelId() { - static ::cppu::OImplementationId s_Id; - - return s_Id.getImplementationId(); + static const comphelper::UnoIdInit s_Id; + return s_Id.getSeq(); } Reference< XPropertySet > ODBTable::createColumnDescriptor() diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index d18be06e882b..0cb510dc3dd5 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -91,8 +91,8 @@ IMPLEMENT_SERVICE_INFO1(OContentHelper,"com.sun.star.comp.sdb.Content","com.sun. css::uno::Sequence<sal_Int8> OContentHelper::getUnoTunnelId() { - static cppu::OImplementationId aId; - return aId.getImplementationId(); + static const comphelper::UnoIdInit aId; + return aId.getSeq(); } css::uno::Sequence<sal_Int8> OContentHelper::getImplementationId() diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 651dca08f674..d47fa88c3f16 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -717,9 +717,8 @@ sal_Int64 SAL_CALL ODatabaseContext::getSomething( const Sequence< sal_Int8 >& r Sequence< sal_Int8 > ODatabaseContext::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } void ODatabaseContext::onBasicManagerCreated( const Reference< XModel >& _rxForDocument, BasicManager& _rBasicManager ) diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx index d2c5c98b94e1..051fbd8c4928 100644 --- a/dbaccess/source/ui/querydesign/JoinExchange.cxx +++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx @@ -64,9 +64,8 @@ namespace dbaui Sequence< sal_Int8 > OJoinExchObj::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } sal_Int64 SAL_CALL OJoinExchObj::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 095e00e6ab0b..83f4a8c71159 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -19,6 +19,7 @@ #include <osl/mutex.hxx> +#include <comphelper/servicehelper.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/component.hxx> @@ -163,8 +164,8 @@ OUString SAL_CALL XMLFilterDialogComponent::getImplementationName() Sequence< sal_Int8 > SAL_CALL XMLFilterDialogComponent::getImplementationId() { - static ::cppu::OImplementationId implId; - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 3e2930d1bfeb..84c103ae6a2b 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -526,8 +526,8 @@ namespace frm Sequence<sal_Int8> ORichTextModel::getUnoTunnelId() { - static cppu::OImplementationId aId; - return aId.getImplementationId(); + static const comphelper::UnoIdInit aId; + return aId.getSeq(); } diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index 6b29e26685b7..0d8add6108d0 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -301,8 +301,8 @@ EvaluationContext Binding::getEvaluationContext() const css::uno::Sequence<sal_Int8> Binding::getUnoTunnelId() { - static cppu::OImplementationId aImplementationId; - return aImplementationId.getImplementationId(); + static const comphelper::UnoIdInit aImplementationId; + return aImplementationId.getSeq(); } diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index f3bad8a5f323..0668028f5af8 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -131,8 +131,8 @@ EvaluationContext Model::getEvaluationContext() css::uno::Sequence<sal_Int8> Model::getUnoTunnelId() { - static cppu::OImplementationId aImplementationId; - return aImplementationId.getImplementationId(); + static const comphelper::UnoIdInit aImplementationId; + return aImplementationId.getSeq(); } diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index 64d2e59524e9..909ce530bc9e 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -256,8 +256,8 @@ bool Submission::doSubmit( const Reference< XInteractionHandler >& xHandler ) Sequence<sal_Int8> Submission::getUnoTunnelId() { - static cppu::OImplementationId aImplementationId; - return aImplementationId.getImplementationId(); + static const comphelper::UnoIdInit aImplementationId; + return aImplementationId.getSeq(); } diff --git a/include/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx index a8fe258a1d64..546ffa604ebc 100644 --- a/include/cppuhelper/typeprovider.hxx +++ b/include/cppuhelper/typeprovider.hxx @@ -173,7 +173,7 @@ public: /** Helper class to implement IDs for XUnoTunnel. Construct a static object of this class for your UNO object's implementation id. */ -class SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OImplementationId +class SAL_DEPRECATED("Uses broken double checked locking") SAL_WARN_UNUSED CPPUHELPER_DLLPUBLIC OImplementationId { mutable css::uno::Sequence< sal_Int8 > * _pSeq; sal_Bool _bUseEthernetAddress; @@ -211,10 +211,12 @@ public: : _pSeq( new css::uno::Sequence< sal_Int8 >( rSeq ) ) , _bUseEthernetAddress( false ) {} +SAL_WNODEPRECATED_DECLARATIONS_PUSH OImplementationId( const OImplementationId & rId ) : _pSeq( new css::uno::Sequence< sal_Int8 >( rId.getImplementationId() ) ) , _bUseEthernetAddress( false ) {} +SAL_WNODEPRECATED_DECLARATIONS_POP /** Get implementation id. diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index a049a47a8030..f821fd2494c8 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -42,6 +42,7 @@ #include <osl/diagnose.h> #include <comphelper/processfactory.hxx> +#include <comphelper/servicehelper.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/ofopxmlhelper.hxx> #include <comphelper/multicontainer2.hxx> @@ -1931,8 +1932,8 @@ uno::Sequence< uno::Type > SAL_CALL OWriteStream::getTypes() uno::Sequence< sal_Int8 > SAL_CALL OWriteStream::getImplementationId() { - static ::cppu::OImplementationId lcl_ImplId; - return lcl_ImplId.getImplementationId(); + static const comphelper::UnoIdInit lcl_ImplId; + return lcl_ImplId.getSeq(); } sal_Int32 SAL_CALL OWriteStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index e8153d4e79aa..27d84e97fa6f 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -54,6 +54,7 @@ #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <comphelper/servicehelper.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/ofopxmlhelper.hxx> #include <comphelper/multicontainer2.hxx> @@ -2173,8 +2174,8 @@ uno::Sequence< uno::Type > SAL_CALL OStorage::getTypes() uno::Sequence< sal_Int8 > SAL_CALL OStorage::getImplementationId() { - static ::cppu::OImplementationId lcl_ImplId; - return lcl_ImplId.getImplementationId(); + static const comphelper::UnoIdInit lcl_ImplId; + return lcl_ImplId.getSeq(); } // XStorage diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index a64413ae4e11..4b220862c0e3 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -1676,9 +1676,8 @@ sal_Bool SAL_CALL ZipPackage::supportsService( OUString const & rServiceName ) Sequence< sal_Int8 > ZipPackage::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } sal_Int64 SAL_CALL ZipPackage::getSomething( const uno::Sequence< sal_Int8 >& aIdentifier ) diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index 8733fc5c6ac6..1c9207b1c09a 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -150,8 +150,8 @@ void ZipPackageFolder::setChildStreamsTypeByExtension( const beans::StringPair& css::uno::Sequence < sal_Int8 > ZipPackageFolder::getUnoTunnelId() { - static cppu::OImplementationId lcl_CachedImplId; - return lcl_CachedImplId.getImplementationId(); + static const comphelper::UnoIdInit lcl_CachedImplId; + return lcl_CachedImplId.getSeq(); } // XNameContainer diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 13c5758107a8..3facbb48addf 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -76,8 +76,8 @@ using namespace cppu; css::uno::Sequence < sal_Int8 > ZipPackageStream::getUnoTunnelId() { - static cppu::OImplementationId lcl_CachedImplId; - return lcl_CachedImplId.getImplementationId(); + static const comphelper::UnoIdInit lcl_CachedImplId; + return lcl_CachedImplId.getSeq(); } ZipPackageStream::ZipPackageStream ( ZipPackage & rNewPackage, diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx index a6d10da1d779..3bca5c232a11 100644 --- a/pyuno/source/module/pyuno_adapter.cxx +++ b/pyuno/source/module/pyuno_adapter.cxx @@ -69,8 +69,8 @@ Adapter::~Adapter() Sequence<sal_Int8> Adapter::getUnoTunnelId() { - static const cppu::OImplementationId g_id(false); - return g_id.getImplementationId(); + static const comphelper::UnoIdInit g_id; + return g_id.getSeq(); } sal_Int64 Adapter::getSomething( const Sequence< sal_Int8 > &id) diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 34b1140b0a9d..4d9f078827f7 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1963,9 +1963,8 @@ uno::Sequence< sal_Int8 > SAL_CALL OReportDefinition::getImplementationId( ) uno::Sequence< sal_Int8 > OReportDefinition::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } uno::Reference< uno::XComponentContext > OReportDefinition::getContext() diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 73dcd20a1b6a..b3255bc290e0 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -573,9 +573,8 @@ sal_Int64 OSection::getSomething( const uno::Sequence< sal_Int8 > & rId ) uno::Sequence< sal_Int8 > OSection::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } void OSection::notifyElementAdded(const uno::Reference< drawing::XShape >& xShape ) diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index af61a578d135..6db45b9ee00a 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -293,8 +293,8 @@ namespace toolkit Sequence< sal_Int8 > GridColumn::getUnoTunnelId() noexcept { - static ::cppu::OImplementationId const aId; - return aId.getImplementationId(); + static const comphelper::UnoIdInit aId; + return aId.getSeq(); } } diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx index 9a7073740c7c..3e8814192dbf 100644 --- a/vcl/source/gdi/graph.cxx +++ b/vcl/source/gdi/graph.cxx @@ -558,8 +558,8 @@ OString Graphic::getUniqueID() const } css::uno::Sequence<sal_Int8> Graphic::getUnoTunnelId() { - static cppu::OImplementationId gId; - return gId.getImplementationId(); + static const comphelper::UnoIdInit gId; + return gId.getSeq(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx index 3473171e2961..e1000689bd46 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx @@ -36,9 +36,8 @@ XMLElementWrapper_XmlSecImpl::XMLElementWrapper_XmlSecImpl(const xmlNodePtr pNod /* XUnoTunnel */ uno::Sequence< sal_Int8 > XMLElementWrapper_XmlSecImpl::getUnoTunnelId() { - static ::cppu::OImplementationId implId; - - return implId.getImplementationId(); + static const comphelper::UnoIdInit implId; + return implId.getSeq(); } sal_Int64 SAL_CALL XMLElementWrapper_XmlSecImpl::getSomething( const uno::Sequence< sal_Int8 >& aIdentifier ) |