CWS-TOOLING: integrate CWS tkr23

2009-07-21 15:03:57 +0200 tkr  r274199 : #i64277# open file only if needed and close immediately after use
2009-07-17 12:25:41 +0200 tkr  r274087 : #i96743# patch minizip to provide stream operations
2009-07-17 12:21:13 +0200 tkr  r274086 : #i96743# add new ifilter interface: IPersistStream

6 files changed, 21 insertions, 2 deletions

diff --git a/shell/inc/internal/basereader.hxx b/shell/inc/internal/basereader.hxx
index 47f7a9b82c40..4da8b7fa95be 100644
--- a/shell/inc/internal/basereader.hxx
+++ b/shell/inc/internal/basereader.hxx
@@ -50,6 +50,8 @@ public:
 protected: // protected because its only an implementation relevant class
     CBaseReader( const std::string& DocumentName );
 
+    CBaseReader( void* stream, zlib_filefunc_def* fa );

+
     virtual void start_document();
 
     virtual void end_document();
diff --git a/shell/inc/internal/contentreader.hxx b/shell/inc/internal/contentreader.hxx
index 41491df9fa8b..d8b2d77d28c0 100644
--- a/shell/inc/internal/contentreader.hxx
+++ b/shell/inc/internal/contentreader.hxx
@@ -43,6 +43,9 @@ public:
     //CContentReader( const std::string& DocumentName );
     CContentReader( const std::string& DocumentName, LocaleSet_t const & DocumentLocale );
 
+    CContentReader( void* stream, LocaleSet_t const & DocumentLocale, zlib_filefunc_def* fa );

+
+
     /** Get the chunkbuffer.
 
         @return
diff --git a/shell/inc/internal/metainforeader.hxx b/shell/inc/internal/metainforeader.hxx
index 62248beb845f..1e004b5a3727 100644
--- a/shell/inc/internal/metainforeader.hxx
+++ b/shell/inc/internal/metainforeader.hxx
@@ -45,6 +45,9 @@ public:
     virtual ~CMetaInfoReader();
 
     CMetaInfoReader( const std::string& DocumentName );
+
+    CMetaInfoReader( void* stream, zlib_filefunc_def* fa);

+
     /** check if the Tag is in the target meta.xml file.
 
         @param TagName
diff --git a/shell/inc/internal/propsheets.hxx b/shell/inc/internal/propsheets.hxx
index 3b14dc574fe3..0ebafcf0aa3a 100644
--- a/shell/inc/internal/propsheets.hxx
+++ b/shell/inc/internal/propsheets.hxx
@@ -92,7 +92,6 @@ private:
 private:
     long m_RefCnt;
     char m_szFileName[MAX_PATH];
-    std::auto_ptr<CMetaInfoReader> m_pMetaInfo;
 };
 
 #endif
diff --git a/shell/inc/internal/types.hxx b/shell/inc/internal/types.hxx
index 316a5e716d5b..730263060041 100644
--- a/shell/inc/internal/types.hxx
+++ b/shell/inc/internal/types.hxx
@@ -36,6 +36,9 @@
 #include <utility>
 #include <vector>
 #include <stack>
+#include <external/zlib/zlib.h>

+#include <external/zlib/ioapi.h>

+
 
 typedef std::vector<std::wstring> StringList_t;
 
diff --git a/shell/inc/internal/zipfile.hxx b/shell/inc/internal/zipfile.hxx
index 81da437544fe..2a860bb4c6cd 100644
--- a/shell/inc/internal/zipfile.hxx
+++ b/shell/inc/internal/zipfile.hxx
@@ -35,7 +35,9 @@
 #define _WINDOWS
 #endif
 
-#include <external/zlib/unzip.h>
+

+#include <external/zlib/unzip.h>

+

 
 #include <string>
 #include <vector>
@@ -69,6 +71,9 @@ public:
     */
     static bool IsZipFile(const std::string& FileName);
 
+    static bool IsZipFile(void* stream);

+
+
     /** Returns wheter the version of the specified zip file may be uncompressed with the
           currently used zlib version or not
 
@@ -86,6 +91,7 @@ public:
     */
     static bool IsValidZipFileVersionNumber(const std::string& FileName);
 
+    static bool IsValidZipFileVersionNumber(void* stream);

 
 public:
 
@@ -103,6 +109,9 @@ public:
     */
     ZipFile(const std::string& FileName);
 
+    ZipFile(void* stream, zlib_filefunc_def* fa);

+
+
     /** Destroys a zip file
     */
     ~ZipFile();