diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-24 17:48:49 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-25 08:40:11 +0200 |
| commit | c91dec0dad6b0da5bfe15d0597bfc069df26f343 (patch) | |
| tree | af3f075afff656995fd34ac6771f2fe2fe2df77a /extensions | |
| parent | 5de8a127cd1790d37d5af83153b8103468eca6ce (diff) | |
comphelper: std::auto_ptr -> std::unique_ptr
Change-Id: I364d6252f470dcc6d71a191f1249e95ca1f284ce
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/eformshelper.cxx | 8 | ||||
| -rw-r--r-- | extensions/source/propctrlr/propertyhandler.cxx | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 99a432c11576..5afa1589ad87 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -243,9 +243,7 @@ namespace pcr { if ( !_bDoListen ) { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator(); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator(); while ( pListenerIterator->hasMoreElements() ) { PropertyEventTranslation* pTranslator = dynamic_cast< PropertyEventTranslation* >( pListenerIterator->next() ); @@ -279,9 +277,7 @@ namespace pcr } else { - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator(); - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > pListenerIterator = m_aPropertyListeners.createIterator(); while ( pListenerIterator->hasMoreElements() ) { Reference< XPropertyChangeListener > xListener( pListenerIterator->next(), UNO_QUERY ); diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index 862ab4b84a57..6ac121a9259d 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -78,10 +78,8 @@ namespace pcr return; // remove all old property change listeners - SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > removeListener = m_aPropertyListeners.createIterator(); - ::std::auto_ptr< ::cppu::OInterfaceIteratorHelper > readdListener = m_aPropertyListeners.createIterator(); // will copy the container as needed - SAL_WNODEPRECATED_DECLARATIONS_POP + ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > removeListener = m_aPropertyListeners.createIterator(); + ::std::unique_ptr< ::cppu::OInterfaceIteratorHelper > readdListener = m_aPropertyListeners.createIterator(); // will copy the container as needed while ( removeListener->hasMoreElements() ) removePropertyChangeListener( static_cast< XPropertyChangeListener* >( removeListener->next() ) ); OSL_ENSURE( m_aPropertyListeners.empty(), "PropertyHandler::inspect: derived classes are expected to forward the removePropertyChangeListener call to their base class (me)!" ); |