From 650818bf8387636afce9af3672abb84f29b99ee2 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 19 Jul 2021 12:29:17 +0200 Subject: no need to allocate Sequence separately in PropertySetInfo Change-Id: Ibe558facd380e832faaf450a36249620b98ee786 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119217 Tested-by: Jenkins Reviewed-by: Noel Grandin --- ucbhelper/source/provider/resultset.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ucbhelper/source') diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index f736bac8a789..3bca0b0349ea 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -90,7 +90,7 @@ class PropertySetInfo : public lang::XTypeProvider, public beans::XPropertySetInfo { - std::unique_ptr> m_pProps; + uno::Sequence< beans::Property > m_aProps; private: bool queryProperty( @@ -1401,14 +1401,14 @@ namespace ucbhelper_impl { PropertySetInfo::PropertySetInfo( const PropertyInfo* pProps, sal_Int32 nProps ) - : m_pProps( new uno::Sequence< beans::Property >( nProps ) ) + : m_aProps( nProps ) { if ( !nProps ) return; const PropertyInfo* pEntry = pProps; - beans::Property* pProperties = m_pProps->getArray(); + beans::Property* pProperties = m_aProps.getArray(); for ( sal_Int32 n = 0; n < nProps; ++n ) { @@ -1462,7 +1462,7 @@ XTYPEPROVIDER_IMPL_2( PropertySetInfo, // virtual uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() { - return *m_pProps; + return m_aProps; } @@ -1490,8 +1490,8 @@ sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( bool PropertySetInfo::queryProperty( std::u16string_view aName, beans::Property& rProp ) const { - sal_Int32 nCount = m_pProps->getLength(); - const beans::Property* pProps = m_pProps->getConstArray(); + sal_Int32 nCount = m_aProps.getLength(); + const beans::Property* pProps = m_aProps.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) { const beans::Property& rCurr = pProps[ n ]; -- cgit