diff options
Diffstat (limited to 'scaddins/source/datefunc/datefunc.cxx')
-rw-r--r-- | scaddins/source/datefunc/datefunc.cxx | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index 64679fffc2fb..f3fe9a874332 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -62,12 +62,6 @@ void ScaList::_Grow() pData = pNewData; } -ScaStringList::~ScaStringList() -{ - for( OUString* pStr = First(); pStr; pStr = Next() ) - delete pStr; -} - ScaResId::ScaResId( sal_uInt16 nId, ResMgr& rResMgr ) : ResId( nId, rResMgr ) { @@ -109,7 +103,7 @@ ScaFuncData::ScaFuncData( const ScaFuncDataBase& rBaseData, ResMgr& rResMgr ) : const ResStringArray& rArr = aArrLoader.GetStringArray(); for( sal_uInt32 nIndex = 0; nIndex < rArr.Count(); nIndex++ ) - aCompList.Append( rArr.GetString( nIndex ) ); + aCompList.push_back( rArr.GetString( nIndex ) ); } ScaFuncData::~ScaFuncData() @@ -445,14 +439,14 @@ uno::Sequence< sheet::LocalizedName > SAL_CALL ScaDateAddIn::getCompatibilityNam if( !pFData ) return uno::Sequence< sheet::LocalizedName >( 0 ); - const ScaStringList& rStrList = pFData->GetCompNameList(); - sal_uInt32 nCount = rStrList.Count(); + const std::vector<OUString>& rStrList = pFData->GetCompNameList(); + sal_uInt32 nCount = rStrList.size(); uno::Sequence< sheet::LocalizedName > aRet( nCount ); sheet::LocalizedName* pArray = aRet.getArray(); for( sal_uInt32 nIndex = 0; nIndex < nCount; nIndex++ ) - pArray[ nIndex ] = sheet::LocalizedName( GetLocale( nIndex ), *rStrList.Get( nIndex ) ); + pArray[ nIndex ] = sheet::LocalizedName( GetLocale( nIndex ), rStrList.at( nIndex ) ); return aRet; } |