рефакторинг X2t

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

ASCHTMLRenderer/ASCHTMLRendererLib.vcproj

@@ -425,6 +425,10 @@
 				RelativePath="..\DesktopEditor\raster\Metafile\Common.h"
 				>
 			</File>
+			<File
+				RelativePath="..\DesktopEditor\raster\Metafile\Common\IOutputDevice.h"
+				>
+			</File>
 			<File
 				RelativePath="..\DesktopEditor\raster\Metafile\MetaFile.cpp"
 				>
@@ -433,6 +437,30 @@
 				RelativePath="..\DesktopEditor\raster\Metafile\MetaFile.h"
 				>
 			</File>
+			<File
+				RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileClip.h"
+				>
+			</File>
+			<File
+				RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileObjects.h"
+				>
+			</File>
+			<File
+				RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileRenderer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileTypes.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\DesktopEditor\raster\Metafile\Common\MetaFileTypes.h"
+				>
+			</File>
 			<Filter
 				Name="Wmf"
 				>
@@ -476,10 +504,26 @@
 					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfMemory.h"
 					>
 				</File>
+				<File
+					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfObjects.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfObjects.h"
+					>
+				</File>
 				<File
 					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfOutputDevice.h"
 					>
 				</File>
+				<File
+					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfPlayer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfPlayer.h"
+					>
+				</File>
 				<File
 					RelativePath="..\DesktopEditor\raster\Metafile\Wmf\WmfRegion.h"
 					>
@@ -500,6 +544,10 @@
 					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfClip.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfClip.h"
+					>
+				</File>
 				<File
 					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfFile.h"
 					>
@@ -520,6 +568,10 @@
 					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPath.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPath.h"
+					>
+				</File>
 				<File
 					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPlayer.cpp"
 					>

ASCOfficeDocFile/DocFormatLib/DocFormatLib.h

@@ -3,7 +3,9 @@
 
 #include <string>
 
-#if !defined(_WIN32) && !defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64)
+	#include <windows.h>
+#else
     #include "../../DesktopEditor/common/ASCVariant.h"
 #endif
 
@@ -39,8 +41,8 @@ public:
 		return m_strTempDirectory;
 	}
 
-    HRESULT LoadFromFile(std::wstring sSrcFileName, std::wstring sDstFileName, ProgressCallback *ffCallBack);
-    HRESULT SaveToFile(std::wstring sDstFileName, std::wstring sSrcFileName, ProgressCallback *ffCallBack);
+    HRESULT LoadFromFile(std::wstring sSrcFileName, std::wstring sDstFileName, ProgressCallback *ffCallBack = NULL);
+    HRESULT SaveToFile(std::wstring sDstFileName, std::wstring sSrcFileName, ProgressCallback *ffCallBack = NULL);
 
 };