diff options
Diffstat (limited to 'forms/source/misc/InterfaceContainer.cxx')
| -rw-r--r-- | forms/source/misc/InterfaceContainer.cxx | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index f76f8a0a2c93..7954470c3193 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 <memory> +#include <boost/scoped_ptr.hpp> //......................................................................... #include <com/sun/star/frame/XModel.hpp> @@ -809,9 +809,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper // SYNCHRONIZED -----> ::osl::ClearableMutexGuard aGuard( m_rMutex ); - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ElementDescription > aAutoDeleteMetaData; - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr< ElementDescription > aAutoDeleteMetaData; ElementDescription* pElementMetaData = _pApprovalResult; if ( !pElementMetaData ) { // not yet approved by the caller -> do ourself @@ -819,9 +817,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper DBG_ASSERT( pElementMetaData, "OInterfaceContainer::implInsert: createElementMetaData returned nonsense!" ); // ensure that the meta data structure will be deleted later on - SAL_WNODEPRECATED_DECLARATIONS_PUSH - aAutoDeleteMetaData = ::std::auto_ptr< ElementDescription >( pElementMetaData ); - SAL_WNODEPRECATED_DECLARATIONS_POP + aAutoDeleteMetaData.reset( pElementMetaData ); // will throw an exception if necessary approveNewElement( _rxElement, pElementMetaData ); @@ -961,9 +957,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 - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ElementDescription > aElementMetaData( createElementMetaData() ); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr< ElementDescription > aElementMetaData( createElementMetaData() ); DBG_ASSERT( aElementMetaData.get(), "OInterfaceContainer::implReplaceByIndex: createElementMetaData returned nonsense!" ); { Reference< XPropertySet > xElementProps; @@ -1111,9 +1105,7 @@ void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const An { Reference< XPropertySet > xElementProps; - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ElementDescription > aElementMetaData( createElementMetaData() ); - SAL_WNODEPRECATED_DECLARATIONS_POP + boost::scoped_ptr< ElementDescription > aElementMetaData( createElementMetaData() ); DBG_ASSERT( aElementMetaData.get(), "OInterfaceContainer::insertByName: createElementMetaData returned nonsense!" ); // ensure the correct name of the element |