diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-10-25 16:54:21 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-10-26 16:09:20 +0100 |
| commit | 71f6aab077f30f8b0eb6c7458cb0646dea892148 (patch) | |
| tree | 448b15eabaf170862914c09f8fe7135b29c0ac05 /basic | |
| parent | 79a7cf54244ffd112bea4d754e494d261ce3f061 (diff) | |
basic: replace boot::ptr_vector with std::vector
Change-Id: I4967ad8345cd74c39edbea1df513978b62996b90
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/propacc.cxx | 6 | ||||
| -rw-r--r-- | basic/source/inc/propacc.hxx | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index dac042e7388f..2a0b49af8eed 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -26,6 +26,7 @@ #include <comphelper/propertysetinfo.hxx> +#include <algorithm> #include <limits.h> using com::sun::star::uno::Reference; @@ -178,14 +179,13 @@ void SbPropertyValues::setPropertyValues(const Sequence< PropertyValue >& rPrope css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { - if ( !m_aPropVals.empty() ) + if (!m_aPropVals.empty()) throw IllegalArgumentException(); const PropertyValue *pPropVals = rPropertyValues.getConstArray(); for (sal_Int32 n = 0; n < rPropertyValues.getLength(); ++n) { - PropertyValue *pPropVal = new PropertyValue(pPropVals[n]); - m_aPropVals.push_back( pPropVal ); + m_aPropVals.push_back(pPropVals[n]); } } diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 325976ec3fea..ec227a44647b 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -25,9 +25,10 @@ #include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/beans/XPropertyContainer.hpp> #include <cppuhelper/implbase.hxx> -#include <boost/ptr_container/ptr_vector.hpp> -typedef ::boost::ptr_vector< css::beans::PropertyValue > SbPropertyValueArr_Impl; +#include <vector> + +typedef ::std::vector<css::beans::PropertyValue> SbPropertyValueArr_Impl; typedef ::cppu::WeakImplHelper< css::beans::XPropertySet, css::beans::XPropertyAccess > SbPropertyValuesHelper; |