summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/sot/filelist.hxx3
-rw-r--r--sot/source/base/filelist.cxx8
2 files changed, 5 insertions, 6 deletions
diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx
index 32499df78133..631f3ca05a1d 100644
--- a/include/sot/filelist.hxx
+++ b/include/sot/filelist.hxx
@@ -24,7 +24,8 @@
#include <tools/stream.hxx>
#include <vector>
-typedef ::std::vector< OUString* > FileStringList;
+
+typedef ::std::vector< OUString > FileStringList;
class SOT_DLLPUBLIC FileList : public SvDataCopyStream
{
diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx
index da4cd9f446a1..4493fcf129ed 100644
--- a/sot/source/base/filelist.cxx
+++ b/sot/source/base/filelist.cxx
@@ -39,8 +39,6 @@ FileList::~FileList()
void FileList::ClearAll( void )
{
- for ( size_t i = 0, n = aStrList.size(); i < n; ++i )
- delete aStrList[ i ];
aStrList.clear();
}
@@ -53,7 +51,7 @@ void FileList::ClearAll( void )
FileList& FileList::operator=( const FileList& rFileList )
{
for ( size_t i = 0, n = rFileList.aStrList.size(); i < n; ++i )
- aStrList.push_back( new OUString( *rFileList.aStrList[ i ] ) );
+ aStrList.push_back( rFileList.aStrList[ i ] );
return *this;
}
@@ -137,14 +135,14 @@ SvStream& operator>>( SvStream& rIStm, FileList& rFileList )
void FileList::AppendFile( const OUString& rStr )
{
- aStrList.push_back( new OUString( rStr ) );
+ aStrList.push_back( rStr );
}
OUString FileList::GetFile( size_t i ) const
{
OUString aStr;
if( i < aStrList.size() )
- aStr = *aStrList[ i ];
+ aStr = aStrList[ i ];
return aStr;
}