X2t - FileConverter linux

добавлены rtf, doc

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

ASCHTMLRenderer/Linux/ASCHTMLRendererLib.pro

@@ -30,7 +30,10 @@ SOURCES += ../ASCSVGWriter.cpp \
     ../../DesktopEditor/raster/Metafile/Emf/EmfObjects.cpp \
     ../../DesktopEditor/raster/Metafile/Emf/EmfPath.cpp \
     ../../DesktopEditor/raster/Metafile/Emf/EmfPlayer.cpp \
-    ../../DesktopEditor/raster/Metafile/Emf/EmfClip.cpp
+    ../../DesktopEditor/raster/Metafile/Emf/EmfClip.cpp \
+    ../../DesktopEditor/raster/Metafile/Common/MetaFileTypes.cpp \
+    ../../DesktopEditor/raster/Metafile/Wmf/WmfObjects.cpp \
+    ../../DesktopEditor/raster/Metafile/Wmf/WmfPlayer.cpp
 
 HEADERS += ../ASCSVGWriter.h \
     ../CASCImage.h \
@@ -67,7 +70,15 @@ HEADERS += ../ASCSVGWriter.h \
     ../../DesktopEditor/raster/Metafile/Wmf/WmfRegion.h \
     ../../DesktopEditor/raster/Metafile/Wmf/WmfTypes.h \
     ../../DesktopEditor/raster/Metafile/Wmf/WmfUtils.h \
-    ../../DesktopEditor/raster/Metafile/Emf/EmfClip.h
+    ../../DesktopEditor/raster/Metafile/Emf/EmfClip.h \
+    ../../DesktopEditor/raster/Metafile/Common/IOutputDevice.h \
+    ../../DesktopEditor/raster/Metafile/Common/MetaFile.h \
+    ../../DesktopEditor/raster/Metafile/Common/MetaFileClip.h \
+    ../../DesktopEditor/raster/Metafile/Common/MetaFileObjects.h \
+    ../../DesktopEditor/raster/Metafile/Common/MetaFileRenderer.h \
+    ../../DesktopEditor/raster/Metafile/Common/MetaFileTypes.h \
+    ../../DesktopEditor/raster/Metafile/Wmf/WmfObjects.h \
+    ../../DesktopEditor/raster/Metafile/Wmf/WmfPlayer.h
 
 unix {
     target.path = /usr/lib

ASCOfficeDocFile/DocFormatLib/DocFormatLib.cpp

@@ -6,17 +6,17 @@
 #include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
 #include "../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
 
-HRESULT COfficeDocFile::LoadFromFile(CString bsDocFile, CString bsDocxDirectory, CString bsXMLOptions, ProgressCallback *ffCallBack ) 
+HRESULT COfficeDocFile::LoadFromFile(std::wstring bsDocFile, std::wstring bsDocxDirectory, ProgressCallback *ffCallBack )
 {
 	HRESULT hr = S_FALSE;
 
 	DocFileFormat::Converter docToDocx;
-	hr= docToDocx.LoadAndConvert(bsDocFile, bsDocxDirectory, ffCallBack);
+    hr= docToDocx.LoadAndConvert(std_string2string(bsDocFile), std_string2string(bsDocxDirectory), ffCallBack);
 
 	return hr;
 }
 
-HRESULT COfficeDocFile::SaveToFile (CString sDstFileName, CString sSrcFileName, CString sXMLOptions, ProgressCallback *ffCallBack )
+HRESULT COfficeDocFile::SaveToFile (std::wstring sDstFileName, std::wstring sSrcFileName, ProgressCallback *ffCallBack )
 {
     return S_OK;
 }

ASCOfficeDocFile/DocFormatLib/DocFormatLib.h

 #ifndef DOC_FORMAT_LIB
 #define DOC_FORMAT_LIB
 
-#if defined(_WIN32) || defined(_WIN64)
-    #include <atlbase.h>
-    #include <atlstr.h>
-#else
+#include <string>
+
+#if !defined(_WIN32) && !defined(_WIN64)
     #include "../../DesktopEditor/common/ASCVariant.h"
-    #include "../../Common/DocxFormat/Source/Base/ASCString.h"
 #endif
 
 struct ProgressCallback;
@@ -26,23 +24,23 @@ public:
 
 private:
 
-	CString m_strTempDirectory;
+    std::wstring m_strTempDirectory;
 	
 public:
 
-	HRESULT put_TempDirectory(CString sDir)
+    HRESULT put_TempDirectory(std::wstring sDir)
 	{
 		m_strTempDirectory = sDir;
 		return S_OK;
 	}
 	
-	CString get_TempDirectory()
+    std::wstring get_TempDirectory()
 	{
 		return m_strTempDirectory;
 	}
 
-	HRESULT LoadFromFile(CString sSrcFileName, CString sDstFileName, CString sXMLOptions, ProgressCallback *ffCallBack = NULL);
-	HRESULT SaveToFile(CString sDstFileName, CString sSrcFileName, CString sXMLOptions, ProgressCallback *ffCallBack =NULL);
+    HRESULT LoadFromFile(std::wstring sSrcFileName, std::wstring sDstFileName, ProgressCallback *ffCallBack);
+    HRESULT SaveToFile(std::wstring sDstFileName, std::wstring sSrcFileName, ProgressCallback *ffCallBack);
 
 };
 

