diff options
| author | Derrick Rocha <drocha616@gmail.com> | 2015-09-11 11:27:46 -0600 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-13 06:21:51 +0000 |
| commit | d8707b06e4b5a1dc6934ba4c15774d370eed6535 (patch) | |
| tree | 14358dafa478e1838e241480d926eed1f73d01f7 | |
| parent | eb012bf0a8dcdb84e61bb13ca8a96c089ae479d3 (diff) | |
replace boost::ptr_vector with std::vector<std::unique_ptr>
Change-Id: Id9419f23dde4d93dde78398207dcf5c38e87f450
Reviewed-on: https://gerrit.libreoffice.org/18046
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
| -rw-r--r-- | sc/inc/cellsuno.hxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/cellsuno.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/chart2uno.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/dapiuno.cxx | 3 |
4 files changed, 4 insertions, 10 deletions
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index 7496a47f4366..d721b29b092d 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -89,7 +89,6 @@ #include <com/sun/star/sheet/XExternalSheetName.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> #include <cppuhelper/implbase.hxx> -#include <boost/ptr_container/ptr_vector.hpp> #include <boost/scoped_ptr.hpp> #include <vector> @@ -119,7 +118,7 @@ public: typedef ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > XModifyListenerRef; -typedef boost::ptr_vector<XModifyListenerRef> XModifyListenerArr_Impl; +typedef std::vector<XModifyListenerRef> XModifyListenerArr_Impl; // ScCellRangesBase - base class for ScCellRangesObj (with access by index) // and ScCellRangeObj (without access by index) diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index a2c83b4b37de..02638438b5f5 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -3413,9 +3413,7 @@ void SAL_CALL ScCellRangesBase::addModifyListener(const uno::Reference<util::XMo if ( aRanges.empty() ) throw uno::RuntimeException(); - uno::Reference<util::XModifyListener> *pObj = - new uno::Reference<util::XModifyListener>( aListener ); - aValueListeners.push_back( pObj ); + aValueListeners.push_back( uno::Reference<util::XModifyListener>( aListener ) ); if ( aValueListeners.size() == 1 ) { diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index e0efaaf829aa..a2b870c3470f 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -3347,9 +3347,7 @@ void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< uti ScRangeList aRanges; ScRefTokenHelper::getRangeListFromTokens(aRanges, *m_pTokens, ScAddress()); - uno::Reference<util::XModifyListener> *pObj = - new uno::Reference<util::XModifyListener>( aListener ); - m_aValueListeners.push_back( pObj ); + m_aValueListeners.push_back( uno::Reference<util::XModifyListener>( aListener ) ); if ( m_aValueListeners.size() == 1 ) { diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index fa9d99d14686..bad5abffc6f2 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -1302,8 +1302,7 @@ void SAL_CALL ScDataPilotTableObj::addModifyListener( const uno::Reference<util: { SolarMutexGuard aGuard; - uno::Reference<util::XModifyListener> *pObj = new uno::Reference<util::XModifyListener>( aListener ); - aModifyListeners.push_back( pObj ); + aModifyListeners.push_back( uno::Reference<util::XModifyListener>( aListener ) ); if ( aModifyListeners.size() == 1 ) { |