diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 17:10:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-18 07:59:14 +0000 |
| commit | 3a00aaef2a51d7a1a87475a316dc9ae232fac60c (patch) | |
| tree | 4cc4516528c0dcb0bb6871e5b517efb74550a521 /forms/source/misc | |
| parent | c8ee3be0e08c435b106f0ac4b76618b33333b040 (diff) | |
boost->std
Change-Id: Ie490bf2c6921f393bdeed96b1a8815996b701bf0
Reviewed-on: https://gerrit.libreoffice.org/18670
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'forms/source/misc')
| -rw-r--r-- | forms/source/misc/InterfaceContainer.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
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 <tools/diagnose_ex.h> #include <algorithm> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <com/sun/star/frame/XModel.hpp> @@ -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 |