ASCOfficeUtils/ASCOfficeUtils/ZipUtilsCP.cpp

@@ -396,8 +396,10 @@ namespace ZLibZipUtils
 
 	  std::wstring filenameW = codepage_issue_fixFromOEM(filename_inzip);
 
-	  if (wcscmp(filename, filenameW.c_str()))
+      //todooo есть ли необходимость свести все к нижнему ???
+      if (wcscmp(filename, filenameW.c_str()) == 0)
 		  return true;
+
       return false;
   }
 

DesktopEditor/raster/Metafile/Common/IOutputDevice.h

@@ -2,6 +2,7 @@
 #define _METAFILE_COMMON_IOUTPUTDEVICE_H
 
 #include "../Wmf/WmfTypes.h"
+#include <string>
 
 namespace MetaFile
 {

DesktopEditor/raster/Metafile/Common/MetaFileTypes.h

 #ifndef _METAFILE_COMMON_METAFILETYPES_H
 #define _METAFILE_COMMON_METAFILETYPES_H
 
+
+#if !defined (_WIN32) && !defined(_WIN64)
+    #define BLACKONWHITE                 1
+    #define WHITEONBLACK                 2
+    #define COLORONCOLOR                 3
+    #define HALFTONE                     4
+    #define MAXSTRETCHBLTMODE            4
+#endif
+
+#define MWT_IDENTITY	  0x01
+#define MWT_LEFTMULTIPLY  0x02
+#define MWT_RIGHTMULTIPLY 0x03
+#define MWT_SET           0x04
+
+
 namespace MetaFile
 {
 	struct TEmfPointL;
@@ -82,11 +97,6 @@ namespace MetaFile
 		unsigned char b;
 	};
 
-#define MWT_IDENTITY	  0x01
-#define MWT_LEFTMULTIPLY  0x02
-#define MWT_RIGHTMULTIPLY 0x03
-#define MWT_SET           0x04
-
 	struct TXForm
 	{
 		double M11;

DesktopEditor/raster/Metafile/MetaFile.cpp

@@ -149,7 +149,7 @@ namespace MetaFile
 		if (c_lMetaWmf == m_lType)
 		{
 #ifdef NEW_WMF
-			TRectD& oRect = m_oWmfFile.GetBounds();
+            const TRectD& oRect = m_oWmfFile.GetBounds();
 			*pdX = oRect.dLeft;
 			*pdY = oRect.dTop;
 			*pdW = oRect.dRight - oRect.dLeft;