Change SvStorageInfoList from an OwnList to vector<

The main work is in:
storinfo.hxx
storinfo.cxx

The rest is just simple cleanup.

3 files changed, 7 insertions, 10 deletions

diff --git a/sot/inc/sot/stg.hxx b/sot/inc/sot/stg.hxx
index 30ffbf06d2a7..2d17974d0a2d 100644
--- a/sot/inc/sot/stg.hxx
+++ b/sot/inc/sot/stg.hxx
@@ -42,9 +42,11 @@
 #include <tools/rtti.hxx>
 #include <tools/stream.hxx>
 #include <tools/globname.hxx>
+#include "sot/storinfo.hxx"
 #include "sot/sotdllapi.h"
 
 #include <list>
+
 class UNOStorageHolder;
 typedef ::std::list< UNOStorageHolder* > UNOStorageHolderList;
 
@@ -99,7 +101,6 @@ public:
     virtual sal_Bool    Equals( const BaseStorageStream& rStream ) const = 0;
 };
 
-class SvStorageInfoList;
 class BaseStorage : public StorageBase
 {
 public:
diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index 1e78865a3ef0..e1ce95158b12 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.hxx
@@ -38,6 +38,7 @@
 #include <sot/factory.hxx>
 #include <tools/stream.hxx>
 #include <tools/errcode.hxx>
+#include "sot/storinfo.hxx"
 #include "sot/sotdllapi.h"
 
 #define STORAGE_FAILIFTHERE     0x02
@@ -108,7 +109,6 @@ namespace ucbhelper
     class Content;
 }
 
-class  SvStorageInfoList;
 class  BaseStorage;
 class  UNOStorageHolder;
 class SOT_DLLPUBLIC SotStorage : virtual public SotObject
diff --git a/sot/inc/sot/storinfo.hxx b/sot/inc/sot/storinfo.hxx
index 0d7c73d3717c..90062330adac 100644
--- a/sot/inc/sot/storinfo.hxx
+++ b/sot/inc/sot/storinfo.hxx
@@ -31,7 +31,7 @@
 
 #include <tools/pstm.hxx>
 #include <tools/globname.hxx>
-#include <tools/ownlist.hxx>
+#include <vector>
 #include "sot/sotdllapi.h"
 
 class StgDirEntry;
@@ -40,8 +40,8 @@ class SvStorageInfo
 friend class SvStorage;
     String          aName;
     SvGlobalName    aClassName;
-    sal_uLong           nSize;
-    sal_Bool            bStream:1,
+    sal_uLong       nSize;
+    sal_Bool        bStream:1,
                     bStorage:1;
 
                             SvStorageInfo(){}; // Fuer SvStorage
@@ -61,11 +61,7 @@ public:
     sal_uLong                   GetSize() const { return nSize;      }
 };
 
-class SOT_DLLPUBLIC SvStorageInfoList
-{
-    PRV_SV_DECL_OWNER_LIST(SvStorageInfoList,SvStorageInfo)
-    const SvStorageInfo * Get( const String & rName );
-};
+typedef ::std::vector< SvStorageInfo > SvStorageInfoList;
 
 SOT_DLLPUBLIC sal_uLong ReadClipboardFormat( SvStream & rStm );
 SOT_DLLPUBLIC void WriteClipboardFormat( SvStream & rStm, sal_uLong nFormat );