diff options
Diffstat (limited to 'forms/source/misc/InterfaceContainer.cxx')
| -rw-r--r-- | forms/source/misc/InterfaceContainer.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index ff5b9c79d86b..2f5c307419de 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -831,7 +831,9 @@ 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 ElementDescription* pElementMetaData = _pApprovalResult; if ( !pElementMetaData ) { // not yet approved by the caller -> do ourself @@ -839,7 +841,9 @@ 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 // will throw an exception if necessary approveNewElement( _rxElement, pElementMetaData ); @@ -979,7 +983,9 @@ 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 DBG_ASSERT( aElementMetaData.get(), "OInterfaceContainer::implReplaceByIndex: createElementMetaData returned nonsense!" ); { Reference< XPropertySet > xElementProps; @@ -1127,7 +1133,9 @@ void SAL_CALL OInterfaceContainer::insertByName(const ::rtl::OUString& _rName, c { Reference< XPropertySet > xElementProps; + SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ElementDescription > aElementMetaData( createElementMetaData() ); + SAL_WNODEPRECATED_DECLARATIONS_POP DBG_ASSERT( aElementMetaData.get(), "OInterfaceContainer::insertByName: createElementMetaData returned nonsense!" ); // ensure the correct name of the element |