linux build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59315 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficePPTXFile/ASCOfficePPTXFile.h

@@ -30,7 +30,7 @@ private:
 	//todo
 	//OfficeUtils::IOfficeUtils*		m_pOfficeUtils;
 	PPTX::Folder*					m_pFolder;
-	CStringW						m_strTempDir;
+    CString                         m_strTempDir;
 	CString							m_strDirectory;
 
 	// writer to ppty

ASCOfficePPTXFile/PPTXFormat/DocxFormat/IFileBuilder.h

@@ -10,8 +10,8 @@ namespace PPTX
 	class IFileBuilder
 	{
 	public:
-		IFileBuilder();
-		virtual ~IFileBuilder();
+        IFileBuilder() {}
+        virtual ~IFileBuilder() {}
 
 	public:
 	    virtual void Commit(const OOX::CPath& path)															= 0;
@@ -19,4 +19,4 @@ namespace PPTX
 	};
 } // namespace OOX
 
-#endif // OOX_FILE_BUILDER_INCLUDE_H_
\ No newline at end of file
+#endif // OOX_FILE_BUILDER_INCLUDE_H_

ASCOfficeUtils/ZLIB/zlib-1.2.3/contrib/minizip/ioapi.c

@@ -70,7 +70,8 @@ voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
    const wchar_t* filename;
    int mode;
 {
-    FILE* file = NULL;
+ #ifdef _WIN32
+   FILE* file = NULL;
     const wchar_t* mode_fopen = NULL;
     if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
         mode_fopen = L"rb";
@@ -84,6 +85,9 @@ voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
     if ((filename!=NULL) && (mode_fopen != NULL))
         file = _wfopen(filename, mode_fopen);
     return file;
+ #else
+    return NULL;
+ #endif
 }