diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-17 17:44:51 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-17 20:26:59 +0200 |
| commit | 15f32b5a1ea289159703dd7b118a911c8d0da61d (patch) | |
| tree | d75860a270c00a61713fe842aa5a995488749461 /basic/source/sbx/sbxbase.cxx | |
| parent | ce6466f5736258b41f7aa892bdc1fc1451f6593d (diff) | |
basic: replace boost::ptr_vector with std::vector<std::unique_ptr>>
Change-Id: I96ea97c1df7903a28387d8e1171075be55a80ca7
Diffstat (limited to 'basic/source/sbx/sbxbase.cxx')
| -rw-r--r-- | basic/source/sbx/sbxbase.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 00728c6a8120..a1c9149a9c6d 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -328,20 +328,20 @@ SbxInfo::~SbxInfo() void SbxInfo::AddParam(const OUString& rName, SbxDataType eType, SbxFlagBits nFlags) { - aParams.push_back(new SbxParamInfo(rName, eType, nFlags)); + m_Params.push_back(std::unique_ptr<SbxParamInfo>(new SbxParamInfo(rName, eType, nFlags))); } const SbxParamInfo* SbxInfo::GetParam( sal_uInt16 n ) const { - if( n < 1 || n > aParams.size() ) + if (n < 1 || n > m_Params.size()) return NULL; else - return &(aParams[n - 1]); + return m_Params[n - 1].get(); } bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { - aParams.clear(); + m_Params.clear(); sal_uInt16 nParam; aComment = read_uInt16_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); @@ -359,7 +359,7 @@ bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) if( nVer > 1 ) rStrm.ReadUInt32( nUserData ); AddParam( aName, (SbxDataType) nType, nFlags ); - SbxParamInfo& p(aParams.back()); + SbxParamInfo& p(*m_Params.back()); p.nUserData = nUserData; } return true; @@ -371,8 +371,8 @@ bool SbxInfo::StoreData( SvStream& rStrm ) const RTL_TEXTENCODING_ASCII_US ); write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aHelpFile, RTL_TEXTENCODING_ASCII_US); - rStrm.WriteUInt32( nHelpId ).WriteUInt16( aParams.size() ); - for(SbxParams::const_iterator i = aParams.begin(); i != aParams.end(); ++i) + rStrm.WriteUInt32( nHelpId ).WriteUInt16( m_Params.size() ); + for (auto const& i : m_Params) { write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, i->aName, RTL_TEXTENCODING_ASCII_US); |