From 3a00aaef2a51d7a1a87475a316dc9ae232fac60c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 17 Sep 2015 17:10:47 +0100 Subject: boost->std MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie490bf2c6921f393bdeed96b1a8815996b701bf0 Reviewed-on: https://gerrit.libreoffice.org/18670 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- forms/source/misc/InterfaceContainer.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'forms/source/misc/InterfaceContainer.cxx') diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 4e54c53a382e..3fd364fdf512 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -45,7 +45,7 @@ #include #include -#include +#include #include @@ -803,7 +803,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper // SYNCHRONIZED -----> ::osl::ClearableMutexGuard aGuard( m_rMutex ); - boost::scoped_ptr< ElementDescription > aAutoDeleteMetaData; + std::unique_ptr< ElementDescription > aAutoDeleteMetaData; ElementDescription* pElementMetaData = _pApprovalResult; if ( !pElementMetaData ) { // not yet approved by the caller -> do ourself @@ -951,7 +951,7 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any OSL_PRECOND( ( _nIndex >= 0 ) && ( _nIndex < (sal_Int32)m_aItems.size() ), "OInterfaceContainer::implReplaceByIndex: precondition not met (index)!" ); // approve the new object - boost::scoped_ptr< ElementDescription > aElementMetaData( createElementMetaData() ); + std::unique_ptr< ElementDescription > aElementMetaData( createElementMetaData() ); DBG_ASSERT( aElementMetaData.get(), "OInterfaceContainer::implReplaceByIndex: createElementMetaData returned nonsense!" ); { Reference< XPropertySet > xElementProps; @@ -1099,7 +1099,7 @@ void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const An { Reference< XPropertySet > xElementProps; - boost::scoped_ptr< ElementDescription > aElementMetaData( createElementMetaData() ); + std::unique_ptr< ElementDescription > aElementMetaData( createElementMetaData() ); DBG_ASSERT( aElementMetaData.get(), "OInterfaceContainer::insertByName: createElementMetaData returned nonsense!" ); // ensure the correct name of the element -- cgit a/co-24.04.3'>distro/collabora/co-24.04.3 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-04-21gbuild: Remove MSVC 2013 legacy codeDavid Ostrovsky
2016-06-03Add initial CppunitTest_framework_dispatchMiklos Vajna