for bug 34597

fix bug 34177
read attributes (from line props, shape props , effects, 3D) without namespace

ASCOfficeDocFile/Common/FormatUtils.h

@@ -771,6 +771,7 @@ namespace DocFormatUtils
 		{
             return (std::to_wstring(value));
 		}
+
 		static inline std::wstring DoubleToWideString(double value)
 		{
 			std::wstringstream src;			

ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp

@@ -232,7 +232,8 @@ namespace DocFileFormat
 
 			case sprmOldCIss:
 			case sprmCIss:
-                appendValueElement( parent, L"vertAlign", FormatUtils::MapValueToWideString( iter->Arguments[0], &SuperscriptIndex[0][0], 3, 12 ), true );
+				if (iter->argumentsSize > 0 && iter->Arguments[0] < 3)	//Metaevan.doc
+					appendValueElement( parent, L"vertAlign", FormatUtils::MapValueToWideString( iter->Arguments[0], &SuperscriptIndex[0][0], 3, 12 ), true );
 				break;	
 
 			case sprmCRgLid0_80:

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

@@ -307,13 +307,11 @@ namespace DocFileFormat
 				if (!FormatUtils::IsControlSymbol(xchBullet))
 				{
 					ret.push_back(lvl.xst[0]);
-					ret.push_back(L'\0');
 				}
 			}
 			else
 			{
 				ret.push_back(L'\xF0B7');
-				ret.push_back(L'\0');
 			}
 		}
 		else

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/MetafilePictBlip.h

@@ -250,10 +250,6 @@ public:
 		{
 			pFile->WriteFile((BYTE*)m_pMetaHeader, m_lMetaHeaderSize);
 		}
-		if (NULL != m_pMetaFile)
-		{
-			pFile->WriteFile((BYTE*)m_pMetaFile, m_lMetaFileSize);
-		}
 	}
 };
 

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp

@@ -71,26 +71,26 @@ namespace DocFileFormat
 {
     struct __BITMAPINFOHEADER
     {
-        DWORD      biSize;
-        LONG       biWidth;
-        LONG       biHeight;
-        WORD       biPlanes;
-        WORD       biBitCount;
-        DWORD      biCompression;
-        DWORD      biSizeImage;
-        LONG       biXPelsPerMeter;
-        LONG       biYPelsPerMeter;
-        DWORD      biClrUsed;
-        DWORD      biClrImportant;
+        _UINT32     biSize;
+        _INT32      biWidth;
+        _INT32      biHeight;
+        _UINT16     biPlanes;
+        _UINT16     biBitCount;
+        _UINT32     biCompression;
+        _UINT32     biSizeImage;
+        _INT32      biXPelsPerMeter;
+        _INT32      biYPelsPerMeter;
+        _UINT32     biClrUsed;
+        _UINT32     biClrImportant;
     };
 
     struct __BITMAPCOREHEADER
     {
-        DWORD   bcSize;                 /* used to get to color table */
-        WORD    bcWidth;
-        WORD    bcHeight;
-        WORD    bcPlanes;
-        WORD    bcBitCount;
+        _UINT32     bcSize;                 /* used to get to color table */
+        _UINT16     bcWidth;
+        _UINT16     bcHeight;
+        _UINT16     bcPlanes;
+        _UINT16     bcBitCount;
     };
     Global::BlipType GetFormatPict(unsigned char* data, int size)
 	{

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.cpp

@@ -37,29 +37,29 @@
 
 namespace ImageHelper
 {
-	struct __BITMAPINFOHEADER 
-	{
-		DWORD      biSize;
-		LONG       biWidth;
-		LONG       biHeight;
-		WORD       biPlanes;
-		WORD       biBitCount;
-		DWORD      biCompression;
-		DWORD      biSizeImage;
-		LONG       biXPelsPerMeter;
-		LONG       biYPelsPerMeter;
-		DWORD      biClrUsed;
-		DWORD      biClrImportant;
-	};
+    struct __BITMAPINFOHEADER
+    {
+        _UINT32     biSize;
+        _INT32      biWidth;
+        _INT32      biHeight;
+        _UINT16     biPlanes;
+        _UINT16     biBitCount;
+        _UINT32     biCompression;
+        _UINT32     biSizeImage;
+        _INT32      biXPelsPerMeter;
+        _INT32      biYPelsPerMeter;
+        _UINT32     biClrUsed;
+        _UINT32     biClrImportant;
+    };
 
-	struct __BITMAPCOREHEADER
-	{
-        DWORD   bcSize;                 /* used to get to color table */
-        WORD    bcWidth;
-        WORD    bcHeight;
-        WORD    bcPlanes;
-        WORD    bcBitCount;
-	};
+    struct __BITMAPCOREHEADER
+    {
+        _UINT32     bcSize;                 /* used to get to color table */
+        _UINT16     bcWidth;
+        _UINT16     bcHeight;
+        _UINT16     bcPlanes;
+        _UINT16     bcBitCount;
+    };
 
 	inline Global::_BlipType SaveImageToFileFromDIB(unsigned char* data, int size, const std::wstring& file_name)//without ext
 	{
@@ -152,10 +152,10 @@ namespace ImageHelper
 			NSFile::CFileBinary file;
             if (file.CreateFileW(file_name + L".bmp"))
 			{
-				WORD vtType		= 0x4D42;				file.WriteFile((BYTE*)&vtType,	2);
-				DWORD dwLen		= biSizeImage;			file.WriteFile((BYTE*)&dwLen,	4);
-				DWORD dwRes		= 0;					file.WriteFile((BYTE*)&dwRes,	4);
-				DWORD dwOffset	= 2;					file.WriteFile((BYTE*)&dwOffset, 4);
+                _UINT16 vtType		= 0x4D42;				file.WriteFile((BYTE*)&vtType,	2);
+                _UINT32 dwLen		= biSizeImage;			file.WriteFile((BYTE*)&dwLen,	4);
+                _UINT32 dwRes		= 0;					file.WriteFile((BYTE*)&dwRes,	4);
+                _UINT32 dwOffset	= 2;					file.WriteFile((BYTE*)&dwOffset, 4);
 			
 				file.WriteFile((BYTE*)data, size);
 				file.CloseFile();
@@ -183,9 +183,7 @@ namespace DocFileFormat
 	void WordprocessingDocument::SaveDocument()
 	{
         std::wstring pathWord = m_strOutputPath + FILE_SEPARATOR_STR + L"word" ;
-        //OOX::CPath pathWord = CString(m_strOutputPath) + FILE_SEPARATOR_STR + L"word" );
-		//FileSystem::Directory::CreateDirectory( pathWord.GetPath() );
-        NSDirectory::CreateDirectory( pathWord );
+         NSDirectory::CreateDirectory( pathWord );
 
 		WritePackage();
 
@@ -204,9 +202,7 @@ namespace DocFileFormat
 		if (!ImagesList.empty())
 		{
             std::wstring pathMedia = pathWord + FILE_SEPARATOR_STR + L"media";
-            //OOX::CPath pathMedia = pathWord + FILE_SEPARATOR_STR + L"media";
-			//FileSystem::Directory::CreateDirectory( pathMedia.GetPath() );
-
+ 
             NSDirectory::CreateDirectory(pathMedia);
 
 			int i = 1;
@@ -237,8 +233,6 @@ namespace DocFileFormat
 		if (!OleObjectsList.empty())
 		{
             std::wstring pathObjects = pathWord + FILE_SEPARATOR_STR + L"embeddings" ;
-            //OOX::CPath pathObjects = pathWord + FILE_SEPARATOR_STR + L"embeddings" ;
-			//FileSystem::Directory::CreateDirectory( pathObjects.GetPath());
             NSDirectory::CreateDirectory( pathObjects );
 
 			int i = 1;

ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro

@@ -23,9 +23,9 @@ DEFINES +=  UNICODE \
         _UNICODE \
         _USE_XMLLITE_READER_ \
          USE_LITE_READER \
-         USE_ATL_CSTRING \
         _USE_LIBXML2_READER_ \
-        LIBXML_READER_ENABLED
+        LIBXML_READER_ENABLED \
+        DONT_WRITE_EMBEDDED_FONTS \
 
 INCLUDEPATH += \
 	../../../DesktopEditor/freetype-2.5.2/include \

ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj

@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_ATL_CSTRINGS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;DONT_WRITE_EMBEDDED_FONTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"

ASCOfficeDocFile/DocFormatTest/DocFormatTest.cpp

@@ -33,7 +33,7 @@
 //
 #include "../DocFormatLib/DocFormatLib.h"
 
-#include "../win32/ASCOfficeCriticalSection.h"
+#include "../../OfficeUtils/src/ASCOfficeCriticalSection.h"
 
 #include "../../OfficeUtils/src/OfficeUtils.h"
 
@@ -41,6 +41,7 @@
 
 #include <string>
 #include <windows.h>
+#include <tchar.h>
 
 #if defined(_WIN64)
 	#pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib")
@@ -58,7 +59,6 @@ int _tmain(int argc, _TCHAR* argv[])
 	std::wstring outputDir		= NSDirectory::GetFolderPath(sDstDocx);
 	std::wstring dstTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
 
-	// doc->docx
 	COfficeDocFile docFile;
 
 	docFile.m_sTempFolder = outputDir;
@@ -71,7 +71,7 @@ int _tmain(int argc, _TCHAR* argv[])
 		hRes = oCOfficeUtils.CompressFileOrDirectory(dstTempPath.c_str(), sDstDocx, -1);
 	}
 	
-	FileSystem::Directory::DeleteDirectory(dstTempPath);
+	NSDirectory::DeleteDirectory(dstTempPath);
 
 	return hRes;
 }

ASCOfficeDocFile/DocFormatTest/DocFormatTest.vcproj

@@ -338,6 +338,58 @@
 	<References>
 	</References>
 	<Files>
+		<Filter
+			Name="Common"
+			>
+			<File
+				RelativePath="..\..\ASCOfficeDocxFile2\BinWriter\BinWriters.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Reader\ChartFromToBinary.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\ChartWriter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Common\Common.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Reader\CommonWriter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Reader\CSVReader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Writer\CSVWriter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\DocxSerializer.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalOptions="/bigobj&#x0D;&#x0A;"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\FontProcessor.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\XlsxSerializer.cpp"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath=".\DocFormatTest.cpp"
 			>
@@ -386,6 +438,14 @@
 			RelativePath="..\..\UnicodeConverter\UnicodeConverter.cpp"
 			>
 		</File>
+		<File
+			RelativePath="..\..\DesktopEditor\xml\src\xmldom.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\DesktopEditor\xml\src\xmllight.cpp"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

ASCOfficeDocFile/DocxDocConverter/OfficeArt/BlipFactory.cpp

@@ -1,137 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-
-#include "BlipFactory.h"
-
-namespace GdiPlusHelper
-{
-	inline static int CompareStrings (const wchar_t* str1, const wchar_t* str2)
-	{
-		CString cstr1; cstr1 = str1;
-		CString cstr2; cstr2 = str2;
-
-		if (cstr1 == cstr2)
-			return 0;
-
-		return 1;
-	}
-
-	//inline static void GetEncoderCLSID (const wchar_t* pFormat, CLSID* pClsid)
-	//{
-	//	// variables
-	//	UINT nEncoders = 0;
-	//	UINT nSize = 0;
-	//	Gdiplus::ImageCodecInfo* pImageCodecInfo = 0;
-
-	//	// retrieve encoders info
-	//	Gdiplus::GetImageEncodersSize(&nEncoders, &nSize);
-
-	//	// check for valid encoders
-	//	if (!nSize)
-	//		throw 0;
-
-	//	// create encoders info structure of necessary size
-	//	pImageCodecInfo = (Gdiplus::ImageCodecInfo*)(malloc(nSize));
-
-	//	// check for valid encoder
-	//	if (!pImageCodecInfo)
-	//		throw 0;
-
-	//	// retrieve all encoders
-	//	Gdiplus::GetImageEncoders(nEncoders, nSize, pImageCodecInfo);
-
-	//	// locate necessary encoder
-	//	for (UINT nEncoder = 0; nEncoder < nEncoders; ++nEncoder)
-	//	{
-	//		// compare MIME strings
-	//		if (CompareStrings(pImageCodecInfo[nEncoder].MimeType, pFormat) == 0)
-	//		{
-	//			// save CLSID
-	//			*pClsid = pImageCodecInfo[nEncoder].Clsid;
-
-	//			// clear memory
-	//			free(pImageCodecInfo);
-
-	//			// all ok
-	//			return;
-	//		}    
-	//	}
-
-	//	// clear memory
-	//	free(pImageCodecInfo);
-
-	//	// codec not found
-	//	throw 0;
-	//}
-}
-
-namespace OfficeArt
-{
-	OfficeArtBlip* BlipFactory::GetBlipWithPngTransform()
-	{
-		//CString strTempPath;
-		//if (::GetTempPath(_MAX_PATH, strTempPath.GetBuffer(_MAX_PATH)) != 0)
-		//	strTempPath.ReleaseBuffer();
-		//else
-		//	strTempPath = _T(".");
-
-		//CString strTempFile;
-		//if (::GetTempFileName(strTempPath, _T("file"), 0, strTempFile.GetBuffer(_MAX_PATH)) != 0)
-		//{
-		//	CString tempFile; tempFile.Format (_T("%s%s"), strTempFile, _T(".png"));
-
-		//	CGdiPlusInit m_oInitGdiplus;		
-		//	if (m_oInitGdiplus.Init())
-		//	{
-		//		Gdiplus::Bitmap oBitmap (m_sFile.c_str());
-		//		if (Gdiplus::Ok == oBitmap.GetLastStatus())
-		//		{
-		//			CLSID guid;
-		//			GdiPlusHelper::GetEncoderCLSID (L"image/png", &guid);
-
-		//			if (Gdiplus::Ok == oBitmap.Save (tempFile, &guid))
-		//			{
-		//				if (Gdiplus::Ok == oBitmap.GetLastStatus())
-		//				{
-		//					m_sFile			=	std::wstring (tempFile);
-		//					m_bDeleteFile	=	TRUE;
-
-		//					return GetOfficeArtBlip();
-		//				}
-		//			}
-		//		}
-		//	}
-		//}
-
-		return NULL;
-	}
-}

ASCOfficeDocFile/DocxDocConverter/OfficeArt/BlipFactory.h

@@ -1,339 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-#pragma once
-
-#include <fstream>
-#include <string>
-
-#include "OfficeArtBlipJPEG.h"
-#include "OfficeArtBlipPNG.h"
-#include "OfficeArtBlipEMF.h"
-#include "OfficeArtBlipWMF.h"
-#include "OfficeArtBlipTIFF.h"
-#include "OfficeArtFBSE.h"
-
-#include "../../Common/MD4/md4.h"
-
-#include "../../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
-
-
-namespace OfficeArt
-{
-	class BlipFactory
-	{
-	public:
-
-		BlipFactory () : m_bDeleteFile (FALSE)
-		{
-
-		}
-
-		BlipFactory (std::wstring fileName) : m_bDeleteFile (FALSE)
-		{
-			m_sFile	= std::wstring(fileName);
-		}
-
-		~BlipFactory ()
-		{
-			if (m_bDeleteFile)
-			{
-				::DeleteFile (m_sFile.c_str());
-			}
-		}
-
-		inline std::wstring GetFileNameExtension() const
-		{
-			std::wstring::size_type dotPosition = m_sFile.find_last_of( _T( '.' ) );
-			static const std::wstring::size_type npos = -1;
-			std::wstring extension;
-
-			if (dotPosition != npos)
-				extension = std::wstring( ( m_sFile.begin() + dotPosition + 1 ), m_sFile.end() );
-
-			return extension;
-		}
-
-		inline Enumerations::MSOBLIPTYPE GetBlipType() const
-		{
-			Enumerations::MSOBLIPTYPE blipType	=	Enumerations::msoblipUNKNOWN;
-			
-			std::wstring extension				=	GetFileNameExtension();
-
-			if ( (extension == std::wstring(L"jpg")) || (extension == std::wstring(L"jpeg")) )
-			{
-				blipType	=	Enumerations::msoblipJPEG;
-			}
-			else if (extension == std::wstring(L"png") || extension == std::wstring(L"gif"))
-			{
-				blipType	=	Enumerations::msoblipPNG;
-			}
-			else if (extension == std::wstring(L"emf"))
-			{
-				blipType	=	Enumerations::msoblipEMF;
-			}
-			else if (extension == std::wstring(L"wmf"))
-			{
-				blipType	=	Enumerations::msoblipWMF;
-			}
-			else if (extension == std::wstring(L"tiff") || extension == std::wstring(L"tif"))
-			{
-				blipType	=	Enumerations::msoblipTIFF;
-			}
-			else if (extension == std::wstring(L"bmp"))
-			{
-				blipType	=	Enumerations::msoblipDIB;
-			}
-
-			return blipType;
-		}
-
-		inline OfficeArtBlip* GetOfficeArtBlip()
-		{
-			OfficeArtBlip* officeArtBlip = NULL;
-
-			if (!m_sFile.empty())
-			{
-				std::string xstr;
-
-				std::ifstream xfile(m_sFile.c_str(), std::ios::binary);
-
-				//узнаем размер файла, и выделяем память в строке
-				xfile.seekg( 0, std::ios_base::end );
-				xstr.resize( xfile.tellg() );
-				xfile.seekg( 0, std::ios_base::beg );
-
-				//копируем данные
-				xfile.read(const_cast<char*>( xstr.data() ), (std::streamsize)xstr.size());
-
-				if ( !xstr.empty() )
-				{
-					std::wstring extension = GetFileNameExtension();
-
-					if ( extension == std::wstring(L"gif")
-						|| extension == std::wstring(L"bmp") 
-						|| extension == std::wstring(L"tiff")
-						|| extension == std::wstring(L"tif") )
-					{
-						//	MS WORD конвертит исходник в PNG формат ( UUID берет их исходника GIF файла )
-						//	MS WORD конвертит исходник в PNG формат ( UUID берет их исходника TIFF файла )
-						//	MS WORD конвертит исходник в PNG формат ( UUID берет их исходника BMP файла )
-
-						m_sOriginalData		=	xstr;
-						officeArtBlip		=	GetBlipWithPngTransform();
-					}
-					else if ((extension == std::wstring(L"jpg")) || (extension == std::wstring(L"jpeg")))
-					{
-						MD4 md4Code((unsigned char*)xstr.data(), xstr.size());
-						officeArtBlip		=	new OfficeArtBlipJPEG((unsigned char*)xstr.data(), xstr.size(), md4Code.GetMD4Bytes());
-					}
-					else if (extension == std::wstring(L"png"))
-					{
-						if (m_sOriginalData.length())
-						{
-							MD4 md4Code((unsigned char*)m_sOriginalData.data(), m_sOriginalData.size());
-							officeArtBlip = new OfficeArtBlipPNG ((unsigned char*)m_sOriginalData.data(), m_sOriginalData.size(), md4Code.GetMD4Bytes());
-						}
-						else
-						{
-							MD4 md4Code((unsigned char*)xstr.data(), xstr.size());
-							officeArtBlip = new OfficeArtBlipPNG ((unsigned char*)xstr.data(), xstr.size(), md4Code.GetMD4Bytes());
-						}
-					}
-					else if (extension == std::wstring(L"emf"))
-					{
-						unsigned char* buffer			=	NULL;
-						unsigned long comprLen	=	CompressImage( &buffer, (unsigned char*)xstr.data(), xstr.size());
-
-						if ( ( buffer != NULL ) && ( comprLen != 0 ) )
-						{
-							MD4 md4Code((unsigned char*)xstr.data(), xstr.size());
-
-							//!!!TODO!!!
-							officeArtBlip = new OfficeArtBlipEMF( OfficeArtMetafileHeader( xstr.size(), RECT( 0, 0, 0, 0 ), POINT( 0, 0 ), comprLen, COMPRESSION_METHOD_DEFLATE ), buffer, md4Code.GetMD4Bytes() );
-
-							RELEASEARRAYOBJECTS (buffer);
-						}
-					}
-					else if (extension == std::wstring(L"wmf"))
-					{
-						unsigned long comprLen = 0;
-						unsigned char* buffer = NULL;
-
-						std::string metaPlaceableRecord;
-						std::string wmfData;
-
-						metaPlaceableRecord.push_back( (char)0xD7 );
-						metaPlaceableRecord.push_back( (char)0xCD );
-						metaPlaceableRecord.push_back( (char)0xC6 );
-						metaPlaceableRecord.push_back( (char)0x9A );
-
-						if ( equal( xstr.begin(), ( xstr.begin() + 4 ), metaPlaceableRecord.begin() ) )
-						{
-							wmfData.assign( ( xstr.begin() + 22 ), xstr.end() );
-						}
-						else
-						{
-							wmfData = xstr;
-						}
-
-						comprLen = CompressImage( &buffer, (unsigned char*)wmfData.data(), wmfData.size() );
-
-						if ( ( buffer != NULL ) && ( comprLen != 0 ) )
-						{
-							MD4 md4Code( (unsigned char*)wmfData.data(), wmfData.size() );
-
-							// TODO : need fix
-							
-							officeArtBlip = new OfficeArtBlipWMF( OfficeArtMetafileHeader( wmfData.size(), RECT( 0, 0, 0, 0 ), POINT( 0, 0 ), comprLen, COMPRESSION_METHOD_DEFLATE ), buffer, md4Code.GetMD4Bytes() );
-							RELEASEARRAYOBJECTS (buffer);
-						}
-					}
-				}
-			}
-
-			return officeArtBlip;
-		}
-
-		inline std::vector<unsigned char> Get_rgbUid1 ()
-		{
-			if (!m_sFile.empty())
-			{
-				std::string xstr;
-
-				std::ifstream xfile(m_sFile.c_str(), std::ios::binary);
-
-				//узнаем размер файла, и выделяем память в строке
-				xfile.seekg( 0, std::ios_base::end );
-				xstr.resize( xfile.tellg() );
-				xfile.seekg( 0, std::ios_base::beg );
-
-				//копируем данные
-				xfile.read(const_cast<char*>(xstr.data()), (std::streamsize)xstr.size());
-
-				if ( !xstr.empty() )
-				{
-					std::wstring extension = GetFileNameExtension();
-
-					if ((extension == std::wstring(_T("jpg"))) 
-						|| (extension == std::wstring(_T("jpeg"))) 
-						|| (extension == std::wstring(_T("png"))) 
-						|| (extension == std::wstring(_T("gif")))
-						|| (extension == std::wstring(_T("tiff"))) 
-						|| (extension == std::wstring(L"tif"))
-						|| (extension == std::wstring(L"bmp")) )
-					{
-						MD4 MD4Code ((unsigned char*)xstr.data(), xstr.size());
-						return MD4Code.GetMD4Bytes();
-					}
-					else if (extension == std::wstring(_T("emf")))
-					{
-						unsigned char* buffer			=	NULL;
-						unsigned long comprLen	=	CompressImage (&buffer, (unsigned char*)xstr.data(), xstr.size());
-
-						if ( ( buffer != NULL ) && ( comprLen != 0 ) )
-						{
-							MD4 MD4Code ((unsigned char*)xstr.data(), xstr.size());
-							RELEASEARRAYOBJECTS (buffer);
-
-							return MD4Code.GetMD4Bytes();
-						}
-					}
-					else if (extension == std::wstring(_T("wmf")))
-					{
-						std::string metaPlaceableRecord;
-						std::string wmfData;
-
-						metaPlaceableRecord.push_back((char)0xD7);
-						metaPlaceableRecord.push_back((char)0xCD);
-						metaPlaceableRecord.push_back((char)0xC6);
-						metaPlaceableRecord.push_back((char)0x9A);
-
-						if ( equal( xstr.begin(), ( xstr.begin() + 4 ), metaPlaceableRecord.begin() ) )
-						{
-							wmfData.assign( ( xstr.begin() + 22 ), xstr.end() );
-						}
-						else
-						{
-							wmfData = xstr;
-						}
-
-						unsigned char* buffer			=	NULL;
-						unsigned long comprLen	=	CompressImage( &buffer, (unsigned char*)wmfData.data(), wmfData.size() );
-
-						if ( ( buffer != NULL ) && ( comprLen != 0 ) )
-						{
-							MD4 MD4Code ((unsigned char*)wmfData.data(), wmfData.size());
-							RELEASEARRAYOBJECTS (buffer);
-
-							return MD4Code.GetMD4Bytes();
-						}
-					}
-				}
-			}
-
-			return std::vector<unsigned char> ();
-		}
-
-	protected:
-		inline unsigned long CompressImage (unsigned char** buffer, unsigned char* imageData, unsigned int imageSize) const
-		{
-			unsigned long comprLen = 0;
-
-			if ( ( buffer != NULL ) && ( imageData != NULL ) && ( imageSize != 0 ) )
-			{
-				comprLen	=	imageSize;
-				*buffer		=	new unsigned char[comprLen];
-
-				HRESULT hr	=	S_OK;
-				COfficeUtils* pOfficeUtils = new COfficeUtils(NULL); 
-
-					if (pOfficeUtils)
-					{
-						pOfficeUtils->Compress(*buffer, &comprLen, imageData, imageSize, -1);
-
-						delete pOfficeUtils;
-						pOfficeUtils = NULL;
-					}
-			}
-
-			return comprLen;
-		}
-
-		OfficeArtBlip* GetBlipWithPngTransform ();
-
-	private:
-
-		std::wstring	m_sFile;
-		bool			m_bDeleteFile;	
-		std::string		m_sOriginalData;
-	};
-}

ASCOfficeDocFile/DocxDocConverter/ShapeBuilder.cpp

@@ -1,377 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-
-
-#include "ShapeBuilder.h"
-
-namespace ASCDocFileFormat
-{
-	bool COArtBuilder::BuildShapeRun (const OOX::Logic::Pict& oPicture, CShapeRun& oOdbflRun) 
-	{
-		if (oPicture.rect.is_init())
-		{
-			oOdbflRun		=	BuildOdbflRun <OOX::Logic::Rect> (oPicture.rect, CMapShape(OfficeArt::Enumerations::msosptRectangle));
-			return TRUE;
-		}
-
-		if (oPicture.oval.is_init())
-		{
-			oOdbflRun		=	BuildOdbflRun <OOX::Logic::Oval> (oPicture.oval, CMapShape(OfficeArt::Enumerations::msosptEllipse));
-			return TRUE;
-		}
-
-		if (oPicture.roundrect.is_init())
-		{
-			oOdbflRun		=	BuildOdbflRun <OOX::Logic::Roundrect> (oPicture.roundrect, CMapShape(OfficeArt::Enumerations::msosptRoundRectangle));
-			return TRUE;
-		}
-
-		if (oPicture.line.is_init())
-		{
-			oOdbflRun		=	BuildOdbflRun <OOX::Logic::Line> (oPicture.line, CMapShape(OfficeArt::Enumerations::msosptLine));
-			return TRUE;
-		}
-
-		if (oPicture.shape.is_init())
-		{
-			if (oPicture.shape->imageData.is_init())
-				return FALSE;
-
-			oOdbflRun		=	BuildOdbflRun <OOX::Logic::Shape> (oPicture.shape, GetRefShape(oPicture));
-			return TRUE;
-		}
-
-		return FALSE;
-	}
-
-	bool COArtBuilder::BuildImageRun (const OOX::Logic::Shape& oXml, const std::wstring& strFileName, Run& oRun)
-	{
-		COArtStorage* pStorage	=	COArtStorage::Instance();
-		if (pStorage)
-		{
-			COArtImage* pImage	=	new COArtImage(strFileName, pStorage->GenID (m_nLocation));
-			if (pImage)
-			{
-				CShapeRun oShapeRun (pImage, pImage->GetID(), pStorage->GetOffSetSpa(m_nLocation));	//	смещение берем от предыдущего элемента
-				oShapeRun.UpdateSizes	(*oXml.style);																		//	размеры
-				oShapeRun.SetWrap		(oXml.Wrap);																		//	обтекание
-				//oShapeRun.SetAnchor	((bool)(oXml.anchorlock.is_init()));
-				oShapeRun.SetUseBehind	(*oXml.style);													
-
-				pImage->SetupFromStyleXml(oXml.style);
-
-				pStorage->AddImage (pImage, oShapeRun.GetSpa(), m_nLocation);						
-
-				oRun.AddRunItem (oShapeRun);					
-
-				return TRUE;
-			}
-		}
-
-		return FALSE;
-	}
-	bool COArtBuilder::BuildImageRun (const OOX::Image& oXml, const OOX::Logic::Drawing& oXml2, Run& oRun)
-	{
-		COArtStorage* pStorage		=	COArtStorage::Instance();
-		if (pStorage)
-		{
-			//COArtImage* pImage	=	new COArtImage(std::wstring(oXml.filename().GetPath()), pStorage->GenID (m_nLocation));
-			COArtImage* pImage	=	new COArtImage(oXml.GetPath(), pStorage->GenID (m_nLocation));
-			if (pImage)
-			{
-				CShapeRun oShapeRun (pImage, pImage->GetID(), pStorage->GetOffSetSpa(m_nLocation));	//	смещение берем от предыдущего элемента
-				((CImageSettings*)(pImage->GetSettings()))->SetWrapDist(oXml2.Inline);				
-
-				pImage->SetRotationImage(oXml2);
-				pImage->SetInternalFlipImage(oXml2);
-				pImage->SetPositioningImage(oXml2);
-
-				oShapeRun.SetImageSize		(oXml2);
-				oShapeRun.SetImageWrap		(oXml2.Inline->Wrap);											
-				oShapeRun.SetImageUseBehind (oXml2.Inline->BehindDoc);						
-				oShapeRun.UpdateAnchorPositionImage(oXml2);
-
-				pStorage->AddImage (pImage, oShapeRun.GetSpa(), m_nLocation);						
-
-				oRun.AddRunItem (oShapeRun);					
-
-				return TRUE;
-			}
-		}
-
-		return FALSE;
-	}
-	CShapeRun COArtBuilder::BuildGroupRun (const OOX::Logic::Group& oXml, COArtGroup* pShape)
-	{		
-		if (pShape)
-		{
-			COArtStorage* pStorage		=	COArtStorage::Instance();
-
-			CShapeRun oShapeRun (pShape, pShape->GetID(), pStorage->GetOffSetSpa(m_nLocation));					
-			oShapeRun.UpdateSizes		(*oXml.style);																	
-			//oShapeRun.SetWrap			(oXmlShape.Wrap);																	
-			//oShapeRun.SetAnchor		((bool)(oXmlShape.anchorlock.is_init()));
-			//oShapeRun.SetUseBehind	(*oXml.style);	
-
-			if (FALSE == oShapeRun.IsInline())
-				pStorage->AddGroup (pShape, oShapeRun.GetSpa(), m_nLocation);						
-
-			return oShapeRun;
-		}
-
-		return CShapeRun();
-	}
-}
-
-namespace ASCDocFileFormat
-{	
-	COArtShape* COArtBuilder::BuildOArtShape (const OOX::Logic::Shape& oXml, const OOX::Logic::Group& oXmlGroup)
-	{
-		COArtShape* pShape	=	InternalBuildOArtShape <OOX::Logic::Shape> (oXml,GetRefShape(oXml,oXmlGroup));
-		if (pShape)
-		{
-			const OOX::Logic::ShapeStyle& oStyle	=	(*oXml.style);
-			pShape->SetupFromStyleXml(oStyle);
-
-			Unit<int, Pt> nX (0);
-			Unit<int, Pt> nY (0);			
-
-			if (oStyle.leftTop.is_init())
-			{
-				nX = *oStyle.leftTop->X;
-				nY = *oStyle.leftTop->Y;
-			}
-
-			Unit<int, Pt> nWidth (*oStyle.Size->Width);
-			Unit<int, Pt> nHeight (*oStyle.Size->Height);
-
-			pShape->SetChildeAnchorBounds (nX, nY, nWidth, nHeight, pShape->IsAngleBoundFlip());
-
-			if (pShape->IsTextureMode())
-			{
-				COArtStorage* storage = COArtStorage::Instance();
-				if (storage)
-				{
-					storage->SaveBlipImage(pShape);
-				}
-			}
-		}			
-
-		return pShape;
-	}
-
-	COArtShape* COArtBuilder::BuildOArtImage (const OOX::Logic::Shape& oXml, const std::wstring& strFileName)
-	{
-		if (0 == strFileName.length())
-			return NULL;
-
-		COArtStorage* storage	=	COArtStorage::Instance();
-		if (storage)
-		{
-			COArtImage* pImage	=	new COArtImage(strFileName, storage->GenID (m_nLocation));
-			if (pImage)
-			{
-				const OOX::Logic::ShapeStyle& oStyle = (*oXml.style);
-
-				pImage->SetRotation(oStyle);
-				pImage->SetInternalFlip(oStyle);
-				pImage->SetHidden(oStyle);
-
-				Unit<int, Pt> nX (0);
-				Unit<int, Pt> nY (0);			
-
-				if (oStyle.leftTop.is_init())
-				{
-					nX = *oStyle.leftTop->X;
-					nY = *oStyle.leftTop->Y;
-				}
-
-				Unit<int, Pt> nWidth (*oStyle.Size->Width);
-				Unit<int, Pt> nHeight (*oStyle.Size->Height);
-
-				pImage->SetChildeAnchorBounds (nX, nY, nWidth, nHeight, pImage->IsAngleBoundFlip());
-
-				storage->SaveBlipImage(pImage);
-
-				return pImage;
-			}
-		}
-
-		return NULL;
-	}
-}
-
-namespace ASCDocFileFormat
-{
-	template<class T> CShapeRun	COArtBuilder::BuildOdbflRun (const T& oXmlShape, CMapShape& oInnerRef)
-	{		
-		COArtShape* pShape	=	InternalBuildOArtShape <T> (oXmlShape,oInnerRef);
-		if (pShape)
-		{
-			COArtStorage* pStorage	=	COArtStorage::Instance();
-
-			CShapeRun oShapeRun (pShape, pShape->GetID(), pStorage->GetOffSetSpa(m_nLocation));	//	смещение берем от предыдущего элемента
-			oShapeRun.UpdateSizes	(*oXmlShape.style);																	//	размеры
-			oShapeRun.SetWrap		(oXmlShape.Wrap);																	//	обтекание
-			oShapeRun.SetAnchor		((bool)(oXmlShape.anchorlock.is_init()));
-			oShapeRun.SetUseBehind	(*oXmlShape.style);	
-			oShapeRun.UpdateAnchorPosition (*oXmlShape.style);
-
-			if (typeid(T) == typeid(OOX::Logic::Line))	//	для DOC файла точки начала и конца линии устанавливаются в структуре SPA
-			{
-				OOX::Logic::Line* pLine = (OOX::Logic::Line*)(&oXmlShape);
-				if (pLine)
-				{
-					if (pLine->from.is_init() && pLine->to.is_init())
-					{
-						DOCX::CPointF oFrom(pLine->from);
-						DOCX::CPointF oTo(pLine->to);
-
-						Spa& oSpa			=	oShapeRun.GetSpa();
-
-						oSpa.m_rca.left		=	oFrom.GetTX();
-						oSpa.m_rca.top		=	oFrom.GetTY();
-						oSpa.m_rca.right	=	oTo.GetTX();
-						oSpa.m_rca.bottom	=	oTo.GetTY();
-
-						oSpa.Update();
-					}
-				}
-			}
-
-			if (oXmlShape.textbox.is_init())		// Привязка текста к автофигуры 
-			{
-				m_pLastTbRef = pStorage->GenTbRef(m_nLocation);
-				if (m_pLastTbRef)
-				{
-					pShape->SetTbRef(m_pLastTbRef);
-				}
-			}
-
-			if (FALSE == oShapeRun.IsInline())
-			{
-				pStorage->Add (pShape, oShapeRun.GetSpa(), m_nLocation);
-			}
-
-			return oShapeRun;
-		}
-
-		return CShapeRun();
-	}
-
-	template<class T> COArtShape* COArtBuilder::InternalBuildOArtShape (const T& oXmlShape, CMapShape& oInnerRef)
-	{
-		COArtStorage* pStorage = COArtStorage::Instance();
-		if (pStorage)
-		{
-			COArtShape* pShape = new COArtShape(pStorage->GenID (m_nLocation));
-			if (pShape)
-			{
-				int nType	=	oInnerRef.m_nType;
-				if (nType == OfficeArt::Enumerations::msosptTextStop)		//	пока не понятно что делать с такими фигурами
-					nType	=	0;
-
-				pShape->SetShapeType (nType);
-
-				if (pShape->GetSettings ())
-				{
-					// fill
-
-					if (oXmlShape.fillstyle.is_init())
-						pShape->GetSettings ()->GetFillStyle().Read (oXmlShape.fillstyle);
-
-					// line
-
-					if (oXmlShape.linestyle.is_init())
-						pShape->GetSettings ()->GetLineStyle().Read (oXmlShape.linestyle);
-
-					// shadow
-
-					if (oXmlShape.shadow.is_init())
-						pShape->GetSettings ()->GetShadowStyle().Read (oXmlShape.shadow);
-
-					pShape->SetupFromStyleXml(oXmlShape.style);
-
-					if (0 == nType)
-					{
-						if (oInnerRef.m_strPath.length())
-							pShape->GetSettings()->GetGeometryStyle().SetPath(oInnerRef.m_strPath, oInnerRef.m_strAdjustValues, oInnerRef.m_strFormulas);
-
-						if (oInnerRef.m_strCoordSize.length())
-							pShape->GetSettings()->GetGeometryStyle().SetRightBottom(oInnerRef.m_strCoordSize);
-
-						if (oInnerRef.m_strConnection.length())
-							pShape->GetSettings()->GetGeometryStyle().SetConnection(oInnerRef.m_strConnection);
-
-						if (oInnerRef.m_strSites.length())
-							pShape->GetSettings()->GetGeometryStyle().SetSites(oInnerRef.m_strSites);
-
-						if (oInnerRef.m_strSitesDir.length())
-							pShape->GetSettings()->GetGeometryStyle().SetSitesDir(oInnerRef.m_strSitesDir);
-
-						if (oInnerRef.m_textboxrect.length())
-							pShape->GetSettings()->GetGeometryStyle().SetInscribe(oInnerRef.m_textboxrect);
-					}
-
-					if (oInnerRef.m_strAdjustValues.length())
-						pShape->GetSettings()->GetGeometryStyle().SetAdjustValues(oInnerRef.m_strAdjustValues);
-
-					if (typeid(T) == typeid(OOX::Logic::Roundrect))		//	для DOC файла велична арки пишется в adjust свойство
-					{
-						OOX::Logic::Roundrect* roundrect = (OOX::Logic::Roundrect*)(&oXmlShape);
-						if (roundrect)
-						{
-							if(roundrect->arcsize.is_init())
-							{
-								pShape->GetSettings()->GetGeometryStyle().SetAdjustValues(roundrect->arcsize, true);
-							}
-						}
-					}
-
-					pShape->GetSettings()->SetWrapDist (oXmlShape.style);
-				}
-
-				// имеет место быть заливка картинкой
-
-				if (m_strTextureFile.length())
-				{
-					pShape->SetTextureFill(TRUE, m_strTextureFile);
-					m_strTextureFile = L"";
-				}
-
-				return pShape;					
-			}
-		}
-
-		return NULL;
-	}
-}

ASCOfficeDocFile/DocxDocConverter/ShapePath.cpp

@@ -1,169 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-
-
-#include "ShapePath.h"
-
-namespace ASCDocFileFormat
-{
-	LONG CFormula::Calculate(CFormulasManager* pManager)
-	{
-		if ((0 > m_lIndex) || (m_lIndex >= pManager->m_arResults.size()))
-			return 0;
-		if (0xFFFFFFFF != pManager->m_arResults[m_lIndex])
-		{
-			return pManager->m_arResults[m_lIndex];
-		}
-
-		LONG lResult = 0;
-
-		LONG lGuidesCount	= pManager->m_arFormulas.size();
-		LONG lAdjCount		= pManager->m_pAdjustments->size();
-
-		LONG a1 = m_lParam1;
-		if (ptFormula == m_eType1)
-		{
-			a1 = (m_lParam1 >= lGuidesCount) ? 0 : pManager->m_arFormulas[m_lParam1].Calculate(pManager);
-		}
-		else if (ptAdjust == m_eType1)
-		{
-			a1 = (m_lParam1 >= lAdjCount) ? 0 : (*(pManager->m_pAdjustments))[m_lParam1];
-		}
-
-		LONG b1 = m_lParam2;
-		if (ptFormula == m_eType2)
-		{
-			b1 = (m_lParam2 >= lGuidesCount) ? 0 : pManager->m_arFormulas[m_lParam2].Calculate(pManager);
-		}
-		else if (ptAdjust == m_eType2)
-		{
-			b1 = (m_lParam2 >= lAdjCount) ? 0 : (*(pManager->m_pAdjustments))[m_lParam2];
-		}
-
-		LONG c1 = m_lParam3;
-		if (ptFormula == m_eType3)
-		{
-			c1 = (m_lParam3 >= lGuidesCount) ? 0 : pManager->m_arFormulas[m_lParam3].Calculate(pManager);
-		}
-		else if (ptAdjust == m_eType3)
-		{
-			c1 = (m_lParam3 >= lAdjCount) ? 0 : (*(pManager->m_pAdjustments))[m_lParam3];
-		}
-
-		double a = (double)a1;
-		double b = (double)b1;
-		double c = (double)c1;
-
-		double dRes = 0.0;
-
-		try
-		{
-			// теперь нужно просто посчитать
-			switch (m_eFormulaType)
-			{
-			case ftSum:			{ dRes = a + b - c;				break; }
-			case ftProduct:		{ 
-				if (0 == c) 
-					c = 1; 
-
-				dRes = a * b / c; 
-				break; 
-								}
-			case ftMid:			{ dRes = (a + b) / 2.0;			break; }
-			case ftAbsolute:	{ dRes = abs(a);				break; }
-
-			case ftMin:			{ dRes = min(a, b);				break; }
-			case ftMax:			{ dRes = max(a, b);				break; }
-			case ftIf:			{ dRes = (a > 0) ? b : c;		break; }
-			case ftSqrt:		{ dRes = sqrt(a);				break; }
-			case ftMod:			{ dRes = sqrt(a*a + b*b + c*c); break; }
-
-			case ftSin:			{ 
-				//dRes = a * sin(b);
-				//dRes = a * sin(b / pow2_16);
-				dRes = a * sin(M_PI * b / (pow2_16 * 180));
-				break; 
-								}
-			case ftCos:			{ 
-				//dRes = a * cos(b);
-				//dRes = a * cos(b / pow2_16);
-				dRes = a * cos(M_PI * b / (pow2_16 * 180));
-				break; 
-								}
-			case ftTan:			{ 
-				//dRes = a * tan(b);			
-				dRes = a * tan(M_PI * b / (pow2_16 * 180));
-				break; 
-								}
-			case ftAtan2:		{ 
-				dRes =  180 * pow2_16 * atan2(b,a) / M_PI;	
-				break; 
-								}
-
-			case ftSinatan2:	{ dRes = a * sin(atan2(c,b));	break; }
-			case ftCosatan2:	{ dRes = a * cos(atan2(c,b));	break; }
-
-			case ftSumangle:	{ 
-				//dRes = a  + b - c;
-				dRes = a + b * pow2_16 - c * pow2_16;
-
-				/*while (23592960 < dRes)
-				{
-				dRes -= 23592960;
-				}
-				while (-23592960 > dRes)
-				{
-				dRes += 23592960;
-				}*/
-
-				break; 
-								}
-			case ftEllipse:		{ 
-				if (0 == b)
-					b = 1;
-				dRes = c * sqrt(1-(a*a/(b*b)));	
-				break; 
-								}
-			case ftVal:			{ dRes = a;						break; }
-			default: break;
-			};
-		}
-		catch (...)
-		{
-			dRes = 0;
-		}
-
-		lResult = (LONG)dRes;
-		pManager->m_arResults[m_lIndex] = lResult;
-		return lResult;
-	}
-}

ASCOfficeDocxFile2/ASCOfficeDocxFile2.cpp

@@ -1,44 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-// AVSOfficeDocxFile2.cpp : Implementation of DLL Exports.
-#include "stdafx.h"
-#include "resource.h"
-
-#include "DocxFile2.h"
-#include "XlsxFile2.h"
-#include "PptxFile.h"
-
-// The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
-[ module(dll, uuid = "{A1EEE61A-FAA7-47af-B078-4E955623B9CA}", 
-		 name = "ASCOfficeDocxFile2", 
-		 helpstring = "ASCOfficeDocxFile2 1.0 Type Library",
-		 resource_name = "IDR_ASCOFFICEDOCXFILE2") ];

ASCOfficeDocxFile2/ASCOfficeDocxFile2.rc

@@ -1,142 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-#define COMPONENT_NAME "OfficeDocxFile2"
-#include "../Common/FileInfo.h"
-#include "version.h"
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Russian resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-#ifdef _WIN32
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION INTVER
- PRODUCTVERSION INTVER
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", COMPANY_NAME
-            VALUE "FileDescription", FILE_DESCRIPTION_ACTIVEX
-            VALUE "FileVersion", STRVER
-            VALUE "InternalName", COMPONENT_FILE_NAME_DLL
-            VALUE "LegalCopyright", LEGAL_COPYRIGHT
-            VALUE "OriginalFilename", COMPONENT_FILE_NAME_DLL
-            VALUE "ProductName", FILE_DESCRIPTION_ACTIVEX
-            VALUE "ProductVersion", STRVER
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// REGISTRY
-//
-
-IDR_ASCOFFICEDOCXFILE2       REGISTRY                "ASCOfficeDocxFile2.rgs"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE 
-BEGIN
-    IDS_PROJNAME            "ASCOfficeDocxFile2"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

ASCOfficeDocxFile2/ASCOfficeDocxFile2.rgs

@@ -1,11 +0,0 @@
-HKCR
-{
-	NoRemove AppID
-	{
-		'%APPID%' = s 'ASCOfficeDocxFile2'
-		'ASCOfficeDocxFile2.DLL'
-		{
-			val AppID = s '%APPID%'
-		}
-	}
-}

ASCOfficeDocxFile2/ASCOfficeDocxFile2.sln

@@ -1,77 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeDocxFile2", "ASCOfficeDocxFile2.vcxproj", "{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\Common\DocxFormat\Projects\DocxFormat2005.vcxproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPTXFormat", "..\ASCOfficePPTXFile\PPTXLib\PPTXFormat.vcxproj", "{36636678-AE25-4BE6-9A34-2561D1BCF302}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCHTMLRenderer", "..\ASCHTMLRenderer\ASCHTMLRendererLib.vcxproj", "{DC24710E-8DF2-4A7A-B7C3-2313E294143C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\Common\DocxFormat\Source\XML\libxml2\win_build\libxml2.vcxproj", "{21663823-DE45-479B-91D0-B4FEF4916EF0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeUtilsLib", "..\ASCOfficeUtils\ASCOfficeUtilsLib\Win\ASCOfficeUtilsLib.vcxproj", "{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Debug|Win32.Build.0 = Debug|Win32
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Debug|x64.ActiveCfg = Debug|x64
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Debug|x64.Build.0 = Debug|x64
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Release|Win32.ActiveCfg = Release|Win32
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Release|Win32.Build.0 = Release|Win32
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Release|x64.ActiveCfg = Release|x64
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Release|x64.Build.0 = Release|x64
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.Build.0 = Debug|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|x64.ActiveCfg = Debug|x64
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|x64.Build.0 = Debug|x64
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Win32.ActiveCfg = Release|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Win32.Build.0 = Release|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|x64.ActiveCfg = Release|x64
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|x64.Build.0 = Release|x64
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.ActiveCfg = Debug|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.Build.0 = Debug|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|x64.ActiveCfg = Debug|x64
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|x64.Build.0 = Debug|x64
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.ActiveCfg = Release|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.Build.0 = Release|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|x64.ActiveCfg = Release|x64
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|x64.Build.0 = Release|x64
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Debug|Win32.Build.0 = Debug|Win32
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Debug|x64.ActiveCfg = Debug|Win32
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Release|Win32.ActiveCfg = Release|Win32
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Release|Win32.Build.0 = Release|Win32
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Release|x64.ActiveCfg = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.Build.0 = Debug|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.ActiveCfg = Debug|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.ActiveCfg = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.Build.0 = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.ActiveCfg = Release|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.Build.0 = Debug|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|x64.ActiveCfg = Debug|x64
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|x64.Build.0 = Debug|x64
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Win32.ActiveCfg = Release|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Win32.Build.0 = Release|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|x64.ActiveCfg = Release|x64
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
-	EndGlobalSection
-EndGlobal

ASCOfficeDocxFile2/ASCOfficeDocxFile2.vcxproj

@@ -1,681 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseASC|Win32">
-      <Configuration>ReleaseASC</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseASC|x64">
-      <Configuration>ReleaseASC</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseOpenSource|Win32">
-      <Configuration>ReleaseOpenSource</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseOpenSource|x64">
-      <Configuration>ReleaseOpenSource</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}</ProjectGuid>
-    <RootNamespace>ASCOfficeDocxFile2</RootNamespace>
-    <Keyword>AtlProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfAtl>Static</UseOfAtl>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfAtl>Static</UseOfAtl>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfAtl>false</UseOfAtl>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <UseOfAtl>false</UseOfAtl>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfAtl>Static</UseOfAtl>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfAtl>Static</UseOfAtl>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfAtl>false</UseOfAtl>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <UseOfAtl>false</UseOfAtl>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
-    <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)ASCOfficeDocxFile2.tlb</TypeLibraryName>
-      <HeaderFileName>DocxFile2.h</HeaderFileName>
-      <DllDataFileName />
-      <InterfaceIdentifierFileName>ASCOfficeDocxFile2_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>ASCOfficeDocxFile2_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\Common\DocxFormat\Source\XML\libxml2\XML\include;$(SolutionDir)\..\DesktopEditor\freetype-2.5.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;USE_AVSOFFICESTUDIO_XMLUTILS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalOptions>/Zm1000 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)ASCOfficeDocxFile2.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/win_build/Release;$(SolutionDir)/../Common/DocxFormat/Lib/Debug;$(SolutionDir)/../SDK/lib/win_32/DEBUG;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <MergedIDLBaseFileName>_ASCOfficeDocxFile2.idl</MergedIDLBaseFileName>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)ASCOfficeDocxFile2.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>graphics.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Message>Performing registration</Message>
-      <Command>regsvr32 /s /c "$(TargetPath)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)ASCOfficeDocxFile2.tlb</TypeLibraryName>
-      <HeaderFileName>DocxFile2.h</HeaderFileName>
-      <DllDataFileName />
-      <InterfaceIdentifierFileName>ASCOfficeDocxFile2_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>ASCOfficeDocxFile2_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zm1000 %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\Common\DocxFormat\Source\XML\libxml2\XML\include;$(SolutionDir)\..\DesktopEditor\freetype-2.5.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;USE_AVSOFFICESTUDIO_XMLUTILS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)ASCOfficeDocxFile2.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/win_build/Release;$(SolutionDir)/../Common/DocxFormat/Lib/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>LIBCMTD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <MergedIDLBaseFileName>_ASCOfficeDocxFile2.idl</MergedIDLBaseFileName>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)ASCOfficeDocxFile2.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Message>Performing registration</Message>
-      <Command>regsvr32 /s /c "$(TargetPath)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>..\Redist\VersionControl.exe "$(ProjectDir)\version.h"</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)ASCOfficeDocxFile2.tlb</TypeLibraryName>
-      <HeaderFileName>DocxFile2.h</HeaderFileName>
-      <DllDataFileName />
-      <InterfaceIdentifierFileName>ASCOfficeDocxFile2_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>ASCOfficeDocxFile2_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zm1000 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\Common\DocxFormat\Source\XML\libxml2\XML\include;$(SolutionDir)\..\DesktopEditor\freetype-2.5.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;BUILD_CONFIG_FULL_VERSION;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comsvcs.lib;comsuppw.lib;gdiplus.lib;graphics.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/win_build/Release;$(SolutionDir)/../Common/DocxFormat/Lib/Release;$(SolutionDir)/../SDK/lib/win_32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>LIBC.lib;LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <MergedIDLBaseFileName>_ASCOfficeDocxFile2.idl</MergedIDLBaseFileName>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(OutDir)ASCOfficeDocxFile2.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Message>Performing registration</Message>
-      <Command>regsvr32 /s /c "$(TargetPath)"
-copy "$(TargetPath)" "$(SolutionDir)..\Redist"
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>..\Redist\VersionControl.exe "$(ProjectDir)\version.h"</Command>
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)ASCOfficeDocxFile2.tlb</TypeLibraryName>
-      <HeaderFileName>DocxFile2.h</HeaderFileName>
-      <DllDataFileName />
-      <InterfaceIdentifierFileName>ASCOfficeDocxFile2_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>ASCOfficeDocxFile2_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zm1000 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\Common\DocxFormat\Source\XML\libxml2\XML\include;$(SolutionDir)\..\DesktopEditor\freetype-2.5.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;BUILD_CONFIG_FULL_VERSION;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comsvcs.lib;comsuppw.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/win_build/Release;$(SolutionDir)/../Common/DocxFormat/Lib/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>LIBC.lib;LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <MergedIDLBaseFileName>_ASCOfficeDocxFile2.idl</MergedIDLBaseFileName>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(OutDir)ASCOfficeDocxFile2.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Message>Performing registration</Message>
-      <Command>regsvr32 /s /c "$(TargetPath)"
-copy "$(TargetPath)" "$(SolutionDir)..\Redist\x64"
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|Win32'">
-    <PreBuildEvent>
-      <Command />
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)ASCOfficeDocxFile2.tlb</TypeLibraryName>
-      <HeaderFileName>DocxFile2.h</HeaderFileName>
-      <DllDataFileName />
-      <InterfaceIdentifierFileName>ASCOfficeDocxFile2_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>ASCOfficeDocxFile2_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zm1000 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects;$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects/Font/FreeType;$(SolutionDir)/../Common/DocxFormat/Source/DocxFormat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;USE_ATL_CSTRING;USE_AVSOFFICESTUDIO_XMLUTILS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;ASCBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comsvcs.lib;comsuppw.lib;gdiplus.lib;DocxFormat.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ASCOfficeDocxFile2.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)/../Common/DocxFormat/Lib/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>LIBC.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <MergedIDLBaseFileName>_ASCOfficeDocxFile2.idl</MergedIDLBaseFileName>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(OutDir)ASCOfficeDocxFile2.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Message>Performing registration</Message>
-      <Command>regsvr32 /s /c "$(TargetPath)"
-copy "$(TargetPath)" "$(SolutionDir)..\..\..\..\ASC\Redist\ASCOfficeStudio"
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|x64'">
-    <PreBuildEvent>
-      <Command />
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)ASCOfficeDocxFile2.tlb</TypeLibraryName>
-      <HeaderFileName>DocxFile2.h</HeaderFileName>
-      <DllDataFileName />
-      <InterfaceIdentifierFileName>ASCOfficeDocxFile2_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>ASCOfficeDocxFile2_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zm1000 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects;$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects/Font/FreeType;$(SolutionDir)/../Common/DocxFormat/Source/DocxFormat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;USE_ATL_CSTRING;USE_AVSOFFICESTUDIO_XMLUTILS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;ASCBUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comsvcs.lib;comsuppw.lib;gdiplus.lib;DocxFormat.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ASCOfficeDocxFile2.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)/../Common/DocxFormat/Lib/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>LIBC.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <MergedIDLBaseFileName>_ASCOfficeDocxFile2.idl</MergedIDLBaseFileName>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(OutDir)ASCOfficeDocxFile2.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Message>Performing registration</Message>
-      <Command>regsvr32 /s /c "$(TargetPath)"
-copy "$(TargetPath)" "$(SolutionDir)..\..\..\..\ASC\Redist\ASCOfficeStudio"
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|Win32'">
-    <PreBuildEvent>
-      <Command />
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)ASCOfficeDocxFile2.tlb</TypeLibraryName>
-      <HeaderFileName>DocxFile2.h</HeaderFileName>
-      <DllDataFileName />
-      <InterfaceIdentifierFileName>ASCOfficeDocxFile2_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>ASCOfficeDocxFile2_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zm1000 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/XML/include;$(SolutionDir);$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects;$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects/Font/FreeType;$(SolutionDir)/../Common/DocxFormat/Source/DocxFormat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;USE_ATL_CSTRING;USE_AVSOFFICESTUDIO_XMLUTILS;BUILD_CONFIG_OPENSOURCE_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comsvcs.lib;comsuppw.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/win_build/Release;$(SolutionDir)/../Common/DocxFormat/Lib/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>LIBC.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <MergedIDLBaseFileName>_ASCOfficeDocxFile2.idl</MergedIDLBaseFileName>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(OutDir)ASCOfficeDocxFile2.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Message>copy to Redist</Message>
-      <Command>copy "$(TargetPath)" "$(SolutionDir)..\Redist"
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|x64'">
-    <PreBuildEvent>
-      <Command />
-    </PreBuildEvent>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>X64</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)ASCOfficeDocxFile2.tlb</TypeLibraryName>
-      <HeaderFileName>DocxFile2.h</HeaderFileName>
-      <DllDataFileName />
-      <InterfaceIdentifierFileName>ASCOfficeDocxFile2_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>ASCOfficeDocxFile2_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalOptions>/Zm1000 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/XML/include;$(SolutionDir);$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects;$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects/Font/FreeType;$(SolutionDir)/../Common/DocxFormat/Source/DocxFormat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;USE_ATL_CSTRING;USE_AVSOFFICESTUDIO_XMLUTILS;BUILD_CONFIG_OPENSOURCE_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comsvcs.lib;comsuppw.lib;gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/win_build/Release;$(SolutionDir)/../Common/DocxFormat/Lib/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>LIBC.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <MergedIDLBaseFileName>_ASCOfficeDocxFile2.idl</MergedIDLBaseFileName>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(OutDir)ASCOfficeDocxFile2.lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Message>copy to Redist</Message>
-      <Command>copy "$(TargetPath)" "$(SolutionDir)..\Redist"
-</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ASCOfficeDocxFile2.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ASCOfficeDocxFile2.rgs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\XlsxSerializerCom\Common\Common.cpp" />
-    <ClCompile Include="..\XlsxSerializerCom\Reader\ChartFromToBinary.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\XlsxSerializerCom\Reader\CommonWriter.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="..\XlsxSerializerCom\Reader\CSVReader.cpp" />
-    <ClCompile Include="..\XlsxSerializerCom\Writer\CSVWriter.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="ASCOfficeDocxFile2.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|Win32'">$(IntDir)</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|x64'">$(IntDir)</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|Win32'">$(IntDir)</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|x64'">$(IntDir)</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ClCompile Include="DocWrapper\DocxSerializer.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="DocWrapper\FontProcessor.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="DocWrapper\XlsxSerializer.cpp">
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)</ObjectFileName>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)</ObjectFileName>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|Win32'">Create</PrecompiledHeader>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|Win32'">$(IntDir)</ObjectFileName>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|x64'">Create</PrecompiledHeader>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|x64'">$(IntDir)</ObjectFileName>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|Win32'">Create</PrecompiledHeader>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|Win32'">$(IntDir)</ObjectFileName>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|x64'">Create</PrecompiledHeader>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseOpenSource|x64'">$(IntDir)</ObjectFileName>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)</ObjectFileName>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)</ObjectFileName>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\XlsxSerializerCom\Common\BinReaderWriterDefines.h" />
-    <ClInclude Include="..\XlsxSerializerCom\Common\Common.h" />
-    <ClInclude Include="..\XlsxSerializerCom\Reader\BinaryWriter.h" />
-    <ClInclude Include="..\XlsxSerializerCom\Reader\ChartFromToBinary.h" />
-    <ClInclude Include="..\XlsxSerializerCom\Reader\CommonWriter.h" />
-    <ClInclude Include="..\XlsxSerializerCom\Reader\CSVReader.h" />
-    <ClInclude Include="..\XlsxSerializerCom\Writer\BinaryCommonReader.h" />
-    <ClInclude Include="..\XlsxSerializerCom\Writer\BinaryReader.h" />
-    <ClInclude Include="..\XlsxSerializerCom\Writer\CSVWriter.h" />
-    <ClInclude Include="BinReader\ChartWriter.h" />
-    <ClInclude Include="BinReader\CommentsWriter.h" />
-    <ClInclude Include="BinReader\ContentTypesWriter.h" />
-    <ClInclude Include="BinReader\DocumentRelsWriter.h" />
-    <ClInclude Include="BinReader\DocumentWriter.h" />
-    <ClInclude Include="BinReader\FileDownloader.h" />
-    <ClInclude Include="BinReader\FileWriter.h" />
-    <ClInclude Include="BinReader\fontTableWriter.h" />
-    <ClInclude Include="BinReader\HeaderFooterWriter.h" />
-    <ClInclude Include="BinReader\MediaWriter.h" />
-    <ClInclude Include="BinReader\NumberingWriter.h" />
-    <ClInclude Include="BinReader\ReaderClasses.h" />
-    <ClInclude Include="BinReader\Readers.h" />
-    <ClInclude Include="BinReader\SettingWriter.h" />
-    <ClInclude Include="BinReader\StylesWriter.h" />
-    <ClInclude Include="BinWriter\BinEquationWriter.h" />
-    <ClInclude Include="BinWriter\BinReaderWriterDefines.h" />
-    <ClInclude Include="BinWriter\BinWriters.h" />
-    <ClInclude Include="DocWrapper\DocxSerializer.h" />
-    <ClInclude Include="DocWrapper\FontProcessor.h" />
-    <ClInclude Include="DocWrapper\XlsxSerializer.h" />
-    <ClInclude Include="DocxFile2.h" />
-    <ClInclude Include="PptxFile.h" />
-    <ClInclude Include="Resource.h" />
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="version.h" />
-    <ClInclude Include="XlsxFile2.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ASCHTMLRenderer\ASCHTMLRendererLib.vcxproj">
-      <Project>{dc24710e-8df2-4a7a-b7c3-2313e294143c}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\ASCOfficePPTXFile\PPTXLib\PPTXFormat.vcxproj">
-      <Project>{36636678-ae25-4be6-9a34-2561d1bcf302}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\ASCOfficeUtils\ASCOfficeUtilsLib\Win\ASCOfficeUtilsLib.vcxproj">
-      <Project>{3f3cb5a1-bb01-49c1-9342-4a69e30f9ef6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\Common\DocxFormat\Projects\DocxFormat2005.vcxproj">
-      <Project>{a100103a-353e-45e8-a9b8-90b87cc5c0b0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\Common\DocxFormat\Source\XML\libxml2\win_build\libxml2.vcxproj">
-      <Project>{21663823-de45-479b-91d0-b4fef4916ef0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

ASCOfficeDocxFile2/ASCOfficeDocxFile2.vcxproj.filters

@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="res">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="_">
-      <UniqueIdentifier>{3710d9f5-676c-4632-a22d-632057708e84}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DocWrapper">
-      <UniqueIdentifier>{da428055-8b24-49ac-a8fd-fb7567370761}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="XLSX">
-      <UniqueIdentifier>{2b0ee265-23a7-4758-b2e7-9f335c2932c6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="XLSX\Common">
-      <UniqueIdentifier>{d3849c02-1f95-40b4-9885-3850ac887162}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="XLSX\Reader">
-      <UniqueIdentifier>{6e356698-1762-48ec-aabe-e67cd986841e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="XLSX\Writer">
-      <UniqueIdentifier>{a6d705d7-de56-4085-ad90-9a64fb2a6377}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DOCX">
-      <UniqueIdentifier>{819e4322-0635-4959-bee0-bd7258b92b82}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DOCX\Reader">
-      <UniqueIdentifier>{710f68a2-18f0-40c6-8e32-5474b8301127}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DOCX\Reader\OOXWriter">
-      <UniqueIdentifier>{fb8f2ef8-d3e2-4bae-a746-4dd375a45521}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DOCX\Common">
-      <UniqueIdentifier>{845568f5-8012-46bf-a6d7-63610040f153}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DOCX\Writer">
-      <UniqueIdentifier>{276e338e-bf55-47f1-8fd6-d73552eed0d4}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ASCOfficeDocxFile2.rc">
-      <Filter>res</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ASCOfficeDocxFile2.rgs">
-      <Filter>res</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ASCOfficeDocxFile2.cpp">
-      <Filter>_</Filter>
-    </ClCompile>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>_</Filter>
-    </ClCompile>
-    <ClCompile Include="DocWrapper\FontProcessor.cpp">
-      <Filter>DocWrapper</Filter>
-    </ClCompile>
-    <ClCompile Include="DocWrapper\XlsxSerializer.cpp">
-      <Filter>XLSX</Filter>
-    </ClCompile>
-    <ClCompile Include="..\XlsxSerializerCom\Common\Common.cpp">
-      <Filter>XLSX\Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\XlsxSerializerCom\Reader\CSVReader.cpp">
-      <Filter>XLSX\Reader</Filter>
-    </ClCompile>
-    <ClCompile Include="..\XlsxSerializerCom\Reader\ChartFromToBinary.cpp">
-      <Filter>XLSX\Writer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\XlsxSerializerCom\Reader\CommonWriter.cpp">
-      <Filter>XLSX\Writer</Filter>
-    </ClCompile>
-    <ClCompile Include="..\XlsxSerializerCom\Writer\CSVWriter.cpp">
-      <Filter>XLSX\Writer</Filter>
-    </ClCompile>
-    <ClCompile Include="DocWrapper\DocxSerializer.cpp">
-      <Filter>DOCX</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Resource.h">
-      <Filter>_</Filter>
-    </ClInclude>
-    <ClInclude Include="version.h">
-      <Filter>_</Filter>
-    </ClInclude>
-    <ClInclude Include="DocWrapper\FontProcessor.h">
-      <Filter>DocWrapper</Filter>
-    </ClInclude>
-    <ClInclude Include="DocWrapper\XlsxSerializer.h">
-      <Filter>XLSX</Filter>
-    </ClInclude>
-    <ClInclude Include="..\XlsxSerializerCom\Common\BinReaderWriterDefines.h">
-      <Filter>XLSX\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\XlsxSerializerCom\Common\Common.h">
-      <Filter>XLSX\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\XlsxSerializerCom\Writer\BinaryCommonReader.h">
-      <Filter>XLSX\Reader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\XlsxSerializerCom\Writer\BinaryReader.h">
-      <Filter>XLSX\Reader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\XlsxSerializerCom\Reader\CSVReader.h">
-      <Filter>XLSX\Reader</Filter>
-    </ClInclude>
-    <ClInclude Include="..\XlsxSerializerCom\Reader\BinaryWriter.h">
-      <Filter>XLSX\Writer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\XlsxSerializerCom\Reader\ChartFromToBinary.h">
-      <Filter>XLSX\Writer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\XlsxSerializerCom\Reader\CommonWriter.h">
-      <Filter>XLSX\Writer</Filter>
-    </ClInclude>
-    <ClInclude Include="..\XlsxSerializerCom\Writer\CSVWriter.h">
-      <Filter>XLSX\Writer</Filter>
-    </ClInclude>
-    <ClInclude Include="DocWrapper\DocxSerializer.h">
-      <Filter>DOCX</Filter>
-    </ClInclude>
-    <ClInclude Include="BinReader\ReaderClasses.h">
-      <Filter>DOCX\Reader</Filter>
-    </ClInclude>
-    <ClInclude Include="BinReader\Readers.h">
-      <Filter>DOCX\Reader</Filter>
-    </ClInclude>
-    <ClInclude Include="BinReader\ChartWriter.h">
-      <Filter>DOCX\Reader\OOXWriter</Filter>
-    </ClInclude>
-    <ClInclude Include="BinReader\CommentsWriter.h">
-      <Filter>DOCX\Reader\OOXWriter</Filter>
-    </ClInclude>
-    <ClInclude Include="BinReader\ContentTypesWriter.h">
-      <Filter>DOCX\Reader\OOXWriter</Filter>
-    </ClInclude>
-    <ClInclude Include="BinReader\DocumentRelsWriter.h">
-      <Filter>DOCX\Reader\OOXWriter</Filter>
-    </ClInclude>
-    <ClInclude Include="BinReader\DocumentWriter.h">
-      <Filter>DOCX\Reader\OOXWriter</Filter>
-    </ClInclude>
-    <ClInclude Include="BinReader\FileWriter.h">
-      <Filter>DOCX\Reader\OOXWriter</Filter>
-    </ClInclude>
-    <ClInclude Include="BinReader\fontTableWriter.h">
-      <Filter>DOCX\Reader\OOXWriter</Filter>
-    </ClInclude>
-    <ClInclude Include="BinReader\HeaderFooterWriter.h">
-      <Filter>DOCX\Reader\OOXWriter</Filter>
-    </ClInclude>
-    <ClInclude Include="BinReader\MediaWriter.h">
-      <Filter>DOCX\Reader\OOXWriter</Filter>
-    </ClInclude>
-    <ClInclude Include="BinReader\NumberingWriter.h">
-      <Filter>DOCX\Reader\OOXWriter</Filter>
-    </ClInclude>
-    <ClInclude Include="BinReader\SettingWriter.h">
-      <Filter>DOCX\Reader\OOXWriter</Filter>
-    </ClInclude>
-    <ClInclude Include="BinReader\StylesWriter.h">
-      <Filter>DOCX\Reader\OOXWriter</Filter>
-    </ClInclude>
-    <ClInclude Include="BinReader\FileDownloader.h">
-      <Filter>DOCX\Common</Filter>
-    </ClInclude>
-    <ClInclude Include="BinWriter\BinEquationWriter.h">
-      <Filter>DOCX\Writer</Filter>
-    </ClInclude>
-    <ClInclude Include="BinWriter\BinReaderWriterDefines.h">
-      <Filter>DOCX\Writer</Filter>
-    </ClInclude>
-    <ClInclude Include="BinWriter\BinWriters.h">
-      <Filter>DOCX\Writer</Filter>
-    </ClInclude>
-    <ClInclude Include="DocxFile2.h" />
-    <ClInclude Include="PptxFile.h" />
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="XlsxFile2.h" />
-  </ItemGroup>
-</Project>

ASCOfficeDocxFile2/ASCOfficeDocxFile2_2013.sln

@@ -1,84 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeDocxFile2", "ASCOfficeDocxFile2.vcxproj", "{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C} = {DC24710E-8DF2-4A7A-B7C3-2313E294143C}
-		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
-		{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\Common\DocxFormat\Projects\DocxFormat2005.vcxproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPTXFormat", "..\ASCOfficePPTXFile\PPTXLib\PPTXFormat.vcxproj", "{36636678-AE25-4BE6-9A34-2561D1BCF302}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCHTMLRenderer", "..\ASCHTMLRenderer\ASCHTMLRendererLib.vcxproj", "{DC24710E-8DF2-4A7A-B7C3-2313E294143C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\Common\DocxFormat\Source\XML\libxml2\win_build\libxml2.vcxproj", "{21663823-DE45-479B-91D0-B4FEF4916EF0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeUtilsLib", "..\ASCOfficeUtils\ASCOfficeUtilsLib\Win\ASCOfficeUtilsLib.vcxproj", "{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Debug|Win32.Build.0 = Debug|Win32
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Debug|x64.ActiveCfg = Debug|x64
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Debug|x64.Build.0 = Debug|x64
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Release|Win32.ActiveCfg = Release|Win32
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Release|Win32.Build.0 = Release|Win32
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Release|x64.ActiveCfg = Release|x64
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Release|x64.Build.0 = Release|x64
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.Build.0 = Debug|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|x64.ActiveCfg = Debug|x64
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|x64.Build.0 = Debug|x64
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Win32.ActiveCfg = Release|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Win32.Build.0 = Release|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|x64.ActiveCfg = Release|x64
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|x64.Build.0 = Release|x64
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.ActiveCfg = Debug|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.Build.0 = Debug|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|x64.ActiveCfg = Debug|x64
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|x64.Build.0 = Debug|x64
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.ActiveCfg = Release|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.Build.0 = Release|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|x64.ActiveCfg = Release|x64
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|x64.Build.0 = Release|x64
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Debug|Win32.Build.0 = Debug|Win32
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Debug|x64.ActiveCfg = Debug|Win32
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Release|Win32.ActiveCfg = Release|Win32
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Release|Win32.Build.0 = Release|Win32
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Release|x64.ActiveCfg = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.Build.0 = Debug|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.ActiveCfg = Debug|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.ActiveCfg = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.Build.0 = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.ActiveCfg = Release|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.Build.0 = Debug|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|x64.ActiveCfg = Debug|x64
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|x64.Build.0 = Debug|x64
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Win32.ActiveCfg = Release|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Win32.Build.0 = Release|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|x64.ActiveCfg = Release|x64
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
-	EndGlobalSection
-EndGlobal

ASCOfficeDocxFile2/BinReader/ChartWriter.h

@@ -57,7 +57,7 @@ namespace Writers
 		}
 		~ChartWriter()
 		{
-			for(int i = 0, length = m_aCharts.size(); i < length; ++i)
+			for(size_t i = 0, length = m_aCharts.size(); i < length; ++i)
 			{
 				delete m_aCharts[i];
 			}
@@ -73,7 +73,7 @@ namespace Writers
                 OOX::CPath pathChartDir = m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR + _T("charts");
                 NSDirectory::CreateDirectory(pathChartDir.GetPath());
 
-                for(int i = 0, length = m_aCharts.size(); i < length; ++i)
+                for(size_t i = 0, length = m_aCharts.size(); i < length; ++i)
 				{
 					ChartElem* elem = m_aCharts[i];
 

ASCOfficeDocxFile2/BinReader/DocumentWriter.h

@@ -33,7 +33,7 @@
 #define DOCUMENT_WRITER
 
 #include "../../XlsxSerializerCom/Common/Common.h"
-#include "../BinWriter/BinReaderWriterDefines.h";
+#include "../BinWriter/BinReaderWriterDefines.h"
 
 namespace Writers
 {
@@ -78,7 +78,7 @@ namespace Writers
 			if(BinDocxRW::g_nCurFormatVersion < 5)
 			{
 				bool bTitlePage = false;
-				for(int i = 0, length = m_oHeaderFooterWriter.m_aHeaders.size(); i < length; ++i)
+				for(size_t i = 0, length = m_oHeaderFooterWriter.m_aHeaders.size(); i < length; ++i)
 				{
 					HdrFtrItem* pHeader = m_oHeaderFooterWriter.m_aHeaders[i];
                     if(false == pHeader->rId.empty())
@@ -98,7 +98,7 @@ namespace Writers
 						}
 					}
 				}
-				for(int i = 0, length = m_oHeaderFooterWriter.m_aFooters.size(); i < length; ++i)
+				for(size_t i = 0, length = m_oHeaderFooterWriter.m_aFooters.size(); i < length; ++i)
 				{
 					HdrFtrItem* pFooter = m_oHeaderFooterWriter.m_aFooters[i];
                     if(false == pFooter->rId.empty())

ASCOfficeDocxFile2/BinReader/HeaderFooterWriter.h

@@ -84,21 +84,22 @@ namespace Writers
 		}
 		~HeaderFooterWriter()
 		{
-			for(int i = 0, length = m_aHeaders.size(); i < length; ++i)
+			for(size_t i = 0, length = m_aHeaders.size(); i < length; ++i)
 				delete m_aHeaders[i];
 			m_aHeaders.clear();
-			for(int i = 0, length = m_aFooters.size(); i < length; ++i)
+			
+			for(size_t i = 0, length = m_aFooters.size(); i < length; ++i)
 				delete m_aFooters[i];
 			m_aFooters.clear();
 		}
 		void Write()
 		{
-			for(int i = 0, length = m_aHeaders.size(); i < length; ++i)
+			for(size_t i = 0, length = m_aHeaders.size(); i < length; ++i)
 			{
 				HdrFtrItem* pHeader = m_aHeaders[i];
 				WriteItem(_T("header"), pHeader->m_sFilename, pHeader->Header, true);
 			}
-			for(int i = 0, length = m_aFooters.size(); i < length; ++i)
+			for(size_t i = 0, length = m_aFooters.size(); i < length; ++i)
 			{
 				HdrFtrItem* pFooter = m_aFooters[i];
 				WriteItem(_T("footer"), pFooter->m_sFilename, pFooter->Header, false);

ASCOfficeDocxFile2/BinReader/ReaderClasses.h

@@ -339,9 +339,9 @@ public:
 				if(ThemeColor.bColor)
                     sShd += L" w:themeFill=\"" + ThemeColor.ToStringColor() + L"\"";
                 if(ThemeColor.bTint)
-                    sShd += L" w:themeFillTint=\"" + ThemeColor.ToStringColor() + L"\"";
+                    sShd += L" w:themeFillTint=\"" + ThemeColor.ToStringTint() + L"\"";
 				if(ThemeColor.bShade)
-                    sShd += L" w:themeFillShade=\"" + ThemeColor.ToStringColor() + L"\"";
+                    sShd += L" w:themeFillShade=\"" + ThemeColor.ToStringShade() + L"\"";
 			}
             sShd += L"/>";
 		}
@@ -876,7 +876,7 @@ public:
 				pCStringWriter->WriteString(CellPr);
                 pCStringWriter->WriteString(L"</w:tcPr>");
 			}
-			for(int i = 0, length = TblStylePr.size(); i < length; ++i)
+			for(int i = 0, length = (int)TblStylePr.size(); i < length; ++i)
 			{
 				pCStringWriter->WriteString(TblStylePr[i]);
 			}
@@ -1241,7 +1241,7 @@ public:
 	}
 	~docLvl()
 	{
-		for(int i = 0,length = Text.size(); i < length; i++)
+		for(int i = 0,length = (int)Text.size(); i < length; i++)
 		{
 			delete Text[i];
 		}
@@ -1297,7 +1297,7 @@ public:
 		if(bText)
 		{
             std::wstring sText;
-			for(int i = 0, length = Text.size(); i < length; ++i)
+			for(int i = 0, length = (int)Text.size(); i < length; ++i)
 			{
 				docLvlText* item = Text[i];
 				if(item->bText)
@@ -1360,7 +1360,7 @@ public:
 	}
 	~docANum()
 	{
-		for(int i = 0, length = Lvls.size(); i < length; i++)
+		for(int i = 0, length = (int)Lvls.size(); i < length; i++)
 		{
 			delete Lvls[i];
 		}
@@ -1380,7 +1380,7 @@ public:
                 std::wstring sCorrectNumStyleLink = XmlUtils::EncodeXmlString(NumStyleLink);
                 oWriterANum.WriteString(L"<w:numStyleLink w:val=\"" + sCorrectNumStyleLink + L"\"/>");
 			}
-			for(int i = 0, length = Lvls.size(); i < length; ++i)
+			for(int i = 0, length = (int)Lvls.size(); i < length; ++i)
 			{
 				Lvls[i]->Write(oWriterANum, i);
 			}
@@ -1453,7 +1453,8 @@ public:
             std::vector<std::wstring> aItems;
             std::wstring sCurItem;
             bool bDQuot = false;
-            for(int i = 0, length = fld.length(); i < length; ++i)
+            
+			for(int i = 0, length = (int)fld.length(); i < length; ++i)
             {
                 wchar_t sCurLetter = fld[i];
                 if('\"' == sCurLetter)
@@ -1476,7 +1477,8 @@ public:
             }
             if(sCurItem.length() > 0)
                 aItems.push_back(sCurItem);
-			for(int i = 0, length = aItems.size(); i < length; ++i)
+			
+			for(int i = 0, length = (int)aItems.size(); i < length; ++i)
             {
                 std::wstring item = aItems[i];
 				if(bNextLink)
@@ -1500,7 +1502,7 @@ public:
 				res = new WriteHyperlink();
                 boost::algorithm::trim(sLink);
 
-                int nAnchorIndex = sLink.find(L"#");
+                int nAnchorIndex = (int)sLink.find(L"#");
 				if(-1 != nAnchorIndex)
 				{
                     res->href   = sLink.substr(0, nAnchorIndex);
@@ -1589,7 +1591,7 @@ public:
 	}
 	~CComment()
 	{
-		for(int i = 0, length = replies.size(); i < length; ++i)
+		for(size_t i = 0; i <replies.size(); ++i)
 		{
 			delete replies[i];
 		}
@@ -1597,32 +1599,37 @@ public:
 	}
 	int getCount()
 	{
-		return replies.size() + 1;
+		return (int)replies.size() + 1;
 	}
 	void setFormatStart(int IdFormatStart)
 	{
 		bIdFormat = true;
 		IdFormat = IdFormatStart;
-		for(int i = 0, length = replies.size(); i < length; ++i)
+		
+		for(size_t i = 0; i < replies.size(); ++i)
 		{
-			CComment* pComment = replies[i];
+			CComment* pComment	= replies[i];
 			pComment->bIdFormat = true;
-			pComment->IdFormat = IdFormatStart + i + 1;
+			pComment->IdFormat	= (int)(IdFormatStart + i + 1);
 		} 
 	}
     std::wstring writeRef(const std::wstring& sBefore, const std::wstring& sRef, const std::wstring& sAfter)
 	{
         std::wstring sRes;
         sRes += (writeRef(this, sBefore, sRef, sAfter));
-		for(int i = 0, length = replies.size(); i < length; ++i)
+		
+		for(size_t i = 0; i< replies.size(); ++i)
+		{
             sRes += (writeRef(replies[i], sBefore, sRef, sAfter));
+		}
 		return sRes;
 	}
     std::wstring writeTemplates(funcArg fReadFunction)
 	{
         std::wstring sRes;
         sRes += (fReadFunction(this));
-		for(int i = 0, length = replies.size(); i < length; ++i)
+		
+		for(size_t i = 0; i < replies.size(); ++i)
             sRes += (fReadFunction(replies[i]));
 		return sRes;
 	}
@@ -1708,7 +1715,7 @@ public:
 
             bool bFirst = true;
 			int nPrevIndex = 0;
-            for(int i = 0, length = sText.length(); i < length; i++)
+            for(size_t i = 0; i < sText.length(); i++)
 			{
                 wchar_t cToken = sText[i];
 				if('\n' == cToken)
@@ -1717,7 +1724,7 @@ public:
 					nPrevIndex = i + 1;
 				}
 			}
-            writeContentWritePart(pComment, sText, nPrevIndex, sText.length(), bFirst, sRes);
+            writeContentWritePart(pComment, sText, nPrevIndex, (int)sText.length(), bFirst, sRes);
 		}
         sRes += L"</w:comment>";
 		return sRes;
@@ -1736,7 +1743,7 @@ w15:paraIdParent=\"" + pComment->m_sParaIdParent + L"\" w15:done=\"" + sDone + L
 			else
                 sRes += L"<w15:commentEx w15:paraId=\"" + pComment->m_sParaId + L"\" w15:done=\"" + sDone + L"\"/>";
 			//расставляем paraIdParent
-			for(int i = 0, length = pComment->replies.size(); i < length; i++)
+			for(size_t i = 0; i < pComment->replies.size(); i++)
 				pComment->replies[i]->m_sParaIdParent = pComment->m_sParaId;
 		}
 		return sRes;
@@ -1782,7 +1789,7 @@ public:
 		{
 			m_mapComments[pComment->IdOpen] = pComment;
 			addAuthor(pComment);
-			for(int i = 0, length = pComment->replies.size(); i < length; i++)
+			for(size_t i = 0; i < pComment->replies.size(); i++)
 				addAuthor(pComment->replies[i]);
 		}
 	}
@@ -1866,7 +1873,7 @@ public:
 	}
 	~CDrawingPropertyWrap()
 	{
-		for(int i = 0, length = Points.size(); i < length; ++i)
+		for(size_t i = 0; i < Points.size(); ++i)
 			delete Points[i];
 		Points.clear();
 	}
@@ -2055,7 +2062,7 @@ distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\"><wp:extent cx=\"" + std::to_wstr
                 int nSimplePos = 0;
                 if(bBSimplePos && BSimplePos)
                     nSimplePos = 1;
-                int nRelativeHeight = 0;
+                unsigned long nRelativeHeight = 0;
                 if(bRelativeHeight)
                     nRelativeHeight = RelativeHeight;
                 int nBehindDoc = 0;
@@ -2211,7 +2218,7 @@ distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\"><wp:extent cx=\"" + std::to_wstr
                             sXml += L"<wp:start x=\"" + std::to_wstring(emuX) + L"\" y=\"" + std::to_wstring(emuY) + L"\"/>";
                         }
 
-                        for(int i = 0, length = DrawingPropertyWrap.Points.size(); i < length; ++i)
+                        for(size_t i = 0; i < DrawingPropertyWrap.Points.size(); ++i)
                         {
                             CDrawingPropertyWrapPoint* pWrapPoint = DrawingPropertyWrap.Points[i];
                             if(pWrapPoint->bX && pWrapPoint->bY)

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -760,11 +760,11 @@ public:
 			{
 				Tabs oTabs;
 				res = Read2(length, &Binary_pPrReader::ReadTabs, this, &oTabs);
-				int nLen = oTabs.m_aTabs.size();
+				size_t nLen = oTabs.m_aTabs.size();
 				if(nLen > 0)
 				{
                     pCStringWriter->WriteString(std::wstring(_T("<w:tabs>")));
-					for(int i = 0; i < nLen; ++i)
+					for(size_t i = 0; i < nLen; ++i)
 					{
 						Tab& oTab = oTabs.m_aTabs[i];
 						long nTab = SerializeCommon::Round( g_dKoef_mm_to_twips * oTab.Pos);
@@ -776,7 +776,7 @@ public:
                             case g_tabtype_clear:   sVal=_T("clear");   break;
                             default:                sVal=_T("left");    break;
 						}
-                        pCStringWriter->WriteString(L"<w:tab w:val=\"%ls\" w:pos=\"" + std::to_wstring(nTab) + L"\"/>");
+                        pCStringWriter->WriteString(L"<w:tab w:val=\"" + sVal + L"\" w:pos=\"" + std::to_wstring(nTab) + L"\"/>");
 					}
                     pCStringWriter->WriteString(std::wstring(_T("</w:tabs>")));
 				}				
@@ -785,11 +785,7 @@ public:
 			{
                 std::wstring sStyleName(m_oBufferedStream.GetString3(length));
 				sStyleName = XmlUtils::EncodeXmlString(sStyleName);
-                std::wstring sStyle;
-                sStyle += L"<w:pStyle w:val=\"";
-                sStyle += sStyleName;
-                sStyle += L"\" />";
-				pCStringWriter->WriteString(sStyle);				
+                pCStringWriter->WriteString(L"<w:pStyle w:val=\"" + sStyleName + L"\" />");
             }break;
 		case c_oSerProp_pPrType::numPr:
             {
@@ -1390,7 +1386,7 @@ public:
 		if( c_oSerProp_secPrType::hdrftrelem == type )
 		{
 			int nHdrFtrIndex = m_oBufferedStream.GetLong();
-			if(nHdrFtrIndex >= 0 && nHdrFtrIndex <= m_oFileWriter.m_oHeaderFooterWriter.m_aHeaders.size())
+			if(nHdrFtrIndex >= 0 && nHdrFtrIndex <= (int)m_oFileWriter.m_oHeaderFooterWriter.m_aHeaders.size())
 			{
 				Writers::HdrFtrItem* pHdrFtrItem = m_oFileWriter.m_oHeaderFooterWriter.m_aHeaders[nHdrFtrIndex];
 				pHdrFtrItem->m_sFilename;
@@ -1415,7 +1411,7 @@ public:
 		if( c_oSerProp_secPrType::hdrftrelem == type )
 		{
 			int nHdrFtrIndex = m_oBufferedStream.GetLong();
-			if(nHdrFtrIndex >= 0 && nHdrFtrIndex <= oBinary_HdrFtrTableReader.m_oHeaderFooterWriter.m_aFooters.size())
+			if(nHdrFtrIndex >= 0 && nHdrFtrIndex <= (int)oBinary_HdrFtrTableReader.m_oHeaderFooterWriter.m_aFooters.size())
 			{
 				Writers::HdrFtrItem* pHdrFtrItem = oBinary_HdrFtrTableReader.m_oHeaderFooterWriter.m_aFooters[nHdrFtrIndex];
 				pHdrFtrItem->m_sFilename;
@@ -1983,7 +1979,7 @@ public:
 			if(true == orowPrAfterBefore.bGridAfter && orowPrAfterBefore.nGridAfter > 0 && false == orowPrAfterBefore.oAfterWidth.bW)
 			{
 				//ищем по tblGrid
-				long nGridLength = m_aCurTblGrid.size();
+				long nGridLength = (long)m_aCurTblGrid.size();
 				if(orowPrAfterBefore.nGridAfter < nGridLength)
 				{
 					double nSumW = 0;
@@ -2400,14 +2396,14 @@ public:
 	int Read()
 	{
 		int res = ReadTable(&Binary_NumberingTableReader::ReadNumberingContent, this);
-		for(int i = 0, length = m_aDocANums.size(); i < length; ++i)
+		for(size_t i = 0; i < m_aDocANums.size(); ++i)
 		{
 			docANum* pdocANum = m_aDocANums[i];
 			pdocANum->Write(oNumberingWriters.m_oANum);
 			delete m_aDocANums[i];
 		}
 		m_aDocANums.clear();
-		for(int i = 0, length = m_aDocNums.size(); i < length; ++i)
+		for(size_t i = 0; i < m_aDocNums.size(); ++i)
 		{
 			m_aDocNums[i]->Write(oNumberingWriters.m_oNumList);
 			delete m_aDocNums[i];
@@ -3370,7 +3366,7 @@ public:
 		int res = c_oSerConstants::ReadOk;
 		if ( c_oSer_OMathBottomNodesValType::Val == type )
 		{
-			LONG lVal =  Mm_To_Dx(m_oBufferedStream.GetDouble());
+			LONG lVal =  (LONG)Mm_To_Dx(m_oBufferedStream.GetDouble());
 
             m_oFileWriter.m_oSettingWriter.AddSetting(L"<m:interSp m:val=\"" + std::to_wstring(lVal) + L"\"/>");
 		}
@@ -3402,7 +3398,7 @@ public:
 		int res = c_oSerConstants::ReadOk;
 		if ( c_oSer_OMathBottomNodesValType::Val == type )
 		{
-			LONG lVal =  Mm_To_Dx(m_oBufferedStream.GetDouble());
+			LONG lVal =  (LONG)Mm_To_Dx(m_oBufferedStream.GetDouble());
 
             m_oFileWriter.m_oSettingWriter.AddSetting(L"<m:intraSp m:val=\"" + std::to_wstring(lVal) + L"\"/>");
 		}
@@ -3415,7 +3411,7 @@ public:
 		int res = c_oSerConstants::ReadOk;
 		if ( c_oSer_OMathBottomNodesValType::Val == type )
 		{
-			LONG lVal =  Mm_To_Dx(m_oBufferedStream.GetDouble());
+			LONG lVal =  (LONG)Mm_To_Dx(m_oBufferedStream.GetDouble());
 
             m_oFileWriter.m_oSettingWriter.AddSetting(L"<m:lMargin m:val=\"" + std::to_wstring(lVal) + L"\"/>");
 		}
@@ -3466,7 +3462,7 @@ public:
 		int res = c_oSerConstants::ReadOk;
 		if ( c_oSer_OMathBottomNodesValType::Val == type )
 		{
-			LONG lVal =  Mm_To_Dx(m_oBufferedStream.GetDouble());
+			LONG lVal =  (LONG)Mm_To_Dx(m_oBufferedStream.GetDouble());
 
             m_oFileWriter.m_oSettingWriter.AddSetting(L"<m:postSp m:val=\"" + std::to_wstring(lVal) + L"\"/>");
 		}
@@ -3479,7 +3475,7 @@ public:
 		int res = c_oSerConstants::ReadOk;
 		if ( c_oSer_OMathBottomNodesValType::Val == type )
 		{
-			LONG lVal =  Mm_To_Dx(m_oBufferedStream.GetDouble());
+			LONG lVal =  (LONG)Mm_To_Dx(m_oBufferedStream.GetDouble());
 
             m_oFileWriter.m_oSettingWriter.AddSetting(L"<m:preSp m:val=\"" + std::to_wstring(lVal)+ L"\"/>");
 		}
@@ -3492,7 +3488,7 @@ public:
 		int res = c_oSerConstants::ReadOk;
 		if ( c_oSer_OMathBottomNodesValType::Val == type )
 		{
-			LONG lVal =  Mm_To_Dx(m_oBufferedStream.GetDouble());
+			LONG lVal =  (LONG)Mm_To_Dx(m_oBufferedStream.GetDouble());
 
             m_oFileWriter.m_oSettingWriter.AddSetting(L"<m:rMargin m:val=\"" + std::to_wstring(lVal) + L"\"/>");
 		}
@@ -3522,7 +3518,7 @@ public:
 		int res = c_oSerConstants::ReadOk;
 		if ( c_oSer_OMathBottomNodesValType::Val == type )
 		{
-			LONG lVal =  Mm_To_Dx(m_oBufferedStream.GetDouble());
+			LONG lVal =  (LONG)Mm_To_Dx(m_oBufferedStream.GetDouble());
 
             m_oFileWriter.m_oSettingWriter.AddSetting(L"<m:wrapIndent m:val=\"" + std::to_wstring(lVal) + L"\"/>");
 		}
@@ -6530,7 +6526,9 @@ public:
 	}
     int Read_Background(BYTE type, long length, void* poResult)
     {
-        int res = c_oSerConstants::ReadOk;
+		m_oFileWriter.m_oSettingWriter.AddSetting(L"<w:displayBackgroundShape/>");
+		
+		int res = c_oSerConstants::ReadOk;
         Background* pBackground = static_cast<Background*>(poResult);
 
         if( c_oSerBackgroundType::Color == type )
@@ -6591,10 +6589,13 @@ public:
 				OOX::CPath pathChartsWorksheetDir = m_oFileWriter.m_oChartWriter.m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR +_T("embeddings");
 				OOX::CSystemUtility::CreateDirectories(pathChartsWorksheetDir.GetPath());
 
+                bool oldValueType = m_oFileWriter.m_pDrawingConverter->m_pImageManager->m_bIsWord;
+
+                m_oFileWriter.m_pDrawingConverter->m_pImageManager->m_bIsWord = false;
 				m_oFileWriter.m_pDrawingConverter->SetDstContentRels();
 
                 std::wstring sThemeDir;
-                int nIndex = m_oFileWriter.m_sThemePath.rfind(FILE_SEPARATOR_CHAR);
+                int nIndex = (int)m_oFileWriter.m_sThemePath.rfind(FILE_SEPARATOR_CHAR);
 				if(-1 != nIndex)
                     sThemeDir = m_oFileWriter.m_sThemePath.substr(0, nIndex);
 				
@@ -6642,6 +6643,8 @@ public:
                 m_oFileWriter.m_pDrawingConverter->WriteRels(bstrChartRelType, sRelsName, std::wstring(), &rIdChart);
 
                 pDrawingProperty->sChartRels = L"rId" + std::to_wstring( rIdChart);
+
+                m_oFileWriter.m_pDrawingConverter->m_pImageManager->m_bIsWord = oldValueType;
 			}
 			else
 				res = c_oSerConstants::ReadUnknown;
@@ -6691,7 +6694,7 @@ public:
 		else if ( c_oSerImageType2::RelativeHeight == type )
 		{
 			pDrawingProperty->bRelativeHeight = true;
-			pDrawingProperty->RelativeHeight = m_oBufferedStream.GetLong();
+			pDrawingProperty->RelativeHeight = m_oBufferedStream.GetULong();
 		}
 		else if ( c_oSerImageType2::BSimplePos == type )
 		{
@@ -7133,12 +7136,12 @@ int Binary_HdrFtrTableReader::ReadHdrFtrItem(BYTE type, long length, void* poRes
 			if(nCurType == c_oSerHdrFtrTypes::Header)
 			{
 				m_oHeaderFooterWriter.m_aHeaders.push_back(poHdrFtrItem);
-                poHdrFtrItem->m_sFilename = L"header" + std::to_wstring(m_oHeaderFooterWriter.m_aHeaders.size()) + L".xml";
+                poHdrFtrItem->m_sFilename = L"header" + std::to_wstring((int)m_oHeaderFooterWriter.m_aHeaders.size()) + L".xml";
 			}
 			else
 			{
 				m_oHeaderFooterWriter.m_aFooters.push_back(poHdrFtrItem);
-                poHdrFtrItem->m_sFilename = L"footer" + std::to_wstring(m_oHeaderFooterWriter.m_aFooters.size()) + L".xml";
+                poHdrFtrItem->m_sFilename = L"footer" + std::to_wstring((int)m_oHeaderFooterWriter.m_aFooters.size()) + L".xml";
 			}
 			m_oFileWriter.m_pDrawingConverter->SetDstContentRels();
 			Binary_DocumentTableReader oBinary_DocumentTableReader(m_oBufferedStream, m_oFileWriter, poHdrFtrItem->Header, m_pComments);
@@ -7375,7 +7378,7 @@ public: BinaryFileReader(std::wstring& sFileInDir, NSBinPptxRW::CBinaryFileReade
 					return res;
 			}
 			
-			for(int i = 0, length = aTypes.size(); i < length; ++i)
+			for(size_t i = 0; i < aTypes.size(); ++i)
 			{
 				BYTE mtiType = aTypes[i];
 				long mtiOffBits = aOffBits[i];
@@ -7441,7 +7444,7 @@ public: BinaryFileReader(std::wstring& sFileInDir, NSBinPptxRW::CBinaryFileReade
 					long rId;
                     m_oFileWriter.m_pDrawingConverter->WriteRels(std::wstring(_T("http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes")), std::wstring(_T("endnotes.xml")), std::wstring(), &rId);
 				}
-				for(int i = 0, length = m_oFileWriter.m_oHeaderFooterWriter.m_aHeaders.size(); i < length; ++i)
+				for(size_t i = 0; i < m_oFileWriter.m_oHeaderFooterWriter.m_aHeaders.size(); ++i)
 				{
 					Writers::HdrFtrItem* pHeader = m_oFileWriter.m_oHeaderFooterWriter.m_aHeaders[i];
 					if(false == pHeader->IsEmpty())
@@ -7451,7 +7454,7 @@ public: BinaryFileReader(std::wstring& sFileInDir, NSBinPptxRW::CBinaryFileReade
                         pHeader->rId = L"rId" + std::to_wstring( rId );
 					}
 				}
-				for(int i = 0, length = m_oFileWriter.m_oHeaderFooterWriter.m_aFooters.size(); i < length; ++i)
+				for(size_t i = 0; i < m_oFileWriter.m_oHeaderFooterWriter.m_aFooters.size(); ++i)
 				{
 					Writers::HdrFtrItem* pFooter = m_oFileWriter.m_oHeaderFooterWriter.m_aFooters[i];
 					if(false == pFooter->IsEmpty())

ASCOfficeDocxFile2/BinReader/SettingWriter.h

@@ -72,13 +72,13 @@ namespace Writers
 			if(BinDocxRW::g_nCurFormatVersion < 5)
 			{
 				bool bevenAndOddHeaders = false;
-				for(int i = 0, length = m_oHeaderFooterWriter.m_aHeaders.size(); i < length; ++i)
+				for(size_t i = 0, length = m_oHeaderFooterWriter.m_aHeaders.size(); i < length; ++i)
 				{
 					HdrFtrItem* pHeader = m_oHeaderFooterWriter.m_aHeaders[i];
 					if(SimpleTypes::hdrftrEven == pHeader->eType)
 						bevenAndOddHeaders = true;
 				}
-				for(int i = 0, length = m_oHeaderFooterWriter.m_aFooters.size(); i < length; ++i)
+				for(size_t i = 0, length = m_oHeaderFooterWriter.m_aFooters.size(); i < length; ++i)
 				{
 					HdrFtrItem* pFooter = m_oHeaderFooterWriter.m_aFooters[i];
 					if(SimpleTypes::hdrftrEven == pFooter->eType)

ASCOfficeDocxFile2/BinReader/fontTableWriter.h

@@ -121,15 +121,12 @@ namespace Writers
 				CFontInfo* pFontInfo = m_pFontManager->GetFontInfoByParams(oFontSelectFormat);
 				if(NULL != pFontInfo)
 				{
-					for(int i = 0; i < 10; ++i)
+					for (size_t i = 0; i < 10; ++i)
 					{
 						BYTE cElem = pFontInfo->m_aPanose[i];
 						if(0 != cElem)
 							bUsePanose = true;
-						if(cElem > 0xF)
-                            sPanose += XmlUtils::IntToString(cElem, L"%X");
-						else
-                            sPanose+= XmlUtils::IntToString(cElem, L"0%X");
+                        sPanose += XmlUtils::IntToString(cElem, L"%02X");
 					}
 					
 				}

ASCOfficeDocxFile2/BinWriter/BinEquationWriter.h

@@ -117,11 +117,11 @@ namespace MathEquation
 			}
 			LONG GetSize()
 			{
-				return arrRun.size();
+				return (LONG)arrRun.size();
 			}			
 			bool GetElem (LONG lPos, EquationRun &oRun)
 			{
-				if (lPos < arrRun.size() )
+				if (lPos < (LONG)arrRun.size() )
 				{
 					oRun = arrRun[lPos];
 					return true;

ASCOfficeDocxFile2/BinWriter/BinWriters.cpp

@@ -61,7 +61,7 @@ namespace BinDocxRW
 	void BinaryHeaderFooterTableWriter::WriteHdrFtrContent(std::vector<OOX::CHdrFtr*>& aHdrFtrs, std::vector<SimpleTypes::EHdrFtr>& aHdrFtrTypes, std::vector<OOX::Logic::CSectionProperty*>& aHdrSectPrs, bool bHdr)
 	{
 		int nCurPos = 0;
-		for(int i = 0, length = aHdrFtrs.size(); i < length; ++i)
+		for(size_t i = 0; i < aHdrFtrs.size(); ++i)
 		{
 			OOX::CHdrFtr* pHdrFtr = aHdrFtrs[i];
 			SimpleTypes::EHdrFtr eType = aHdrFtrTypes[i];

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -149,8 +149,8 @@ namespace BinDocxRW
 				switch(border.m_oVal.get().GetValue())
 				{
 				case SimpleTypes::bordervalueNone:
-				case SimpleTypes::bordervalueNil:m_oStream.WriteBYTE(border_None);break;
-				default:m_oStream.WriteBYTE(border_Single);break;
+                case SimpleTypes::bordervalueNil:   m_oStream.WriteBYTE(border_None);   break;
+                default:                            m_oStream.WriteBYTE(border_Single); break;
 				}
 
 			}
@@ -306,8 +306,8 @@ namespace BinDocxRW
 				m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
 				switch(Shd.m_oVal.get().GetValue())
 				{
-				case SimpleTypes::shdNil: m_oStream.WriteBYTE(shd_Nil);break;
-				default: m_oStream.WriteBYTE(shd_Clear);break;
+                case SimpleTypes::shdNil:   m_oStream.WriteBYTE(shd_Nil);break;
+                default:                    m_oStream.WriteBYTE(shd_Clear);break;
 				}
 			}
 			//Value
@@ -538,7 +538,9 @@ namespace BinDocxRW
 						case SimpleTypes::themeMinorBidi:
 						case SimpleTypes::themeMinorEastAsia:
 						case SimpleTypes::themeMinorHAnsi:sFontAscii = m_poTheme->GetMinorFont();break;
-						}
+                        default:
+                            break;
+                        }
 					}
 					else if(oFont.m_sAscii.IsInit())
 							sFontAscii = oFont.m_sAscii.get();
@@ -556,7 +558,9 @@ namespace BinDocxRW
 						case SimpleTypes::themeMinorBidi:
 						case SimpleTypes::themeMinorEastAsia:
 						case SimpleTypes::themeMinorHAnsi:sFontHAnsi = m_poTheme->GetMinorFont();break;
-						}
+                        default:
+                            break;
+                        }
 					}
 					else if(oFont.m_sHAnsi.IsInit())
 						sFontHAnsi = oFont.m_sHAnsi.get();
@@ -573,7 +577,8 @@ namespace BinDocxRW
 						case SimpleTypes::themeMinorBidi:
 						case SimpleTypes::themeMinorEastAsia:
 						case SimpleTypes::themeMinorHAnsi:sFontCS = m_poTheme->GetMinorFont();break;
-						}
+                        default: break;
+                        }
 					}
 					else if(oFont.m_sCs.IsInit())
 						sFontCS = oFont.m_sCs.get();
@@ -590,7 +595,8 @@ namespace BinDocxRW
 						case SimpleTypes::themeMinorBidi:
 						case SimpleTypes::themeMinorEastAsia:
 						case SimpleTypes::themeMinorHAnsi:sFontAE = m_poTheme->GetMinorFont();break;
-						}
+                        default: break;
+                        }
 					}
 					else if(oFont.m_sEastAsia.IsInit())
 						sFontAE = oFont.m_sEastAsia.get();
@@ -774,28 +780,22 @@ namespace BinDocxRW
 					m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
 					m_oBcw.m_oStream.WriteBOOL(rPr.m_oVanish->m_oVal.ToBool());
 				}
-				if (false != rPr.m_sTextOutline.IsInit())
+				if (false != rPr.m_oTextOutline.IsInit())
 				{
-                    std::wstring sTextOutline = rPr.m_sTextOutline.get2();
-					//делаем replace потому что читать имена node без namespace можем а атрибуты нет, потому что храним их в map
-                    XmlUtils::replace_all(sTextOutline, L"w14:", L"");
-
-                    m_oBcw.m_oStream.WriteBYTE(c_oSerProp_rPrType::TextOutline);
+					m_oBcw.m_oStream.WriteBYTE(c_oSerProp_rPrType::TextOutline);
 					m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Variable);
 					int nCurPos = m_oBcw.WriteItemWithLengthStart();
-					m_pOfficeDrawingConverter->GetRecordBinary(XMLWRITER_RECORD_TYPE_TEXT_OUTLINE, sTextOutline);
+					
+					m_oBcw.m_oStream.WriteRecord2(0, rPr.m_oTextOutline);
 					m_oBcw.WriteItemWithLengthEnd(nCurPos);
 				}
-				if (false != rPr.m_sTextFill.IsInit())
+				if (rPr.m_oTextFill.getType() != OOX::et_Unknown)
 				{
-                    std::wstring sTextFill = rPr.m_sTextFill.get2();
-					//делаем replace потому что читать имена node без namespace можем а атрибуты нет, потому что храним их в map
-                    XmlUtils::replace_all(sTextFill, L"w14:", L"");
-
                     m_oBcw.m_oStream.WriteBYTE(c_oSerProp_rPrType::TextFill);
 					m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Variable);
 					int nCurPos = m_oBcw.WriteItemWithLengthStart();
-					m_pOfficeDrawingConverter->GetRecordBinary(XMLWRITER_RECORD_TYPE_TEXT_FILL, sTextFill);
+					
+					m_oBcw.m_oStream.WriteRecord1(0, rPr.m_oTextFill);
 					m_oBcw.WriteItemWithLengthEnd(nCurPos);
 				}
 				if(rPr.m_oDel.IsInit())
@@ -1119,7 +1119,7 @@ namespace BinDocxRW
 			{
 				int nCurPos = 0;
 		//Len
-				for(int i = 0, length = Tab.m_arrTabs.size(); i < length; ++i)
+				for(size_t i = 0, length = Tab.m_arrTabs.size(); i < length; ++i)
 				{
 					const ComplexTypes::Word::CTabStop& tabItem = *Tab.m_arrTabs[i];
 					m_oBcw.m_oStream.WriteBYTE(c_oSerProp_pPrType::Tab_Item);
@@ -1394,7 +1394,8 @@ namespace BinDocxRW
 						{
 						case SimpleTypes::pageorientPortrait: Orientation = orientation_Portrait;break;
 						case SimpleTypes::pageorientLandscape: Orientation = orientation_Landscape;break;
-						}
+                        default: break;
+                        }
 					}
 				}
 		//W
@@ -1468,7 +1469,7 @@ namespace BinDocxRW
 			void WriteHeaderFooter(OOX::Logic::CSectionProperty* pSectPr, std::vector<ComplexTypes::Word::CHdrFtrRef*>& aRefs, bool bHdr)
 			{
 				int nCurPos = 0;
-				for(int i = 0, length = aRefs.size(); i < length; ++i)
+				for(size_t i = 0, length = aRefs.size(); i < length; ++i)
 				{
 					const ComplexTypes::Word::CHdrFtrRef& oRef = *aRefs[i];
 					if( oRef.m_oType.IsInit() && oRef.m_oId.IsInit())
@@ -1480,14 +1481,14 @@ namespace BinDocxRW
 							OOX::CHdrFtr* pHdrFtr = (OOX::CHdrFtr*)oFile.operator->();
 							if(bHdr)
 							{
-								nIndex = m_oBinaryHeaderFooterTableWriter->m_aHeaders.size();
+								nIndex = (int)m_oBinaryHeaderFooterTableWriter->m_aHeaders.size();
 								m_oBinaryHeaderFooterTableWriter->m_aHeaders.push_back(pHdrFtr);
 								m_oBinaryHeaderFooterTableWriter->m_aHeaderTypes.push_back(oRef.m_oType->GetValue());
 								m_oBinaryHeaderFooterTableWriter->m_aHeaderSectPrs.push_back(pSectPr);
 							}
 							else
 							{
-								nIndex = m_oBinaryHeaderFooterTableWriter->m_aFooters.size();
+								nIndex = (int)m_oBinaryHeaderFooterTableWriter->m_aFooters.size();
 								m_oBinaryHeaderFooterTableWriter->m_aFooters.push_back(pHdrFtr);
 								m_oBinaryHeaderFooterTableWriter->m_aFooterTypes.push_back(oRef.m_oType->GetValue());
 								m_oBinaryHeaderFooterTableWriter->m_aFooterSectPrs.push_back(pSectPr);
@@ -1548,7 +1549,7 @@ namespace BinDocxRW
 					m_oBcw.m_oStream.WriteLONG(columns.m_oSpace->ToTwips());
 					m_oBcw.WriteItemWithLengthEnd(nCurPos);
 				}
-				for(int i = 0; i < columns.m_arrColumns.size(); ++i)
+				for(size_t i = 0; i < columns.m_arrColumns.size(); ++i)
 				{
 					nCurPos = m_oBcw.WriteItemStart(c_oSerProp_Columns::Column);
 					WriteColumn(*columns.m_arrColumns[i]);
@@ -2398,7 +2399,7 @@ namespace BinDocxRW
 		void WriteStyles(std::vector<OOX::CStyle*>& styles)
 		{
 			int nCurPos = 0;
-			for(int i = 0, length = styles.size(); i < length; ++i)
+			for(size_t i = 0, length = styles.size(); i < length; ++i)
 			{
 				const OOX::CStyle& style = *styles[i];
 				if(false != style.m_sStyleId.IsInit())
@@ -2541,7 +2542,7 @@ namespace BinDocxRW
 		void WriteTblStylePr(const std::vector<OOX::Logic::CTableStyleProperties*>& aProperties)
 		{
 			int nCurPos = 0;
-			for(int i = 0, length = aProperties.size(); i < length; ++i)
+			for(size_t i = 0, length = aProperties.size(); i < length; ++i)
 			{
 				nCurPos = m_oBcw.WriteItemStart(c_oSerProp_tblStylePrType::TblStylePr);
 				WriteTblStyleProperties(*aProperties[i]);
@@ -2628,7 +2629,8 @@ namespace BinDocxRW
 		void WriteNums(const OOX::CNumbering& numbering)
 		{
 			int nCurPos = 0;
-			for(int i = 0, length = numbering.m_arrNum.size(); i < length; ++i)
+			
+			for(size_t i = 0, length = numbering.m_arrNum.size(); i < length; ++i)
 			{
 				const OOX::Numbering::CNum& num = *numbering.m_arrNum[i];
 				//num
@@ -2657,7 +2659,8 @@ namespace BinDocxRW
 		{
 			int nCurPos = 0;
 			int nRealCount = 0;
-			for(int i = 0, length = numbering.m_arrAbstractNum.size(); i < length; ++i)
+			
+			for(size_t i = 0, length = numbering.m_arrAbstractNum.size(); i < length; ++i)
 			{
 				const OOX::Numbering::CAbstractNum& num = *numbering.m_arrAbstractNum[i];
 				if(false != num.m_oAbstractNumId.IsInit())
@@ -2711,10 +2714,11 @@ namespace BinDocxRW
 		void WriteLevels(const std::vector<OOX::Numbering::CLvl*>& lvls, int nAId, const std::vector<OOX::Numbering::CNum*>& aNums)
 		{
 			int nCurPos = 0;
-			for(int i = 0, length = lvls.size(); i < length; ++i)
+			
+			for(size_t i = 0, length = lvls.size(); i < length; ++i)
 			{
 				nCurPos = m_oBcw.WriteItemStart(c_oSerNumTypes::Lvl);
-				WriteLevel(*lvls[i], i, nAId, aNums);
+				WriteLevel(*lvls[i], (int)i, nAId, aNums);
 				m_oBcw.WriteItemEnd(nCurPos);
 			}
 		}
@@ -2855,7 +2859,7 @@ namespace BinDocxRW
         void WriteLevelText(const std::wstring& text)
 		{
 			int nCurPos = 0;
-            for(int i = 0, length = text.length(); i < length; ++i)
+            for(size_t i = 0, length = text.length(); i < length; ++i)
 			{
 				if('%' == text[i] && i + 1 < length && '0' <= text[i + 1] && text[i + 1] <= '9')
 				{
@@ -2977,7 +2981,7 @@ namespace BinDocxRW
 		}
 		~BinaryDocumentTableWriter()
 		{
-			for(int i = 0, length = m_aFldChars.size(); i < length; ++i)
+			for(size_t i = 0, length = m_aFldChars.size(); i < length; ++i)
 			{
 				RELEASEOBJECT(m_aFldChars[i]);
 			}
@@ -2985,7 +2989,8 @@ namespace BinDocxRW
         void prepareOfficeDrawingConverter(NSBinPptxRW::CDrawingConverter* pOfficeDrawingConverter, std::wstring& sDocumentPath, std::vector<std::wstring>& aShapeTypes)
 		{
 			pOfficeDrawingConverter->SetRelsPath(sDocumentPath);
-			for(int i = 0, length = aShapeTypes.size(); i < length; ++i)
+			
+			for(size_t i = 0, length = aShapeTypes.size(); i < length; ++i)
 			{
                 std::wstring& sShapeType = aShapeTypes[i];
 				pOfficeDrawingConverter->AddShapeType(sShapeType);
@@ -3045,6 +3050,8 @@ namespace BinDocxRW
 						OOX::Logic::CBdo* pBdo = static_cast<OOX::Logic::CBdo*>(item);
 						WriteDocumentContent(pBdo->m_arrItems);
 					}break;
+                default:
+                    break;
 				}
 			}
 	//SectPr  & Background
@@ -3125,9 +3132,10 @@ namespace BinDocxRW
 
             FldStruct* pRes = NULL;
 			int nIndex = 0;
-            if(-1 != (nIndex = sFldCopy.find(_T("TOC"))))
+            
+			if(-1 != (nIndex = (int)sFldCopy.find(_T("TOC"))))
 				pRes = new FldStruct(sFldCopy, fieldstruct_toc);
-            else if(-1 != (nIndex = sFldCopy.find(_T("HYPERLINK"))))
+            else if(-1 != (nIndex = (int)sFldCopy.find(_T("HYPERLINK"))))
 				pRes = new FldStruct(sFldCopy, fieldstruct_hyperlink);
 			else
 				pRes = new FldStruct(sFldCopy, fieldstruct_none);
@@ -3136,7 +3144,7 @@ namespace BinDocxRW
 		void WriteParagraphContent(const std::vector<OOX::WritingElement *>& Content, bool bHyperlink = false)
 		{
 			int nCurPos = 0;
-			for ( int i = 0, length = Content.size(); i < length; ++i )
+			for ( size_t i = 0, length = Content.size(); i < length; ++i )
 			{
 				OOX::WritingElement* item = Content[i];
 				switch (item->getType())
@@ -3231,6 +3239,8 @@ namespace BinDocxRW
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
 					}
+                default:
+                    break;
 				}
 			}
 		}
@@ -3263,7 +3273,9 @@ namespace BinDocxRW
 				case OOX::et_w_commentRangeEnd:		nCurPos = m_oBcw.WriteItemStart(c_oSerParType::CommentEnd);		break;
 
 				case OOX::et_w_commentReference:	nCurPos = m_oBcw.WriteItemStart(c_oSerRunType::CommentReference);break;
-				}
+                default:
+                    break;
+                }
 
 				int nCurPos2 = m_oBcw.WriteItemStart(c_oSer_CommentsType::Id);
 				m_oBcw.m_oStream.WriteLONG(oId->GetValue());
@@ -3375,7 +3387,7 @@ namespace BinDocxRW
 		{
 			int nCurPos			= 0;
 			int nIndexStart		= 0;
-			int nLength			= pRun->m_arrItems.size();
+			int nLength			= (int)pRun->m_arrItems.size();
 			bool bWasText		= false;
 			int nRecordType		= 0;
 			
@@ -3415,7 +3427,7 @@ namespace BinDocxRW
 		}
 		void WriteMathArgNodes(const std::vector<OOX::WritingElement*>& m_arrItems)
 		{
-			for(int i = 0; i< m_arrItems.size(); ++i)
+			for(size_t i = 0; i< m_arrItems.size(); ++i)
 			{
 				OOX::WritingElement* item = m_arrItems[i];
 				OOX::EElementType eType = item->getType();
@@ -3583,7 +3595,7 @@ namespace BinDocxRW
 						nCurPos = m_oBcw.WriteItemStart(c_oSer_OMathContentType::Matrix);
 
 						LONG lCol = 0; 
-						for ( int j = 0; j < pMatrix->m_arrItems.size(); j++) //TODO убрать, тк при отсутствии m:mcs, к-во столбцов должно разруливаться динамически в скрипте
+						for ( size_t j = 0; j < pMatrix->m_arrItems.size(); j++) //TODO убрать, тк при отсутствии m:mcs, к-во столбцов должно разруливаться динамически в скрипте
 						{
 							OOX::WritingElement* item = pMatrix->m_arrItems[j];
 							if (item->getType() == OOX::et_m_mr)
@@ -3733,6 +3745,8 @@ namespace BinDocxRW
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
 					}
+                default:
+                    break;
 				}
 			}
 		}
@@ -3800,7 +3814,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pAln.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pAln.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -3811,7 +3825,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pAlnScr.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pAlnScr.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4017,7 +4031,7 @@ namespace BinDocxRW
 		}
 		void WriteMathDelimiter(const std::vector<OOX::WritingElement*>& m_arrItems, LONG &lColumn)
 		{
-			for(int i = 0; i< m_arrItems.size(); ++i)
+			for(size_t i = 0; i< m_arrItems.size(); ++i)
 			{
 				OOX::WritingElement* item = m_arrItems[i];
 				OOX::EElementType eType = item->getType();
@@ -4057,6 +4071,8 @@ namespace BinDocxRW
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
 					}
+                default:
+                    break;
 				}
 			}
 		}
@@ -4073,7 +4089,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pDegHide.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pDegHide.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4090,7 +4106,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pDiff.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pDiff.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4134,7 +4150,7 @@ namespace BinDocxRW
 		}
 		void WriteMathEqArr(const std::vector<OOX::WritingElement*>& m_arrItems, LONG& lRow)
 		{
-			for(int i = 0; i< m_arrItems.size(); ++i)
+			for(size_t i = 0; i< m_arrItems.size(); ++i)
 			{
 				OOX::WritingElement* item = m_arrItems[i];
 				OOX::EElementType eType = item->getType();
@@ -4174,7 +4190,9 @@ namespace BinDocxRW
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
 					}
-				}
+                default:
+                    break;
+                }
 			}
 		}
 		void WriteMathFName(const OOX::Logic::CFName &pFName)
@@ -4225,7 +4243,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pGrow.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pGrow.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4236,7 +4254,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pHideBot.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pHideBot.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4247,7 +4265,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pHideLeft.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pHideLeft.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4258,7 +4276,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pHideRight.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pHideRight.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4269,7 +4287,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pHideTop.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pHideTop.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4348,7 +4366,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pLit.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pLit.m_val->ToBool());
 			}
 			else
 			{
@@ -4361,7 +4379,7 @@ namespace BinDocxRW
 		void WriteMathMatrix(const std::vector<OOX::WritingElement*>& m_arrItems, LONG &lRow, LONG &lCol)
 		{
             bool bColumn = false;
-			for(int i = 0; i< m_arrItems.size(); ++i)
+			for(size_t i = 0; i< m_arrItems.size(); ++i)
 			{
 				OOX::WritingElement* item = m_arrItems[i];
 				OOX::EElementType eType = item->getType();
@@ -4409,7 +4427,9 @@ namespace BinDocxRW
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
 					}
-				}
+                default:
+                    break;
+                }
 			}
 		}
 		void WriteMathMaxDist(const OOX::Logic::CMaxDist &pMaxDist)
@@ -4419,7 +4439,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pMaxDist.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pMaxDist.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4458,7 +4478,7 @@ namespace BinDocxRW
 		{
 			int nCurPos = m_oBcw.WriteItemStart(c_oSer_OMathBottomNodesType::Mcs);
 
-			for(int i = 0; i< pMcs.m_arrItems.size(); ++i)
+			for(size_t i = 0; i< pMcs.m_arrItems.size(); ++i)
 			{			
 				OOX::WritingElement* item = pMcs.m_arrItems[i];
 				OOX::EElementType eType = item->getType();
@@ -4520,7 +4540,7 @@ namespace BinDocxRW
 		}		
 		void WriteMathMr(const std::vector<OOX::WritingElement*>& m_arrItems)
 		{
-			for(int i = 0; i< m_arrItems.size(); ++i)
+			for(size_t i = 0; i< m_arrItems.size(); ++i)
 			{
 				OOX::WritingElement* item = m_arrItems[i];
 				OOX::EElementType eType = item->getType();
@@ -4562,7 +4582,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pNoBreak.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pNoBreak.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4572,7 +4592,7 @@ namespace BinDocxRW
 			m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 			m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
 			if (pNor.m_val.IsInit())
-				m_oBcw.m_oStream.WriteBOOL(pNor.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pNor.m_val->ToBool());
 			else 
 				m_oBcw.m_oStream.WriteBOOL(true);
 			m_oBcw.WriteItemEnd(nCurPos);
@@ -4590,7 +4610,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pObjDist.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pObjDist.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4602,7 +4622,7 @@ namespace BinDocxRW
 		}
 		void WriteMathOMathPara(const std::vector<OOX::WritingElement*>& m_arrItems)
 		{
-			for(int i = 0; i< m_arrItems.size(); ++i)
+			for(size_t i = 0; i< m_arrItems.size(); ++i)
 			{
 				OOX::WritingElement* item = m_arrItems[i];
 				OOX::EElementType eType = item->getType();
@@ -4648,7 +4668,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pOpEmu.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pOpEmu.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4678,7 +4698,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pPlcHide.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pPlcHide.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4774,7 +4794,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pShow.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pShow.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4834,7 +4854,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pStrikeBLTR.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pStrikeBLTR.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4845,7 +4865,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pStrikeH.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pStrikeH.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4856,7 +4876,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pStrikeTLBR.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pStrikeTLBR.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4867,7 +4887,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pStrikeV.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pStrikeV.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4895,7 +4915,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pSubHide.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pSubHide.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4912,7 +4932,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pSupHide.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pSupHide.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4957,7 +4977,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pTransp.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pTransp.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -4990,7 +5010,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pZeroAsc.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pZeroAsc.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -5001,7 +5021,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pZeroDesc.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pZeroDesc.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -5012,7 +5032,7 @@ namespace BinDocxRW
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-				m_oBcw.m_oStream.WriteBOOL(pZeroWid.m_val->GetValue());
+				m_oBcw.m_oStream.WriteBOOL(pZeroWid.m_val->ToBool());
 			}
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
@@ -5029,17 +5049,19 @@ namespace BinDocxRW
 				if(false == bHyperlink)
 				{
 					//Случай если Hyperlink задан как field
-					for(int i = 0, length = m_aFldChars.size(); i < length; ++i)
+					for(size_t i = 0, length = m_aFldChars.size(); i < length; ++i)
+					{
 						if(fieldstruct_hyperlink == m_aFldChars[i]->GetType())
 						{
 							bHyperlink = true;
 							break;
 						}
+					}
 				}
 				if(bHyperlink)
 				{
 					bool bInTOC = false;
-					for(int i = 0, length = m_aFldChars.size(); i < length; ++i)
+					for(size_t i = 0, length = m_aFldChars.size(); i < length; ++i)
 					{
 						if(fieldstruct_toc == m_aFldChars[i]->GetType())
 						{
@@ -5067,7 +5089,7 @@ namespace BinDocxRW
 				}
 			}
 	//Если первый элемент символ надо выставить в его настройки шрифт
-			if(nIndexStart < pRun->m_arrItems.size() && OOX::et_w_sym == pRun->m_arrItems[nIndexStart]->getType())
+			if(nIndexStart < (int)pRun->m_arrItems.size() && OOX::et_w_sym == pRun->m_arrItems[nIndexStart]->getType())
 			{
 				OOX::Logic::CSym* oSym = static_cast<OOX::Logic::CSym*>(pRun->m_arrItems[nIndexStart]);
 				if(oSym->m_oFont.IsInit())
@@ -5116,7 +5138,9 @@ namespace BinDocxRW
 						case SimpleTypes::brtypeColumn:			nBreakType = c_oSerRunType::columnbreak;	break;
 						case SimpleTypes::brtypePage:			nBreakType = c_oSerRunType::pagebreak;		break;
 						case SimpleTypes::brtypeTextWrapping:	nBreakType = c_oSerRunType::linebreak;		break;
-						}
+                        default:
+                            break;
+                        }
 						if(-1 != nBreakType)
 						{
 							m_oBcw.m_oStream.WriteBYTE(nBreakType);
@@ -5152,7 +5176,7 @@ namespace BinDocxRW
 								m_eFldState = SimpleTypes::fldchartypeEnd;
 								if(m_aFldChars.size() > 0)
 								{
-									int nIndex = m_aFldChars.size() - 1;
+									int nIndex = (int)m_aFldChars.size() - 1;
 									FldStruct* pFldStruct = m_aFldChars[nIndex];
 									RELEASEOBJECT(pFldStruct);
 									m_aFldChars.erase(m_aFldChars.begin() + nIndex);
@@ -5344,6 +5368,8 @@ namespace BinDocxRW
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
 					}
+                default:
+                    break;
 				}
 			}
 		}
@@ -5432,7 +5458,7 @@ namespace BinDocxRW
 				OOX::Drawing::CChart* pChart = NULL;
 				if(NULL != pGraphic)
 				{
-					for(int i = 0; i < pGraphic->m_arrItems.size(); i++)
+					for(size_t i = 0; i < pGraphic->m_arrItems.size(); i++)
 					{
 						OOX::WritingElement* we = pGraphic->m_arrItems[i];
 						if(OOX::et_c_chart == we->getType())
@@ -5625,7 +5651,7 @@ namespace BinDocxRW
 					{
 						m_oBcw.m_oStream.WriteBYTE(c_oSerImageType2::RelativeHeight);
 						m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Long);
-						m_oBcw.m_oStream.WriteLONG(pAnchor.m_oRelativeHeight->GetValue());
+						m_oBcw.m_oStream.WriteULONG(pAnchor.m_oRelativeHeight->GetValue());
 					}
 					if(pAnchor.m_bSimplePos.IsInit())
 					{
@@ -6107,7 +6133,7 @@ namespace BinDocxRW
 		void WriteLineTo(const std::vector<ComplexTypes::Drawing::CPoint2D*>& aLineTo)
 		{
 			int nCurPos = 0;
-			for(int i = 0, length = aLineTo.size(); i < length; ++i)
+			for(size_t i = 0, length = aLineTo.size(); i < length; ++i)
 			{
 				m_oBcw.m_oStream.WriteBYTE(c_oSerWrapPolygon::LineTo);
 				m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Variable);
@@ -6166,7 +6192,7 @@ namespace BinDocxRW
 		{
 	//Проверяем чтобы не все ячейки в ряду были вертикально замержены
 			bool bRes = true;
-			for(int i = 0, length = arrItems.size(); i < length; ++i)
+			for(size_t i = 0, length = arrItems.size(); i < length; ++i)
 			{
 				OOX::WritingElement* item = arrItems[i];
 				if(OOX::et_w_tc == item->getType())
@@ -6212,7 +6238,7 @@ namespace BinDocxRW
 		}
 		void GetTableSize(std::vector<OOX::WritingElement *>& rows, int& nRows, int& nCols, OOX::Logic::CTableProperty** ppTblPr)
 		{
-			for(int i = rows.size() - 1; i >= 0; i--)
+            for(int i = (int)rows.size() - 1; i >= 0; i--)
 			{
 				OOX::WritingElement* item = rows[i];
 				if(OOX::et_w_tblPr == item->getType())
@@ -6264,14 +6290,14 @@ namespace BinDocxRW
 		int GetColsCount(const std::vector<OOX::WritingElement *>& arrItems)
 		{
 			int nColCount = 0;
-			for(int i = 0, length = arrItems.size(); i < length; ++i)
+			for(size_t i = 0, length = arrItems.size(); i < length; ++i)
 			{
 				OOX::WritingElement* item = arrItems[i];
 				if(OOX::et_w_tc == item->getType())
 				{
 					nColCount++;
 					OOX::Logic::CTc* tc = static_cast<OOX::Logic::CTc*>(item);
-					for(int j = 0, length2 = tc->m_arrItems.size(); j < length2; ++j)
+					for(size_t j = 0, length2 = tc->m_arrItems.size(); j < length2; ++j)
 					{
 						OOX::WritingElement* item2 = tc->m_arrItems[j];
 						if(OOX::et_w_tcPr == item2->getType())
@@ -6313,7 +6339,7 @@ namespace BinDocxRW
 		void WriteTblGrid(const OOX::Logic::CTblGrid& grid)
 		{
 			int nCurPos = 0;
-			for(int i = 0, length = grid.m_arrGridCol.size(); i < length; i++)
+			for(size_t i = 0, length = grid.m_arrGridCol.size(); i < length; i++)
 			{
 				const ComplexTypes::Word::CTblGridCol& item = *grid.m_arrGridCol[i];
 				if(item.m_oW.IsInit())
@@ -6355,7 +6381,7 @@ namespace BinDocxRW
 			int nCurPos			= 0;
 			int nCurRowIndex	= 0;
 			
-			for(int i = 0, length = Content.size(); i < length; ++i)
+			for(size_t i = 0, length = Content.size(); i < length; ++i)
 			{
 				OOX::WritingElement* item = Content[i];
 				if(OOX::et_w_tr == item->getType())
@@ -6410,7 +6436,7 @@ namespace BinDocxRW
 			int nCurPos = 0;
 			int nCurColIndex = 0;
 			
-			for(int i = 0, length = Content.size(); i < length; i++)
+			for(size_t i = 0, length = Content.size(); i < length; i++)
 			{
 				OOX::WritingElement* item = Content[i];
 				
@@ -6495,7 +6521,7 @@ namespace BinDocxRW
 			//map author -> userId
 			if(NULL != pPeople)
 			{
-				for(int i = 0, length = pPeople->m_arrPeoples.size(); i < length; i++)
+				for(size_t i = 0, length = pPeople->m_arrPeoples.size(); i < length; i++)
 				{
 					OOX::CPerson* pPerson = pPeople->m_arrPeoples[i];
 					if(NULL != pPerson && pPerson->m_oAuthor.IsInit() && pPerson->m_oPresenceInfo.IsInit() && pPerson->m_oPresenceInfo->m_oProviderId.IsInit() && _T("Teamlab") == pPerson->m_oPresenceInfo->m_oProviderId.get2() && pPerson->m_oPresenceInfo->m_oUserId.IsInit())
@@ -6503,7 +6529,7 @@ namespace BinDocxRW
 				}
 			}
 			//map paraId -> CCommentWriteTemp
-			for(int i = 0, length = oComments.m_arrComments.size(); i < length; ++i)
+			for(size_t i = 0, length = oComments.m_arrComments.size(); i < length; ++i)
 			{
 				OOX::CComment* pComment = oComments.m_arrComments[i];
 				CCommentWriteTemp* pNewCommentWriteTemp = new CCommentWriteTemp();
@@ -6514,7 +6540,7 @@ namespace BinDocxRW
 					if(mapAuthorToUserId.end() != pPair)
 						pNewCommentWriteTemp->sUserId = pPair->second;
 				}
-				for(int j = 0, length2 = pComment->m_arrItems.size(); j < length2; j++)
+				for(size_t j = 0, length2 = pComment->m_arrItems.size(); j < length2; j++)
 				{
 					OOX::WritingElement* pWe = pComment->m_arrItems[j];
 					if(OOX::et_w_p == pWe->getType())
@@ -6529,7 +6555,7 @@ namespace BinDocxRW
 			//разбираемся с reply и done
 			if(NULL != pCommentsExt)
 			{
-				for(int i = 0, length = pCommentsExt->m_arrComments.size(); i < length; i++)
+				for(size_t i = 0, length = pCommentsExt->m_arrComments.size(); i < length; i++)
 				{
 					OOX::CCommentExt* pCommentExt = pCommentsExt->m_arrComments[i];
 					if(pCommentExt->m_oParaId.IsInit())
@@ -6559,7 +6585,7 @@ namespace BinDocxRW
 			}
 			int nCurPos = 0;
 
-			for(int i = 0, length = aCommentsToWrite.size(); i < length; ++i)
+			for(size_t i = 0, length = aCommentsToWrite.size(); i < length; ++i)
 			{
 				CCommentWriteTemp* pCommentWriteTemp = aCommentsToWrite[i];
 				if(NULL != pCommentWriteTemp && NULL != pCommentWriteTemp->pComment && pCommentWriteTemp->pComment->m_oId.IsInit() && mapIgnoreComments.end() == mapIgnoreComments.find(pCommentWriteTemp->pComment->m_oId->GetValue()))
@@ -6570,7 +6596,7 @@ namespace BinDocxRW
 				}
 			}
 
-			for(int i = 0, length = aCommentsToWrite.size(); i < length; ++i)
+			for(size_t i = 0, length = aCommentsToWrite.size(); i < length; ++i)
 				delete aCommentsToWrite[i];
 		};
 		void WriteComment(CCommentWriteTemp& oComment)
@@ -6626,7 +6652,7 @@ namespace BinDocxRW
 		void WriteReplies(std::vector<CCommentWriteTemp*>& aCommentWriteTemp)
 		{
 			int nCurPos = 0;
-			for(int i = 0, length = aCommentWriteTemp.size(); i < length; i++)
+			for(size_t i = 0, length = aCommentWriteTemp.size(); i < length; i++)
 			{
 				nCurPos = m_oBcw.WriteItemStart(c_oSer_CommentsType::Comment);
 				WriteComment(*aCommentWriteTemp[i]);
@@ -6692,7 +6718,7 @@ namespace BinDocxRW
 		};
 		void WriteMathPr(const OOX::Logic::CMathPr &pMathPr)
 		{
-			for(int i = 0; i< pMathPr.m_arrItems.size(); ++i)
+			for(size_t i = 0; i< pMathPr.m_arrItems.size(); ++i)
 			{
 				OOX::WritingElement* item = pMathPr.m_arrItems[i];
 				OOX::EElementType eType = item->getType();
@@ -6745,7 +6771,7 @@ namespace BinDocxRW
 						{
 							m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 							m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-							m_oBcw.m_oStream.WriteBOOL(pDispDef->m_val->GetValue());
+							m_oBcw.m_oStream.WriteBOOL(pDispDef->m_val->ToBool());
 						}
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
@@ -6875,7 +6901,7 @@ namespace BinDocxRW
 						{
 							m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 							m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-							m_oBcw.m_oStream.WriteBOOL(pSmallFrac->m_val->GetValue());
+							m_oBcw.m_oStream.WriteBOOL(pSmallFrac->m_val->ToBool());
 						}
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
@@ -6901,12 +6927,14 @@ namespace BinDocxRW
 						{
 							m_oBcw.m_oStream.WriteBYTE(c_oSer_OMathBottomNodesValType::Val);
 							m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
-							m_oBcw.m_oStream.WriteBOOL(pWrapRight->m_val->GetValue());
+							m_oBcw.m_oStream.WriteBOOL(pWrapRight->m_val->ToBool());
 						}
 						m_oBcw.WriteItemEnd(nCurPos);
 						break;
 					}
-				}
+                default:
+                    break;
+                }
 			}			
 		}
 		void WriteColorSchemeMapping(const OOX::Settings::CColorSchemeMapping& oColorSchemeMapping)
@@ -7241,7 +7269,7 @@ namespace BinDocxRW
 				if(NULL != pParagraph)
 				{
 					OOX::Logic::CParagraphProperty* pPr = NULL;
-					for(int i = 0, length = pParagraph->m_arrItems.size(); i < length; ++i)
+					for(size_t i = 0, length = pParagraph->m_arrItems.size(); i < length; ++i)
 					{
 						OOX::WritingElement* we = pParagraph->m_arrItems[i];
 						if(OOX::et_w_pPr == we->getType())

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp

@@ -61,7 +61,7 @@ bool BinDocxRW::CDocxSerializer::ConvertDocxToDoct(const std::wstring& sSrcFileN
 
     if(S_OK == oCOfficeUtils.ExtractToDirectory(sSrcFileName, strDirSrc, NULL, 0))
 		if(saveToFile(strEditorBin, strDirSrc, sXMLOptions))
-            if(S_OK == oCOfficeUtils.CompressFileOrDirectory(strDirDst, sDstFileName, -1))
+            if(S_OK == oCOfficeUtils.CompressFileOrDirectory(strDirDst, sDstFileName))
 				return true;
 	return false;
 }
@@ -88,7 +88,7 @@ bool BinDocxRW::CDocxSerializer::ConvertDoctToDocx(const std::wstring& sSrcFileN
 
         if(loadFromFile(sEditorBin, strDirDst, sXMLOptions, sThemePath, sMediaPath, sEmbedPath))
         {
-            if(S_OK == oCOfficeUtils.CompressFileOrDirectory(strDirDst, sDstFileName, -1))
+            if(S_OK == oCOfficeUtils.CompressFileOrDirectory(strDirDst, sDstFileName, true))
 				return true;
         }
     }
@@ -219,7 +219,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 		//проверяем формат
 		bool bValidFormat = false;
         std::wstring sSignature(g_sFormatSignature);
-        int nSigLength = sSignature.length();
+        int nSigLength = (int)sSignature.length();
 		if(nBase64DataSize > nSigLength)
 		{
             std::string sCurSig((char*)pBase64Data, nSigLength);
@@ -263,7 +263,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 			
             if(false != Base64::Base64Decode((const char*)(pBase64Data + nIndex), nBase64DataSize - nIndex, pData, &nDataSize))
 			{
-				NSBinPptxRW::CDrawingConverter oDrawingConverter;
+                NSBinPptxRW::CDrawingConverter oDrawingConverter;
 				NSBinPptxRW::CBinaryFileReader& oBufferedStream = *oDrawingConverter.m_pReader;
 				oBufferedStream.Init(pData, 0, nDataSize);
 

ASCOfficeDocxFile2/DocWrapper/FontProcessor.cpp

@@ -58,7 +58,7 @@ namespace DocWrapper {
 	{
 		//подбор перенесен в js
 		return;
-		for (int i = 0; i < fontTable->m_arrFonts.size(); ++i)
+		for (size_t i = 0; i < fontTable->m_arrFonts.size(); ++i)
 			addToFontMap(*fontTable->m_arrFonts[i]);
 	}
 	

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -85,9 +85,9 @@ namespace BinXlsxRW{
 	}
     bool CXlsxSerializer::loadFromFile(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedDir)
 	{
-		NSBinPptxRW::CDrawingConverter oOfficeDrawingConverter;
-		oOfficeDrawingConverter.SetMediaDstPath(sMediaDir);
-		oOfficeDrawingConverter.SetEmbedDstPath(sEmbedDir);
+        NSBinPptxRW::CDrawingConverter oOfficeDrawingConverter;
+        oOfficeDrawingConverter.SetMediaDstPath(sMediaDir);
+        oOfficeDrawingConverter.SetEmbedDstPath(sEmbedDir);
 
 		//папка с бинарников
 		std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
@@ -95,7 +95,7 @@ namespace BinXlsxRW{
         oOfficeDrawingConverter.SetSourceFileDir(strFileInDir, 2);
 
 		BinXlsxRW::BinaryFileReader oBinaryFileReader;
-		oBinaryFileReader.ReadFile(sSrcFileName, sDstPath, &oOfficeDrawingConverter, sXMLOptions);
+        oBinaryFileReader.ReadFile(sSrcFileName, sDstPath, &oOfficeDrawingConverter, sXMLOptions);
 		return true;
 	}
     bool CXlsxSerializer::saveToFile(const std::wstring& sDstFileName, const std::wstring& sSrcPath, const std::wstring& sXMLOptions)
@@ -176,8 +176,8 @@ namespace BinXlsxRW{
 			std::wstring sThemePath;
 			std::wstring sEmbedingPath;
 			
-            int nIndex	= sFilepath.rfind(FILE_SEPARATOR_CHAR); 
-            nIndex		= sFilepath.rfind(FILE_SEPARATOR_CHAR, nIndex - 1);
+            int nIndex	= (int)sFilepath.rfind(FILE_SEPARATOR_CHAR); 
+            nIndex		= (int)sFilepath.rfind(FILE_SEPARATOR_CHAR, nIndex - 1);
 			if(-1 != nIndex)
 			{
                 std::wstring sFilepathLeft = sFilepath.substr(0, nIndex + 1);
@@ -275,7 +275,7 @@ namespace BinXlsxRW{
 		oXlsx.Write(oPath, sAdditionalContentTypes);
 		//zip
 		COfficeUtils oOfficeUtils(NULL);
-		oOfficeUtils.CompressFileOrDirectory(sTempDir, sDstFile, -1);
+		oOfficeUtils.CompressFileOrDirectory(sTempDir, sDstFile, true);
 		//clean
 		NSDirectory::DeleteDirectory(sTempDir);
 	}

ASCOfficeDocxFile2/DocxFile2.h

@@ -1,185 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-#pragma once
-
-#include "resource.h"       // main symbols
-#include "DocWrapper/DocxSerializer.h"
-
-#if defined(_WIN32_WCE) && !defined(_CE_DCOM) && !defined(_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA)
-#error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms."
-#endif
-
-// IAVSOfficeDocxFile2
-[ object, uuid("98B1ECA8-9575-4eec-B327-8F8BA3FA232C"), dual, pointer_default(unique) ]
-__interface IAVSOfficeDocxFile2: IDispatch
-{
-	[id(1)] HRESULT OpenFile([in] BSTR bsInputDir, [in] BSTR bsFileDst);
-	[id(2)] HRESULT GetJfdoc([in] BSTR bsInputDir, [out] BSTR* bsJfdoc);
-
-	[id(3)] HRESULT SetMediaDir([in] BSTR bsMediaDir);
-	[id(4)] HRESULT SetFontDir([in] BSTR bsFontDir);
-
-	[id(5)] HRESULT SetUseSystemFonts([in] BOOL useSystemFonts);
-	[id(6)] HRESULT GetBinaryContent([in] BSTR bsTxContent, [out, satype("BYTE")] SAFEARRAY** ppBinary);
-
-	[id(10)] HRESULT Write([in] BSTR bstrFileIn, [in] BSTR bstrFileOut);
-	[id(20)] HRESULT GetXmlContent([in, satype("BYTE")] SAFEARRAY* pBinaryObj, [in] LONG lStart, [in] LONG lLength, [out] BSTR* bsXml);
-
-	[id(2000 + 0)] HRESULT SetAdditionalParam([in] BSTR ParamName, [in] VARIANT ParamValue);
-	[id(2001 + 1)] HRESULT GetAdditionalParam([in] BSTR ParamName, [out, retval] VARIANT* ParamValue);
-};
-
-// _IAVSOfficeDocxFile2Events
-[uuid("C3CF75C3-28FE-4b2c-A770-5952ADF4EAC2"), dispinterface]
-__interface _IAVSOfficeDocxFile2Events
-{
-};
-
-// CAVSOfficeDocxFile2
-[ coclass, default(IAVSOfficeDocxFile2), threading(apartment), event_source(com), vi_progid("DocxFile2"), progid("DocxFile2.Rend.1"), version(1.0), uuid("CD07583A-6362-454f-A14E-542AE706FFBC") ]
-class ATL_NO_VTABLE CAVSOfficeDocxFile2 : public IAVSOfficeDocxFile2
-{
-public:
-	__event __interface _IAVSOfficeDocxFile2Events;
-
-private:
-	BinDocxRW::CDocxSerializer m_oCDocxSerializer;
-	IUnknown* m_pThis;
-public:
-	DECLARE_PROTECT_FINAL_CONSTRUCT()
-	
-	CAVSOfficeDocxFile2()
-	{
-		m_pThis = NULL;
-	}
-	~CAVSOfficeDocxFile2()
-	{
-		RELEASEINTERFACE(m_pThis);
-	}
-
-public:
-	STDMETHOD(OpenFile)(BSTR bsInputDir, BSTR bsFileDst)
-	{
-		bool bRes = m_oCDocxSerializer.saveToFile(CString(bsFileDst), CString(bsInputDir), CString(_T("")));
-		return bRes ? S_OK : S_FALSE;
-	}
-	STDMETHOD(GetJfdoc)(BSTR bsInputDir, BSTR* bsJfdoc)
-	{
-		return S_OK;
-	}
-	STDMETHOD(SetMediaDir)(BSTR bsMediaDir)
-	{
-		return S_OK;
-	}
-	STDMETHOD(SetFontDir)(BSTR bsFontDir)
-	{
-		m_oCDocxSerializer.setFontDir(CString(bsFontDir));
-		return S_OK;
-	}
-
-	STDMETHOD(SetUseSystemFonts)(BOOL useSystemFonts)
-	{
-		//DocWrapper::FontProcessor::useSystemFonts = (useSystemFonts == TRUE);
-		return S_OK;
-	}
-
-	STDMETHOD(SetAdditionalParam)(BSTR ParamName, VARIANT ParamValue)
-	{
-		CString sParamName; sParamName = ParamName;
-		if (_T("EmbeddedFontsDirectory") == sParamName && ParamValue.vt == VT_BSTR)
-		{		
-			m_oCDocxSerializer.setEmbeddedFontsDir(CString(ParamValue.bstrVal));
-			return S_OK;
-		}
-		else if (_T("FontDir") == sParamName && ParamValue.vt == VT_BSTR)
-		{
-			m_oCDocxSerializer.setFontDir(CString(ParamValue.bstrVal));
-		}
-		else if (_T("SaveChartAsImg") == sParamName && ParamValue.vt == VT_BOOL)
-		{
-			m_oCDocxSerializer.setSaveChartAsImg(VARIANT_FALSE != ParamValue.boolVal);
-		}
-		else if (_T("NoBase64Save") == sParamName && ParamValue.vt == VT_BOOL)
-		{
-			m_oCDocxSerializer.setIsNoBase64Save(VARIANT_FALSE != ParamValue.boolVal);
-		}
-		return S_OK;
-	}
-	STDMETHOD(GetAdditionalParam)(BSTR ParamName, VARIANT* ParamValue)
-	{
-		return S_OK;
-	}
-	STDMETHOD(GetBinaryContent)(BSTR bsTxContent, SAFEARRAY** ppBinary)
-	{
-		unsigned char* pData = NULL;
-		long lDataSize = 0;
-		bool bRes = true;
-		//m_oCDocxSerializer.getBinaryContent(CString(bsTxContent), &pData, lDataSize);
-		if(NULL != pData && lDataSize > 0)
-		{
-			SAFEARRAYBOUND	rgsabound[1];
-			rgsabound[0].lLbound = 0;
-			rgsabound[0].cElements = lDataSize;
-			LPSAFEARRAY pArray = SafeArrayCreate(VT_UI1, 1, rgsabound);
-
-			BYTE* pDataD = (BYTE*)pArray->pvData;
-			BYTE* pDataS = pData;
-			memcpy(pDataD, pDataS, lDataSize);
-
-			*ppBinary = pArray;
-		}
-		RELEASEARRAYOBJECTS(pData);
-		return bRes ? S_OK : S_FALSE;
-	}
-	STDMETHOD(Write)(BSTR bstrFileIn, BSTR bstrDirectoryOut)
-	{
-		CString sDirectoryOut = bstrDirectoryOut;
-		CString sThemePath;
-		CString sMediaPath;
-		CString sEmbedPath;
-		
-		if (!m_oCDocxSerializer.CreateDocxFolders(sDirectoryOut, sThemePath, sMediaPath, sEmbedPath))
-			return S_FALSE;
-		bool bRes = m_oCDocxSerializer.loadFromFile(CString(bstrFileIn), CString(bstrDirectoryOut), CString(_T("")), CString(sThemePath.GetString()), CString(sMediaPath.GetString()), sEmbedPath);
-		
-		return bRes ? S_OK : S_FALSE;
-	}
-	STDMETHOD(GetXmlContent)(SAFEARRAY* pBinaryObj, LONG lStart, LONG lLength, BSTR* bsXml)
-	{
-		CString sRes;
-		bool bRes = true;
-		//m_oCDocxSerializer.getXmlContent((BYTE*)pBinaryObj->pvData, pBinaryObj->rgsabound[0].cElements, lStart, lLength, sRes);
-		(*bsXml) = sRes.AllocSysString();
-		return bRes ? S_OK : S_FALSE;
-	}
-private:
-};

ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro

@@ -16,15 +16,15 @@ include($$PWD/../../Common/3dParty/boost/boost.pri)
 
 DEFINES += UNICODE \
 	_UNICODE \
-        NODOCX \
 	_USE_XMLLITE_READER_ \
 	USE_LITE_READER \
-	USE_ATL_CSTRING \
 	USE_AVSOFFICESTUDIO_XMLUTILS \
 	SOLUTION_ASCOFFICEDOCXFILE2 \
         #DISABLE_FILE_DOWNLOADER \
 	_USE_LIBXML2_READER_ \
-	LIBXML_READER_ENABLED
+        LIBXML_READER_ENABLED \
+        DONT_WRITE_EMBEDDED_FONTS
+
 
 INCLUDEPATH += \
     ../../DesktopEditor/freetype-2.5.2/include \

ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj/project.pbxproj

@@ -378,6 +378,7 @@
 					MAC,
 					unix,
 					_IOS,
+					DONT_WRITE_EMBEDDED_FONTS,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (
@@ -414,6 +415,7 @@
 					MAC,
 					unix,
 					_IOS,
+					DONT_WRITE_EMBEDDED_FONTS,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (

ASCOfficeDocxFile2/PptxFile.h

@@ -1,219 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-// CAVSOfficePPTXFile.h : Declaration of the CAVSOfficePPTXFile
-
-#pragma once
-#include "stdafx.h"
-#include "resource.h"       // main symbols
-
-#include "../Common/OfficeFileTemplate.h"
-#include "../ASCOfficePPTXFile/ASCOfficePPTXFile.h"
-
-#include "../Common/DocxFormat/Source/SystemUtility/File.h"
-#include "../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
-
-bool comExtractFile(void* pArg, CString& sFile, CString& sDir);
-bool comCompressFile(void* pArg, CString& sDir, CString& sFile);
-bool comProgress(void* pArg, long ID, long Percent);
-
-// IAVSOfficePPTXFile
-[object, uuid("096DBAB4-3E54-4e14-99F4-B57D97081C61"), dual, pointer_default(unique)]
-__interface IAVSOfficePPTXFile : IAVSOfficeFileTemplate
-{
-//	[id(3), helpstring("method SaveAsDrawingXML")] HRESULT SaveAsDrawingXML([in] BSTR sSrcFileName, [in] BSTR sDestPath, [in] BSTR sDestXMLFileName);
-
-	[propget, id(4), helpstring("property TempDirectory")] HRESULT TempDirectory([out, retval] BSTR* pVal);
-	[propput, id(4), helpstring("property TempDirectory")] HRESULT TempDirectory([in] BSTR newVal);
-	[id(5), helpstring("method GetDVDXml")] HRESULT GetDVDXml([out,retval] BSTR* pbstrPTTXml);
-	[id(6), helpstring("method GetBluRayXml")] HRESULT GetBluRayXml([out,retval] BSTR* pbstrDVDXml);
-	[propget, id(7), helpstring("property DrawingXml")] HRESULT DrawingXml([out, retval] BSTR* pVal);
-
-	[id(2000 + 0)] HRESULT SetAdditionalParam([in] BSTR ParamName, [in] VARIANT ParamValue);
-	[id(2001 + 1)] HRESULT GetAdditionalParam([in] BSTR ParamName, [out, retval] VARIANT* ParamValue);
-};
-
-// IAVSOfficePPTXFile2
-[object, uuid("68603ED6-0BB4-4330-9A80-D06B855D6DAA"), dual, pointer_default(unique)]
-__interface IAVSOfficePPTXFile2 : IDispatch
-{
-	[id(10000 + 0)] HRESULT OpenFileToPPTY([in] BSTR bsInputDir, [in] BSTR bsFileDst);
-	[id(10000 + 1)] HRESULT OpenDirectoryToPPTY([in] BSTR bsInputDir, [in] BSTR bsFileDst);
-
-	[id(10000 + 2)] HRESULT SetMediaDir([in] BSTR bsMediaDir);
-	[id(10000 + 3)] HRESULT SetFontDir([in] BSTR bsFontDir);
-
-	[id(10000 + 4)] HRESULT SetUseSystemFonts([in] VARIANT_BOOL useSystemFonts);
-	[id(10000 + 5)] HRESULT ConvertPPTYToPPTX([in] BSTR bsInputFile, [in] BSTR bsFileDst, [in] BSTR bsThemesFolder);
-
-	[id(10000 + 6)] HRESULT SetThemesDir([in] BSTR bsThemesPath);
-};
-
-// CAVSOfficePPTXFile
-[coclass, uuid("A3B9F270-175E-4982-B302-55ED6DF6361E"), event_source(com), threading(apartment), vi_progid("AVSOfficePPTXFile.OfficePPTXFile"), progid("AVSOfficePPTXFile.OfficePPTXFile.1"), version(1.0), registration_script("control.rgs")]
-class ATL_NO_VTABLE CAVSOfficePPTXFile 
-	:	public IAVSOfficePPTXFile
-	,	public IAVSOfficePPTXFile2
-{
-private:
-	CPPTXFile m_oCPPTXFile;
-public:
-
-	__event __interface _IAVSOfficeFileTemplateEvents2;
-	CAVSOfficePPTXFile() : m_oCPPTXFile(comExtractFile, comCompressFile, comProgress, this)
-	{
-	}
-
-	~CAVSOfficePPTXFile()
-	{
-	}
-
-	DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-	HRESULT FinalConstruct()
-	{
-		return S_OK;
-	}
-
-	void FinalRelease()
-	{
-	}
-
-public:
-	HRESULT LoadFromFile(BSTR sSrcFileName, BSTR sDstPath, BSTR sXMLOptions)
-	{
-		return m_oCPPTXFile.LoadFromFile(sSrcFileName, sDstPath, sXMLOptions);
-	}
-public:
-	HRESULT SaveToFile(BSTR sDstFileName, BSTR sSrcPath, BSTR sXMLOptions)
-	{
-		return m_oCPPTXFile.SaveToFile(sDstFileName, sSrcPath, sXMLOptions);
-	}
-
-public:
-	STDMETHOD(get_TempDirectory)(BSTR* pVal)
-	{
-		return m_oCPPTXFile.get_TempDirectory(pVal);
-	}
-	STDMETHOD(put_TempDirectory)(BSTR newVal)
-	{
-		return m_oCPPTXFile.put_TempDirectory(newVal);
-	}
-public:
-	STDMETHOD(GetDVDXml)(BSTR* pbstrPTTXml)
-	{
-		return m_oCPPTXFile.GetDVDXml(pbstrPTTXml);
-	}
-	STDMETHOD(GetBluRayXml)(BSTR* pbstrDVDXml)
-	{
-		return m_oCPPTXFile.GetBluRayXml(pbstrDVDXml);
-	}
-public:
-	STDMETHOD(get_DrawingXml)(BSTR* pVal)
-	{
-		return m_oCPPTXFile.get_DrawingXml(pVal);
-	}
-
-	STDMETHOD(SetAdditionalParam)(BSTR ParamName, VARIANT ParamValue)
-	{
-		return m_oCPPTXFile.SetAdditionalParam(ParamName, ParamValue);
-	}
-
-	STDMETHOD(GetAdditionalParam)(BSTR ParamName, VARIANT* ParamValue)
-	{
-		return m_oCPPTXFile.GetAdditionalParam(ParamName, ParamValue);
-	}
-
-	// to PPTY
-	STDMETHOD(SetMediaDir)(BSTR bsMediaDir)
-	{
-		return m_oCPPTXFile.SetMediaDir(bsMediaDir);
-	}
-	STDMETHOD(SetFontDir)(BSTR bsFontDir)
-	{
-		return m_oCPPTXFile.SetFontDir(bsFontDir);
-	}
-	STDMETHOD(SetThemesDir)(BSTR bsDir)
-	{
-		return m_oCPPTXFile.SetThemesDir(bsDir);
-	}
-	STDMETHOD(SetUseSystemFonts)(VARIANT_BOOL useSystemFonts)
-	{
-		return m_oCPPTXFile.SetUseSystemFonts(useSystemFonts);
-	}
-	STDMETHOD(OpenFileToPPTY)(BSTR bsInput, BSTR bsOutput)
-	{
-		return m_oCPPTXFile.OpenFileToPPTY(bsInput, bsOutput);
-	}
-	STDMETHOD(OpenDirectoryToPPTY)(BSTR bsInput, BSTR bsOutput)
-	{
-		return m_oCPPTXFile.OpenDirectoryToPPTY(bsInput, bsOutput);
-	}
-	STDMETHOD(ConvertPPTYToPPTX)(BSTR bsInput, BSTR bsOutput, BSTR bsThemesFolder)
-	{
-		return m_oCPPTXFile.ConvertPPTYToPPTX(bsInput, bsOutput, bsThemesFolder);
-	}
-	//void LoadResourceFile(HINSTANCE hInst, LPCTSTR sResName, LPCTSTR sResType, const CString& strDstFile)
-	//{
-	//	HRSRC hrRes = FindResource(hInst, sResName, sResType);
-	//	if (!hrRes)
-	//		return;
-
-	//	HGLOBAL hGlobal = LoadResource(hInst, hrRes);
-	//	DWORD sz = SizeofResource(hInst, hrRes);
-	//	void* ptrRes = LockResource(hGlobal);
-
-	//	CFile oFile;
-	//	oFile.CreateFile(strDstFile);
-	//	oFile.WriteFile(ptrRes, sz);
-
-	//	UnlockResource(hGlobal);
-	//	FreeResource(hGlobal);
-	//}
-};
-
-bool comExtractFile(void* pArg, CString& sFile, CString& sDir)
-{
-	COfficeUtils oCOfficeUtils(NULL);
-	return S_OK == oCOfficeUtils.ExtractToDirectory(string2std_string(sFile), string2std_string(sDir), NULL, 0) ? true : false;
-}
-bool comCompressFile(void* pArg, CString& sDir, CString& sFile)
-{
-	COfficeUtils oCOfficeUtils(NULL);
-	return S_OK == oCOfficeUtils.CompressFileOrDirectory(string2std_string(sDir), string2std_string(sFile), -1) ? true : false;
-}
-bool comProgress(void* pArg, long ID, long Percent)
-{
-	CAVSOfficePPTXFile* pCAVSOfficePPTXFile = static_cast<CAVSOfficePPTXFile*>(pArg);
-	SHORT res = 0;
-	pCAVSOfficePPTXFile->OnProgressEx(ID, Percent, &res);
-	return (res != 0);
-}

ASCOfficeDocxFile2/Resource.h

@@ -1,57 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by AVSOfficeDocxFile2.rc
-//
-#define IDS_PROJNAME                    100
-#define IDR_ASCOFFICEDOCXFILE2          101
-
-#define IDB_DEFAULT_DOC_RELS			201
-#define IDB_DEFAULT_DOC_APP				202
-#define IDB_DEFAULT_DOC_CORE			203
-#define IDB_DEFAULT_DOC_THEME			204
-#define IDB_DEFAULT_DOC_WEBSETTINGS		205
-#define IDB_DEFAULT_XLSX_THEME			206
-#define IDB_XML_NOTESTHEME				207
-#define IDB_XML_NOTESMASTER				208
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        401
-#define _APS_NEXT_COMMAND_VALUE         32768
-#define _APS_NEXT_CONTROL_VALUE         201
-#define _APS_NEXT_SYMED_VALUE           102
-#endif
-#endif

ASCOfficeDocxFile2/XlsxFile2.h

@@ -1,163 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-#pragma once
-#include "resource.h" 
-#include "../Common/OfficeFileTemplate.h"
-#include "DocWrapper/XlsxSerializer.h"
-#include "../XlsxSerializerCom/Common/Common.h"
-#include "../XlsxSerializerCom/Common/BinReaderWriterDefines.h"
-#include "../DesktopEditor/common/Directory.h"
-
-[
-	object,
-	uuid("B7AD8AA6-A103-4260-82BE-338C32543B90"),
-	dual,	helpstring("IAVSOfficeXlsxSerizer Interface"),
-	pointer_default(unique)
-]
-__interface IAVSOfficeXlsxSerizer : public IAVSOfficeFileTemplate
-{
-	[id(20)] HRESULT SetFontDir([in] BSTR bsFontDir);
-
-	[id(30)] HRESULT LoadChart([in] BSTR bsFilename, [out, satype("BYTE")] SAFEARRAY** ppBinary);
-	[id(31)] HRESULT SaveChart([in, satype("BYTE")] SAFEARRAY* pBinaryObj, [in] LONG lStart, [in] LONG lLength, [in] BSTR bsFilename, [in] BSTR bsContentTypePath, [out] BSTR* bsContentTypeElement);
-	[id(32)] HRESULT SetDrawingConverter([in] IUnknown* pDocument);
-
-	[id(120)]	HRESULT SetAdditionalParam([in] BSTR ParamName, [in] VARIANT ParamValue);
-	[id(130)]	HRESULT GetAdditionalParam([in] BSTR ParamName, [out, retval] VARIANT* ParamValue);
-};
-
-[
-	coclass,
-	default(IAVSOfficeXlsxSerizer),
-	event_receiver(native),
-	threading(apartment),
-	vi_progid("ASCOfficeXlsxSerizer.AVSDocume"),
-	progid("ASCOfficeXlsxSerizer.AVSDocu.1"),
-	version(1.0),
-	uuid("BDE1A2A6-2EE0-4507-BD2E-0C42DA4101C2"),
-	helpstring("ASCOfficeXlsxSerizer Class")
-]
-class ATL_NO_VTABLE CAVSOfficeXlsxSerizer : public IAVSOfficeXlsxSerizer
-{
-private:
-	BinXlsxRW::CXlsxSerializer m_oXlsxSerializer;
-	IUnknown* m_pThis;
-public:
-	CAVSOfficeXlsxSerizer()
-	{
-	}
-
-	DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-	HRESULT FinalConstruct()
-	{
-		return S_OK;
-	}
-
-	void FinalRelease()
-	{
-	}
-public:
-	STDMETHOD(LoadFromFile)(BSTR sSrcFileName, BSTR bstrDstPath, BSTR bstrXMLOptions)
-	{
-		CString sDstPath = bstrDstPath;
-		CString sMediaPath;
-		CString sEmbedPath;
-		
-		m_oXlsxSerializer.CreateXlsxFolders(CString(bstrXMLOptions), sDstPath, sMediaPath, sEmbedPath);
-
-		bool bRes = m_oXlsxSerializer.loadFromFile(CString(sSrcFileName), sDstPath, CString(bstrXMLOptions), sMediaPath, sEmbedPath);
-		return bRes ? S_OK : S_FALSE;
-	}
-	STDMETHOD(SaveToFile)(BSTR sDstFileName, BSTR sSrcPath, BSTR sXMLOptions)
-	{
-		bool bRes = m_oXlsxSerializer.saveToFile(CString(sDstFileName), CString(sSrcPath), CString(sXMLOptions)) ? S_OK : S_FALSE;
-		return bRes ? S_OK : S_FALSE;
-	}
-	STDMETHOD(LoadChart)(BSTR bsFilename, SAFEARRAY** ppBinary)
-	{
-		unsigned char* pData = NULL;
-		long lDataSize = 0;
-		bool bRes = true;
-		//m_oXlsxSerializer.loadChart(CString(bsFilename), &pData, lDataSize);
-		if(NULL != pData && lDataSize > 0)
-		{
-			SAFEARRAYBOUND	rgsabound[1];
-			rgsabound[0].lLbound = 0;
-			rgsabound[0].cElements = lDataSize;
-			LPSAFEARRAY pArray = SafeArrayCreate(VT_UI1, 1, rgsabound);
-
-			BYTE* pDataD = (BYTE*)pArray->pvData;
-			BYTE* pDataS = pData;
-			memcpy(pDataD, pDataS, lDataSize);
-
-			*ppBinary = pArray;
-		}
-		RELEASEARRAYOBJECTS(pData);
-		return bRes ? S_OK : S_FALSE;
-	}
-	STDMETHOD(SaveChart)(SAFEARRAY* pBinaryObj, LONG lStart, LONG lLength, BSTR bsFilename, BSTR bsContentTypePath, BSTR* bsContentTypeElement)
-	{
-		CString* sContentTypeElement = NULL;
-		bool bRes = true;
-		//m_oXlsxSerializer.saveChart(pBinaryObj, lStart, lLength, CString(bsFilename), CString(bsContentTypePath), &sContentTypeElement);
-		if(NULL != sContentTypeElement)
-			*bsContentTypeElement = sContentTypeElement->AllocSysString();
-		return bRes ? S_OK : S_FALSE;
-	}
-	STDMETHOD(SetDrawingConverter)(IUnknown* pDocument)
-	{
-		//m_oXlsxSerializer.setDrawingConverter(pDocument);
-		return S_OK;
-	}
-	STDMETHOD(SetFontDir)(BSTR bsFontDir)
-	{
-		m_oXlsxSerializer.setFontDir(CString(bsFontDir));
-		return S_OK;
-	}
-	STDMETHOD(SetAdditionalParam)(BSTR ParamName, VARIANT ParamValue)
-	{
-		CString sParamName; sParamName = ParamName;
-		if (_T("EmbeddedFontsDirectory") == sParamName && ParamValue.vt == VT_BSTR)
-		{		
-			m_oXlsxSerializer.setEmbeddedFontsDir(CString(ParamValue.bstrVal));
-			return S_OK;
-		}		
-		return S_OK;
-	}
-	STDMETHOD(GetAdditionalParam)(BSTR ParamName, VARIANT* ParamValue)
-	{
-		return S_OK;
-	}
-private:
-
-};

ASCOfficeDocxFile2/dlldata.c

@@ -1,38 +0,0 @@
-/*********************************************************
-   DllData file -- generated by MIDL compiler 
-
-        DO NOT ALTER THIS FILE
-
-   This file is regenerated by MIDL on every IDL file compile.
-
-   To completely reconstruct this file, delete it and rerun MIDL
-   on all the IDL files in this DLL, specifying this file for the
-   /dlldata command line option
-
-*********************************************************/
-
-#define PROXY_DELEGATION
-
-#include <rpcproxy.h>
-
-#ifdef __cplusplus
-extern "C"   {
-#endif
-
-EXTERN_PROXY_FILE( _ASCOfficeDocxFile2 )
-
-
-PROXYFILE_LIST_START
-/* Start of list */
-  REFERENCE_PROXY_FILE( _ASCOfficeDocxFile2 ),
-/* End of list */
-PROXYFILE_LIST_END
-
-
-DLLDATA_ROUTINES( aProxyFileList, GET_DLL_CLSID )
-
-#ifdef __cplusplus
-}  /*extern "C" */
-#endif
-
-/* end of generated dlldata file */

ASCOfficeDocxFile2/stdafx.cpp

@@ -1,36 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-// stdafx.cpp : source file that includes just the standard includes
-// AVSOfficeDocxFile2.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"

ASCOfficeDocxFile2/stdafx.h

@@ -1,112 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently,
-// but are changed infrequently
-
-#pragma once
-
-#ifndef STRICT
-#define STRICT
-#endif
-
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER				// Allow use of features specific to Windows 95 and Windows NT 4 or later.
-#define WINVER 0x0500		// Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
-#endif
-
-#ifndef _WIN32_WINNT		// Allow use of features specific to Windows NT 4 or later.
-#define _WIN32_WINNT 0x0500	// Change this to the appropriate value to target Windows 2000 or later.
-#endif						
-
-#ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-#endif
-
-#ifndef _WIN32_IE			// Allow use of features specific to IE 4.0 or later.
-#define _WIN32_IE 0x0400	// Change this to the appropriate value to target IE 5.0 or later.
-#endif
-
-#define _ATL_APARTMENT_THREADED
-#define _ATL_NO_AUTOMATIC_NAMESPACE
-
-#define _CRT_SECURE_NO_DEPRECATE
-
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
-
-// turns off ATL's hiding of some common and often safely ignored warning messages
-#define _ATL_ALL_WARNINGS
-#include <windows.h>
-
-#include <atlbase.h>
-#include <atlcom.h>
-#include <atlwin.h>
-#include <atltypes.h>
-#include <atlctl.h>
-#include <atlhost.h>
-
-using namespace ATL;
-#include "../Common/ASCUtils.h"
-
-#include <Gdiplus.h>
-#pragma comment(lib, "gdiplus.lib")
-
-using namespace Gdiplus;
-
-#ifdef BUILD_CONFIG_OPENSOURCE_VERSION
-
-#import "../Redist/OfficeCore.dll"			named_guids raw_interfaces_only rename_namespace("OfficeCore")
-
-#ifndef _DEFINE_NAMESPACE_ASC_GRAPHICS_
-#define _DEFINE_NAMESPACE_ASC_GRAPHICS_
-namespace ASCGraphics
-{
-	typedef OfficeCore::IWinFonts IASCFontManager;
-	const GUID CLSID_CASCFontManager = OfficeCore::CLSID_CWinFonts;
-	const GUID IID_IASCFontManager = OfficeCore::IID_IWinFonts;
-}
-#endif
-
-#else
-
-//#import "../Redist/ASCGraphics.dll"			named_guids raw_interfaces_only rename_namespace("ASCGraphics")
-#import "../Redist/ASCFontConverter.dll"	named_guids raw_interfaces_only rename_namespace("Fonts")
-
-#endif
-
-//#import "../Redist/ASCOfficeUtils.dll"			named_guids raw_interfaces_only rename_namespace("OfficeUtils")
-//#import "../Redist/ASCOfficePPTXFile.dll"	named_guids raw_interfaces_only rename_namespace("PPTXFile"), exclude("_IAVSOfficeFileTemplateEvents"), exclude("_IAVSOfficeFileTemplateEvents2"), exclude("IASCRenderer")
-
-#include "../Common/DocxFormat/Source/DocxFormat/Docx.h"
-#include "../Common/DocxFormat/Source/XlsxFormat/Xlsx.h"
-

ASCOfficeDocxFile2/stdafx2.h

@@ -1,39 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-#pragma once
-
-#define WIN32_LEAN_AND_MEAN
-
-#include "WritingElement.h"
-#include "Docx.h"
-#include "DocMeasurer/FontProcessor.h"
-#include "Docx.h"

ASCOfficeDocxFile2/version.h

@@ -1,38 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2017
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-#pragma once
-//2
-//0
-//2
-//330
-#define INTVER 2,0,2,330
-#define STRVER "2,0,2,330\0"

ASCOfficeOdfFile/OdfFileTest/OdfFile.sln

@@ -2,6 +2,9 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml_wrapper", "..\win32\cpxml.vcproj", "{41BED424-4EAF-4053-8A5F-1E2A387D53D1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormatReaderLib", "..\win32\cpodf.vcproj", "{50E20601-4A8D-4AFB-8870-63828D328429}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -21,7 +24,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormulasConvert", "..\wi
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFileReaderTest", "OdfFileTest.vcproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
 	ProjectSection(ProjectDependencies) = postProject
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1}
 		{50E20601-4A8D-4AFB-8870-63828D328429} = {50E20601-4A8D-4AFB-8870-63828D328429}
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
 		{94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A}
 		{F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363}
 		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
@@ -30,7 +35,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFileReaderTest", "OdfFil
 		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
 		{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "..\..\DesktopEditor\graphics\graphics_vs2005.vcproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}"

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.cpp

@@ -31,18 +31,22 @@
  */
 // OdfFileTest.cpp 
 
-#include "../../../OfficeUtils/src/OfficeUtils.h"
+#include <stdio.h>
+#include <tchar.h>
 
-#include "../../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
+#include "../../OfficeUtils/src/OfficeUtils.h"
+#include "../../DesktopEditor/common/Directory.h"
+#include "../src/ConvertOO2OOX.h"
 
-#include "../../src/ConvertOO2OOX.h"
 
 #if defined(_WIN64)
-	#pragma comment(lib, "../../../build/bin/icu/win_64/icuuc.lib")
+	#pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib")
 #elif defined (_WIN32)
-	#pragma comment(lib, "../../../build/bin/icu/win_32/icuuc.lib")
+	#pragma comment(lib, "../../build/bin/icu/win_32/icuuc.lib")
 #endif
 
+
+
 int _tmain(int argc, _TCHAR* argv[])
 {
 	if (argc < 2) return 1;
@@ -50,12 +54,12 @@ int _tmain(int argc, _TCHAR* argv[])
 	HRESULT hr = S_OK;
 //////////////////////////////////////////////////////////////////////////
 	std::wstring srcFileName	= argv[1];
-	std::wstring dstPath		= argc > 2 ? argv[2] : sSrcDoc + L"-my.docx"; //xlsx pptx
+	std::wstring dstPath		= argc > 2 ? argv[2] : srcFileName + L"-my.xlsx"; //xlsx pptx docx
 	
-	std::wstring outputDir		= FileSystem::Directory::GetFolderPath(dstPath);
+	std::wstring outputDir		= NSDirectory::GetFolderPath(dstPath);
 	
-	std::wstring srcTempPath	= FileSystem::Directory::CreateDirectoryWithUniqueName(outputDir);
-	std::wstring dstTempPath	= FileSystem::Directory::CreateDirectoryWithUniqueName(outputDir);
+	std::wstring srcTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
+	std::wstring dstTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
 
     // распаковываем исходник во временную директорию
 	COfficeUtils oCOfficeUtils(NULL);
@@ -64,14 +68,14 @@ int _tmain(int argc, _TCHAR* argv[])
 
 	hr = ConvertOO2OOX(srcTempPath, dstTempPath, L"C:\\Windows\\Fonts", false, NULL);
 
-	FileSystem::Directory::DeleteDirectory(srcTempPath);
+	NSDirectory::DeleteDirectory(srcTempPath);
 
 	if (hr != S_OK)  return hr;
    
-	if (S_OK != oCOfficeUtils.CompressFileOrDirectory(dstTempPath.c_str(), dstPath.c_str(), -1))
+	if (S_OK != oCOfficeUtils.CompressFileOrDirectory(dstTempPath.c_str(), dstPath.c_str(), true))
         return hr;
 	
-	FileSystem::Directory::DeleteDirectory(dstTempPath);
+	NSDirectory::DeleteDirectory(dstTempPath);
 
 ////////////////////////////////////////////////////////////////////////
 	return 0;

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.vcproj

@@ -43,11 +43,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
@@ -63,7 +63,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="gdi32.lib"
+				AdditionalDependencies="gdi32.lib Rpcrt4.lib"
+				ShowProgress="0"
+				Version=""
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -369,6 +371,30 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\DesktopEditor\xml\src\xmldom.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\DesktopEditor\xml\src\xmllight.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

ASCOfficeOdfFile/include/cpdoccore/CPOptional.h

@@ -34,18 +34,15 @@
 #include <boost/optional/optional_io.hpp>
 #include <boost/optional.hpp>
 
-namespace cpdoccore
+/// внешнее объявление для Optional, используем boost::optional
+
+template <class T>
+struct optional
 {
-    /// внешнее объявление для Optional, используем boost::optional
-
-    template <class T>
-    struct optional
-    {
-        typedef T Base;
-        typedef boost::optional<T> Type;
-    };
+    typedef T Base;
+    typedef boost::optional<T> Type;
+};
 
 
-    #define _CP_OPT(V) optional<V>::Type
+#define _CP_OPT(V) optional<V>::Type
 
-}

ASCOfficeOdfFile/linux/OdfFileReaderLib.pro

@@ -24,7 +24,8 @@ DEFINES +=  UNICODE \
             _USE_LIBXML2_READER_ \
             _USE_XMLLITE_READER_ \
             USE_LITE_READER \
-            LIBXML_READER_ENABLED
+            LIBXML_READER_ENABLED \
+            DONT_WRITE_EMBEDDED_FONTS
 
 INCLUDEPATH += ../include
 INCLUDEPATH += ../../DesktopEditor/freetype-2.5.2/include

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -569,7 +569,8 @@ mc:Ignorable=\"w14 wp14\">";
         
         strm << L"<w:abstractNum w:abstractNumId=\"" << abstractNumId << "\">";
         numIds.push_back(abstractNumId);		
-        for (int i = 0; i < (std::min)( content.size(), (size_t)9); i++)
+       
+		for (size_t i = 0; i < (std::min)( content.size(), (size_t)9); i++)
         {
             start_text_list_style(inst->get_text_list_style()->get_style_name());
             content[i]->docx_convert(*this);
@@ -1296,7 +1297,7 @@ void docx_conversion_context::start_text_changes (std::wstring id)
 		
 		if (state.type	== 2)
 		{
-			for (int i = 0 ; i < state.content.size(); i++)
+			for (size_t i = 0 ; i < state.content.size(); i++)
 			{
 				output_stream() << L"<w:del" << format_change << L" w:id=\"" << boost::lexical_cast<std::wstring>(current_id_changes++) <<  L"\">";
 

ASCOfficeOdfFile/src/docx/docx_drawing.cpp

@@ -531,8 +531,8 @@ mso-position-vertical-relative:text;";
 				strStyle += L"height:"		+ boost::lexical_cast<std::wstring>(val.cy / 12700.) + L"pt;"; 
 				strStyle += L"z-index:"		+ boost::lexical_cast<std::wstring>(0xF000800 - val.id);
 			
-				CP_XML_ATTR(L"id",				L"Rect" + boost::lexical_cast<std::wstring>(val.id));
-				CP_XML_ATTR(L"o:spid",			L"_x0000_s" + boost::lexical_cast<std::wstring>(1024 + val.id));
+				CP_XML_ATTR(L"id",				L"Rect"		+ std::to_wstring(val.id));
+				CP_XML_ATTR(L"o:spid",			L"_x0000_s" + std::to_wstring(1024 + val.id));
 				CP_XML_ATTR(L"style",			strStyle);
 				CP_XML_ATTR(L"fillcolor",		L"#4f81bd [3204]");
 				CP_XML_ATTR(L"strokecolor",		L"#243f60 [1604]");

ASCOfficeOdfFile/src/docx/docx_package.cpp

@@ -47,12 +47,12 @@ docx_content_types_file::docx_content_types_file()
     content()->add_default(L"jpg",     L"image/jpeg");
     content()->add_default(L"png",     L"image/png");
 	//
-    content()->add_override(L"/_rels/.rels",                  L"application/vnd.openxmlformats-package.relationships+xml");
-    content()->add_override(L"/word/_rels/document.xml.rels", L"application/vnd.openxmlformats-package.relationships+xml");
     content()->add_override(L"/word/document.xml",            L"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml");
 	content()->add_override(L"/word/settings.xml",            L"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml");
     content()->add_override(L"/word/styles.xml",              L"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml");
     content()->add_override(L"/word/fontTable.xml",           L"application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml");
+    //content()->add_override(L"/word/_rels/document.xml.rels", L"application/vnd.openxmlformats-package.relationships+xml");
+    //content()->add_override(L"/_rels/.rels",                  L"application/vnd.openxmlformats-package.relationships+xml");
     content()->add_override(L"/docProps/app.xml",             L"application/vnd.openxmlformats-officedocument.extended-properties+xml");
     content()->add_override(L"/docProps/core.xml",            L"application/vnd.openxmlformats-package.core-properties+xml");
 }

ASCOfficeOdfFile/src/docx/mediaitems.cpp

@@ -58,7 +58,7 @@ bool is_internal(const std::wstring & uri, const std::wstring & packetRoot)
 
 	std::wstring  resultPath = packetRoot + FILE_SEPARATOR_STR + mediaPath;
 
-    return NSDirectory::Exists(resultPath) || NSDirectory::Exists(mediaPath);
+	return NSFile::CFileBinary::Exists(resultPath) || NSDirectory::Exists(mediaPath);
 }
 
 mediaitems::item::item(	std::wstring const & _href,
@@ -166,8 +166,7 @@ std::wstring mediaitems::detectImageFileExtension(std::wstring &fileName)
 
 std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, bool & isInternal, std::wstring & ref)
 {
-    bool isMediaInternal = is_internal(href, odf_packet_);
-  
+	bool isMediaInternal = true;
 	std::wstring sub_path = L"media/";
 	
 	std::wstring inputFileName;
@@ -175,10 +174,13 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 	{
 		sub_path = L"charts/";
 	}
-	if ( type == typeMsObject || type == typeOleObject)
+	else if ( type == typeMsObject || type == typeOleObject)
 	{
 		sub_path = L"embeddings/";
 	}
+	else 
+		isMediaInternal = is_internal(href, odf_packet_);
+	
 	int number=0;
 	
 		 if ( type == typeChart)		number = count_charts	+ 1;

ASCOfficeOdfFile/src/docx/oox_chart_series.cpp

@@ -139,7 +139,7 @@ void oox_chart_series::setValues(int ind, std::vector<std::wstring> & values)
 	if (ind == 0)	values_[ind].strRef_.present = true;
 	else			values_[ind].numRef_.present = true;
 
-	for (int i = 0; i < values.size(); i++)
+	for (size_t i = 0; i < values.size(); i++)
 	{
 		boost::algorithm::trim(values[i]);
 		if (ind == 0)
@@ -240,7 +240,7 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 									{
 										CP_XML_ATTR(L"val", values_[i].numRef_.num_cache_count);
 									}
-									for (int j = 0; j < values_[i].numRef_.num_cache.size(); j++)
+									for (size_t j = 0; j < values_[i].numRef_.num_cache.size(); j++)
 									{				
 										std::wstring & v = values_[i].numRef_.num_cache[j];
 
@@ -275,7 +275,7 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 								CP_XML_ATTR(L"val", values_[i].numRef_.num_cache_count);
 							}
 
-							for (int j = 0; j < values_[i].numRef_.num_cache.size(); j++)
+							for (size_t j = 0; j < values_[i].numRef_.num_cache.size(); j++)
 							{				
 								std::wstring & v = values_[i].numRef_.num_cache[j];
 								
@@ -312,7 +312,7 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 								{
 									CP_XML_ATTR(L"val", values_[i].strRef_.str_cache_count);
 								}
-								for (int j = 0; j < values_[i].strRef_.str_cache.size(); j++)
+								for (size_t j = 0; j < values_[i].strRef_.str_cache.size(); j++)
 								{								
 									std::wstring & v = values_[i].strRef_.str_cache[j];
 
@@ -336,7 +336,7 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 							{
 								CP_XML_ATTR(L"val", values_[i].strRef_.str_cache_count);
 							}
-							for (int j = 0; j < values_[i].strRef_.str_cache.size(); j++)
+							for (size_t j = 0; j < values_[i].strRef_.str_cache.size(); j++)
 							{								
 								std::wstring & v = values_[i].strRef_.str_cache[j];
 								CP_XML_NODE(L"c:pt")
@@ -405,7 +405,7 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 		}
 
 		bool bEmpty_dPt = true;
-		for (int i = 0 ; i < content_.points_.size(); i++)
+		for (size_t i = 0 ; i < content_.points_.size(); i++)
 		{
 			if (content_.points_[i].bEnabled)
 			{
@@ -415,9 +415,9 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 		}
 
 		int indPoint = 0;
-		for (int i = 0 ; !bEmpty_dPt && i < content_.points_.size(); i++)
+		for (size_t i = 0 ; !bEmpty_dPt && i < content_.points_.size(); i++)
 		{
-			for (int j = 0 ; j < content_.points_[i].repeated_; j++)
+			for (size_t j = 0 ; j < content_.points_[i].repeated_; j++)
 			{
 				CP_XML_NODE(L"c:dPt")
 				{

ASCOfficeOdfFile/src/docx/oox_drawing.cpp

@@ -35,9 +35,49 @@
 #include "oox_drawing.h"
 #include <cpdoccore/xml/simple_xml_writer.h>
 
-#include "../odf/svg_parser.h"
 #include "../odf/datatypes/custom_shape_types_convert.h"
 
+using namespace cpdoccore;
+
+namespace svg_path
+{
+	void oox_serialize(std::wostream & strm, std::vector<_polyline> & path)
+	{
+		CP_XML_WRITER(strm)
+		{
+			for (size_t i = 0; i < path.size(); i++)
+			{	
+				oox_serialize(strm, path[i]);
+			}
+		}
+	}
+	void oox_serialize(std::wostream & strm, _polyline & val)
+	{
+		CP_XML_WRITER(strm)
+		{
+			CP_XML_NODE(val.command)
+			{
+				for (size_t i = 0; i < val.points.size(); i++)
+				{	
+					oox_serialize(CP_XML_STREAM(), val.points[i]);
+				}
+			}
+		}
+	}
+	void oox_serialize(std::wostream & strm, _point & val)
+	{
+		CP_XML_WRITER(strm)
+		{
+			CP_XML_NODE(L"a:pt")
+			{
+				if (val.x)CP_XML_ATTR(L"x", (int)(val.x.get()));
+				if (val.y)CP_XML_ATTR(L"y", (int)(val.y.get()));
+			}
+		}
+	}
+
+}
+
 namespace cpdoccore {
 
 static const std::wstring _ooxShapeType[]=
@@ -53,41 +93,6 @@ static const std::wstring _ooxShapeType[]=
 	L"polygon", 
 };
 
-void svg_path::oox_serialize(std::wostream & strm, std::vector<svg_path::_polyline> & path)
-{
-	CP_XML_WRITER(strm)
-	{
-		BOOST_FOREACH(svg_path::_polyline & p, path)
-		{	
-			oox_serialize(strm, p);
-		}
-	}
-}
-void svg_path::oox_serialize(std::wostream & strm, svg_path::_polyline const & val)
-{
-    CP_XML_WRITER(strm)
-    {
-		CP_XML_NODE(val.command)
-		{
-			BOOST_FOREACH(svg_path::_point const & p, val.points)
-			{		
-				oox_serialize(CP_XML_STREAM(), p);
-			}
-		}
-    }
-}
-
-void svg_path::oox_serialize(std::wostream & strm, svg_path::_point const & val)
-{
-    CP_XML_WRITER(strm)
-    {
-		CP_XML_NODE(L"a:pt")
-		{
-			if (val.x)CP_XML_ATTR(L"x", (int)(val.x.get()));
-			if (val.y)CP_XML_ATTR(L"y", (int)(val.y.get()));
-		}
-    }
-}
 
 namespace oox {
 

ASCOfficeOdfFile/src/docx/oox_drawing.h

@@ -40,6 +40,8 @@
 #include "mediaitems.h"
 #include "oox_drawing_fills.h"
 
+#include "../odf/svg_parser.h"
+
 #include "../../../Common/DocxFormat/Source/Base/Types_32.h"
 
 namespace cpdoccore {
@@ -83,13 +85,19 @@ namespace oox {
 		void serialize_shape	(std::wostream & strm);
 		void serialize_xfrm		(std::wostream & strm, const std::wstring & namespace_ = L"a", bool always_position = false);
 		void serialize_bodyPr	(std::wostream & strm, const std::wstring & namespace_ = L"a");
-    };
-   
+    };   
 	typedef _CP_PTR(_oox_drawing) oox_drawing_ptr;
 
 	void oox_serialize_ln		(std::wostream & strm, const std::vector<odf_reader::_property> & val, bool always_draw = false);
 	void oox_serialize_aLst		(std::wostream & strm, const std::vector<odf_reader::_property> & val);
     void oox_serialize_hlink	(std::wostream & strm, const std::vector<_hlink_desc> & val);
+    
+}
 }
 
-}
+namespace svg_path
+{
+	void oox_serialize	(std::wostream & strm, _point & val);
+	void oox_serialize	(std::wostream & strm, _polyline & val);
+	void oox_serialize	(std::wostream & strm, std::vector<_polyline> & path);
+}

ASCOfficeOdfFile/src/docx/oox_drawing_fills.cpp

@@ -66,7 +66,7 @@ void oox_serialize_srgb(std::wostream & strm,std::wstring color,_CP_OPT(double)
 	{
 		CP_XML_NODE(L"a:srgbClr")
 		{
-			CP_XML_ATTR(L"val",color);
+			CP_XML_ATTR(L"val", color);
 			if (opacity)
 			{
 				CP_XML_NODE(L"a:alpha")
@@ -101,11 +101,56 @@ void oox_serialize_solid_fill(std::wostream & strm, const _oox_fill & val)
 	{
 		CP_XML_NODE(L"a:solidFill")
 		{
-			oox_serialize_srgb(CP_XML_STREAM(),val.solid->color,val.opacity);
+			oox_serialize_srgb(CP_XML_STREAM(), val.solid->color, val.opacity);
 		}
 
 	}
 }
+void vml_serialize_solid_fill(std::wostream & strm, const _oox_fill & val)
+{
+	if (!val.solid)return;
+	CP_XML_WRITER(strm)
+	{
+		CP_XML_NODE(L"v:fill")
+		{
+			oox_serialize_srgb(CP_XML_STREAM(), val.solid->color, val.opacity);
+			CP_XML_ATTR(L"v:fill",		val.solid->color);
+			if (val.opacity)
+			{
+				CP_XML_ATTR(L"v:opacity",	*val.opacity);
+			}
+		}
+
+	}
+}
+void vml_serialize_bitmap_fill(std::wostream & strm, const _oox_fill & val)
+{
+	if (!val.bitmap) return;
+	if (!val.bitmap->isInternal) return;
+
+	CP_XML_WRITER(strm)
+	{
+		CP_XML_NODE(L"v:fill")
+		{	
+			CP_XML_ATTR(L"r:id", val.bitmap->rId );
+
+			if (val.opacity)
+			{
+				CP_XML_ATTR(L"opacity",(int)(*val.opacity));
+			}		
+			
+			if (val.bitmap->bTile)
+			{
+				CP_XML_ATTR(L"type", L"pattern");
+			}
+			else
+			{
+				CP_XML_ATTR(L"type", L"frame");
+			}
+			CP_XML_ATTR(L"recolor", L"t");
+		}
+	}
+}
 void oox_serialize_bitmap_fill(std::wostream & strm, const _oox_fill & val)
 {
 	if (!val.bitmap) return;
@@ -164,20 +209,69 @@ void oox_serialize_bitmap_fill(std::wostream & strm, const _oox_fill & val)
 					{
 						CP_XML_NODE(L"a:fillRect");
 					}
-
 				}
 			}	
-
 		}
+	}
+}
+void vml_serialize_gradient_fill(std::wostream & strm, const _oox_fill & val)
+{
+	if (!val.gradient) return;
+	
+	CP_XML_WRITER(strm)
+	{
+		CP_XML_NODE(L"v:fill")
+		{
+			if (!val.gradient->colors.empty())
+			{
+				CP_XML_ATTR(L"color2", val.gradient->colors[val.gradient->colors.size() - 1].color_ref);
 
+				std::wstring colors_value;
+				for (size_t i = 0; i < val.gradient->colors.size(); i++)
+				{
+					colors_value += std::to_wstring(val.gradient->colors[i].pos) + L"% #" + 
+													val.gradient->colors[i].color_ref + L",";
+				}
+
+				if (!colors_value.empty())
+				{
+					CP_XML_ATTR(L"colors", colors_value.substr(0, colors_value.length() - 1));
+				}
+			}
+			double angle =/*360 - */val.gradient->angle/* * 180./3.14159265358979323846*/;
+			
+			CP_XML_ATTR(L"focus", L"100%");
+			switch(val.gradient->style)
+			{
+			case 0:	
+				CP_XML_ATTR(L"type", L"gradient");	
+				CP_XML_ATTR(L"method", L"linear");
+				CP_XML_ATTR(L"angle", angle);
+				break;
+			case 1:	
+				//CP_XML_ATTR(L"type", L"gradientRadial");
+				//break;
+			case 2:	
+				//CP_XML_ATTR(L"type", L"gradientCenter");	
+				//break;
+			case 3:	
+				//CP_XML_ATTR(L"type", L"gradientUnscaled");
+				//break;
+				CP_XML_ATTR(L"type", L"gradientRadial");
+			}
+			if (val.gradient->style > 0)
+			{
+				double focus_x = ((val.gradient->rect[2] - val.gradient->rect[0]) /2. + val.gradient->rect[0]) / 100.;
+				double focus_y = ((val.gradient->rect[3] - val.gradient->rect[1]) /2. + val.gradient->rect[1]) / 100.;
+				
+				CP_XML_ATTR(L"focusposition", XmlUtils::DoubleToString(focus_x, L"%.2f") + L"," + XmlUtils::DoubleToString(focus_y, L"%.2f"));
+			}
+		}
 	}
 }
 void oox_serialize_gradient_fill(std::wostream & strm, const _oox_fill & val)
 {
-	if (!val.gradient) 
-	{
-		return;
-	}
+	if (!val.gradient) return;
 	
 	CP_XML_WRITER(strm)
 	{
@@ -233,6 +327,7 @@ void oox_serialize_gradient_fill(std::wostream & strm, const _oox_fill & val)
 void oox_serialize_hatch_fill(std::wostream & strm, const _oox_fill & val)
 {
 	if (!val.hatch)return;
+
 	CP_XML_WRITER(strm)
 	{
 		CP_XML_NODE(L"a:pattFill")
@@ -253,7 +348,38 @@ void oox_serialize_hatch_fill(std::wostream & strm, const _oox_fill & val)
 		}
 	}
 }
-void oox_serialize_fill(std::wostream & strm, const _oox_fill & val)
+
+void vml_serialize_background (std::wostream & strm, const _oox_fill & val, const std::wstring & color, int id)
+{
+	if (val.type == 0) return;
+	CP_XML_WRITER(strm)
+	{
+		CP_XML_NODE(L"v:background")
+		{
+			CP_XML_ATTR(L"id",			L"_x0000_s" + std::to_wstring(1024 + id));
+			CP_XML_ATTR(L"o:bwmode",	L"white");
+			CP_XML_ATTR(L"fillcolor",	L"#" + color);
+			CP_XML_ATTR(L"o:targetscreensize", L"1024,768");
+			switch (val.type)
+			{
+				case 1:	
+					vml_serialize_solid_fill(CP_XML_STREAM(), val);
+					break;
+				case 2:	
+					vml_serialize_bitmap_fill(CP_XML_STREAM(), val);
+					break;
+				case 3:	
+					vml_serialize_gradient_fill(CP_XML_STREAM(), val);
+					break;
+				case 4:	
+					//vml_serialize_hatch_fill(CP_XML_STREAM(), val);
+					break;
+			}
+		}
+	}
+}
+
+void oox_serialize_fill (std::wostream & strm, const _oox_fill & val)
 {
 	switch (val.type)
 	{

ASCOfficeOdfFile/src/docx/oox_drawing_fills.h

@@ -143,9 +143,10 @@ namespace oox {
 		}
 	};
 
-    void oox_serialize_fill(std::wostream & strm, const _oox_fill & val);
-    void oox_serialize_srgb(std::wostream & strm,std::wstring color,_CP_OPT(double)  opacity);
-    void oox_serialize_srgb(std::wostream & strm,std::wstring color,_CP_OPT(odf_types::percent)  opacity);
+    void vml_serialize_background	(std::wostream & strm, const _oox_fill & val, const std::wstring & color, int id);
+    void oox_serialize_fill			(std::wostream & strm, const _oox_fill & val);
+    void oox_serialize_srgb			(std::wostream & strm,std::wstring color,_CP_OPT(double)  opacity);
+    void oox_serialize_srgb			(std::wostream & strm,std::wstring color,_CP_OPT(odf_types::percent)  opacity);
 
 }
 }

ASCOfficeOdfFile/src/docx/pptx_conversion_context.cpp

@@ -99,7 +99,7 @@ void pptx_conversion_context::process_layouts()
 	get_text_context().set_process_layouts(true);
 
 	//актуальные
-	for (int layout_index =0; layout_index < layouts.content.size(); layout_index++)
+	for (size_t layout_index =0; layout_index < layouts.content.size(); layout_index++)
 	{
 		start_layout(layout_index);
 
@@ -116,7 +116,7 @@ void pptx_conversion_context::process_layouts()
 
 		if (master)
 		{
-			for (int i = 0; i < master->content_.size(); i++)			
+			for (size_t i = 0; i < master->content_.size(); i++)			
 			{
 				odf_reader::office_element_ptr elm = master->content_[i];
 				if (elm->get_type() == odf_reader::typeDrawFrame)
@@ -152,7 +152,7 @@ void pptx_conversion_context::process_master_pages()
 	get_text_context().set_process_layouts(true);
 
 	//берем только актуальные
-	for (int master_index =0; master_index < masters.content.size();master_index++)
+	for (size_t master_index =0; master_index < masters.content.size();master_index++)
 	{
 		start_master(master_index);
 		
@@ -210,7 +210,7 @@ void pptx_conversion_context::end_document()
 {
     unsigned int count = 1;
    
-	for (int i = 0; i < slideMasters_.size(); i++)
+	for (size_t i = 0; i < slideMasters_.size(); i++)
     {
 		pptx_xml_slideMaster_ptr& slideM = slideMasters_[i];
 
@@ -233,7 +233,7 @@ void pptx_conversion_context::end_document()
 	}
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 	count=0;
-	for (int i = 0; i < slides_.size(); i++)
+	for (size_t i = 0; i < slides_.size(); i++)
     {
 		pptx_xml_slide_ptr& slide = slides_[i];
 
@@ -255,7 +255,7 @@ void pptx_conversion_context::end_document()
 		count++;
     }
 ///////////////////////////////////////////////////////////////////////////////////////////
-	for (int i = 0; i < slideLayouts_.size(); i++)
+	for (size_t i = 0; i < slideLayouts_.size(); i++)
     {
 		pptx_xml_slideLayout_ptr& slideL = slideLayouts_[i];
 
@@ -287,7 +287,7 @@ void pptx_conversion_context::end_document()
 	//добавляем диаграммы
 
 	count = 0;
-	for (int i = 0; i < charts_.size(); i++)
+	for (size_t i = 0; i < charts_.size(); i++)
     {
 		count++;
 		package::chart_content_ptr content = package::chart_content::create();
@@ -300,7 +300,7 @@ void pptx_conversion_context::end_document()
 	}
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	//добавляем темы
-	for (int i=0; i < themes_.size();i++)
+	for (size_t i=0; i < themes_.size(); i++)
     {
 		output_document_->get_ppt_files().add_theme(themes_[i]);
 	
@@ -500,7 +500,7 @@ bool pptx_conversion_context::start_master(int master_index)
 	process_theme(masters.content[master_index].master_name);//add default theme - одинаковые но под разными именами
 	current_master().add_theme(current_theme().id(), L"tId1");	
 
-	for (long i=0;i<masters.content[master_index].layouts.size();i++)
+	for (size_t i = 0; i < masters.content[master_index].layouts.size(); i++)
 	{
 		current_master().add_layout(masters.content[master_index].layouts[i].Id, masters.content[master_index].layouts[i].rId, 0x80000000 + last_uniq_big_id++);
 	}

ASCOfficeOdfFile/src/docx/pptx_slide_context.cpp

@@ -433,8 +433,6 @@ void pptx_slide_context::end_shape()
 
 void pptx_slide_context::end_table()
 {
-	impl_->objects_.push_back(impl_->object_description_);
-	default_set();
 }
 
 bool pptx_slide_context::empty() const

ASCOfficeOdfFile/src/docx/pptx_table_context.cpp

@@ -376,7 +376,7 @@ void oox_serialize_tcPr(std::wostream & strm, std::vector<const odf_reader::styl
 				
 				if (fill.bitmap)
 				{
-					bool isMediaInternal = false;
+					bool isMediaInternal = true;
 					std::wstring ref;
 					fill.bitmap->rId = Context.get_slide_context().get_mediaitems().add_or_find(fill.bitmap->xlink_href_, oox::typeImage, isMediaInternal, ref);
 					Context.get_slide_context().add_rels(isMediaInternal, fill.bitmap->rId, ref, oox::typeImage);

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.cpp

@@ -207,7 +207,7 @@ void xlsx_drawing_context::end_group()
 	group_rect.cy -= group_rect.y;
 	group_rect.cx -= group_rect.x;
 
-	for (int i = 0; i < impl_->groups_.back()->child_objects_.size(); i++)
+	for (size_t i = 0; i < impl_->groups_.back()->child_objects_.size(); i++)
 	{
 		_rect & r = impl_->groups_.back()->child_objects_[i].svg_rect_.get();
 		
@@ -615,7 +615,7 @@ void xlsx_drawing_context::process_objects(xlsx_table_metrics & table_metrics)
 }
 void xlsx_drawing_context::process_objects(std::vector<drawing_object_description> objects, xlsx_table_metrics & table_metrics, xlsx_drawings_ptr xlsx_drawings_)
 {
-	for (int i = 0 ; i < objects.size(); i++)
+	for (size_t i = 0 ; i < objects.size(); i++)
 	{
 		drawing_object_description & obj = objects[i];
 

ASCOfficeOdfFile/src/docx/xlsx_table_state.cpp

@@ -75,7 +75,7 @@ void xlsx_data_range::serialize_sort (std::wostream & _Wostream)
 			if (!byRow)
 				CP_XML_ATTR(L"columnSort", true);
 
-			for (int i = 0 ; i < bySort.size(); i++)
+			for (size_t i = 0 ; i < bySort.size(); i++)
 			{
 				bool in_range = true;
 				std::wstring ref1, ref2;

ASCOfficeOdfFile/src/docx/xlsxconversioncontext.cpp

@@ -134,7 +134,7 @@ void xlsx_conversion_context::end_document()
 {
 	std::wstringstream workbook_content;
 
-	for (int i = 0; i < sheets_.size(); i++)
+	for (size_t i = 0; i < sheets_.size(); i++)
     {
 		xlsx_xml_worksheet_ptr& sheet = sheets_[i];
 		
@@ -191,7 +191,7 @@ void xlsx_conversion_context::end_document()
     }
 	//добавляем диаграммы
 
-    for (int i = 0; i < charts_.size(); i++)
+    for (size_t i = 0; i < charts_.size(); i++)
     {
 		package::chart_content_ptr content = package::chart_content::create();
 
@@ -271,7 +271,7 @@ void xlsx_conversion_context::serialize_bookViews(std::wostream & strm)
 				{
 					if (sActiveTable)
 					{
-						for (int i = 0; i < sheets_.size(); i++)
+						for (size_t i = 0; i < sheets_.size(); i++)
 						{
 							if (sheets_[i]->name() == *sActiveTable)
 							{

ASCOfficeOdfFile/src/odf/abstract_xml.cpp

@@ -44,7 +44,7 @@ const wchar_t * abstract_xml::name = L"abstract-xml";
 
 std::wostream & abstract_xml::text_to_stream(std::wostream & _Wostream) const
 {
-	for (int i = 0; i < xml_content_.size(); i++)
+	for (size_t i = 0; i < xml_content_.size(); i++)
     {
         xml_content_[i]->text_to_stream(_Wostream);
     }
@@ -53,7 +53,7 @@ std::wostream & abstract_xml::text_to_stream(std::wostream & _Wostream) const
 
 std::wostream & abstract_xml::xml_to_stream(std::wostream & _Wostream) const
 {
-	for (int i = 0; i < xml_content_.size(); i++)
+	for (size_t i = 0; i < xml_content_.size(); i++)
     {
 		xml_content_[i]->xml_to_stream(_Wostream);
     }

ASCOfficeOdfFile/src/odf/calcext_elements.cpp

@@ -91,7 +91,7 @@ void calcext_conditional_formats::add_child_element( xml::sax * Reader, const st
 }
 void calcext_conditional_formats::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-	for (int i = 0 ; i < content_.size(); i++)
+	for (size_t i = 0 ; i < content_.size(); i++)
 	{
 		content_[i]->xlsx_convert(Context);
 	}
@@ -116,7 +116,7 @@ void calcext_conditional_format::xlsx_convert(oox::xlsx_conversion_context & Con
 
 	Context.start_conditional_format(*calcext_target_range_address_);
 
-	for (int i = 0 ; i < content_.size(); i++)
+	for (size_t i = 0 ; i < content_.size(); i++)
 	{
 		content_[i]->xlsx_convert(Context);
 	}
@@ -149,7 +149,7 @@ void calcext_data_bar::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	Context.set_conditional_format_dataBar(calcext_data_bar_attr_.calcext_min_length_, calcext_data_bar_attr_.calcext_max_length_);
 
-	for (int i = 0 ; i < content_.size(); i++)
+	for (size_t i = 0 ; i < content_.size(); i++)
 	{
 		content_[i]->xlsx_convert(Context);
 	}
@@ -170,7 +170,7 @@ void calcext_color_scale::add_child_element( xml::sax * Reader, const std::wstri
 void calcext_color_scale::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
 	Context.start_conditional_format_rule(3);
-	for (int i = 0 ; i < content_.size(); i++)
+	for (size_t i = 0 ; i < content_.size(); i++)
 	{
 		content_[i]->xlsx_convert(Context);
 	}
@@ -196,7 +196,7 @@ void calcext_icon_set::xlsx_convert(oox::xlsx_conversion_context & Context)
 	if (calcext_show_value_)
 		Context.set_conditional_format_showval(*calcext_show_value_);
 	
-	for (int i = 0 ; i < content_.size(); i++)
+	for (size_t i = 0 ; i < content_.size(); i++)
 	{
 		content_[i]->xlsx_convert(Context);
 	}

ASCOfficeOdfFile/src/odf/datatypes/common_attlists.cpp

@@ -109,11 +109,11 @@ void common_draw_fill_attlist::add_attributes( const xml::attributes_wc_ptr & At
 }
 void common_draw_fill_attlist::serialize(CP_ATTR_NODE)
 {
-	CP_XML_ATTR_OPT(L"draw:fill-color",		draw_fill_color_); 
-	CP_XML_ATTR_OPT(L"draw:fill",			draw_fill_); 
+	CP_XML_ATTR_OPT(L"draw:fill-color",			draw_fill_color_); 
+	CP_XML_ATTR_OPT(L"draw:fill",				draw_fill_); 
 	
-	CP_XML_ATTR_OPT(L"draw:opacity",		draw_opacity_); 
-	CP_XML_ATTR_OPT(L"draw:image-opacity",	draw_image_opacity_); 
+	CP_XML_ATTR_OPT(L"draw:opacity",			draw_opacity_); 
+	CP_XML_ATTR_OPT(L"draw:image-opacity",		draw_image_opacity_); 
 	
  	CP_XML_ATTR_OPT(L"draw:fill-image-name",	draw_fill_image_name_);
 	CP_XML_ATTR_OPT(L"draw:fill-gradient-name",	draw_fill_gradient_name_);

ASCOfficeOdfFile/src/odf/datatypes/common_attlists.h

@@ -465,7 +465,7 @@ public:
 	void serialize(CP_ATTR_NODE);
 
     _CP_OPT(horizontal_pos) style_horizontal_pos_;
-    _CP_OPT(length) svg_x_;
+    _CP_OPT(length)			svg_x_;
 
 };
 
@@ -477,10 +477,10 @@ public:
     void apply_from(const common_draw_style_name_attlist & Other);
 	void serialize(CP_ATTR_NODE);
 
-    _CP_OPT(style_ref) draw_style_name_;
-    _CP_OPT(std::wstring) draw_class_names_;
-    _CP_OPT(style_ref) presentation_style_name_;
-    _CP_OPT(std::wstring) presentation_class_names_;
+    _CP_OPT(style_ref)		draw_style_name_;
+    _CP_OPT(std::wstring)	draw_class_names_;
+    _CP_OPT(style_ref)		presentation_style_name_;
+    _CP_OPT(std::wstring)	presentation_class_names_;
 
 };
 
@@ -606,8 +606,8 @@ public:
     void apply_from(const common_draw_shape_with_text_and_styles_attlist & Other);
 	void serialize(CP_ATTR_NODE);
 
-    common_draw_shape_with_styles_attlist common_draw_shape_with_styles_attlist_;
-    common_draw_text_style_name_attlist	 common_draw_text_style_name_attlist_;
+    common_draw_shape_with_styles_attlist	common_draw_shape_with_styles_attlist_;
+    common_draw_text_style_name_attlist		common_draw_text_style_name_attlist_;
 };
 
 /// presentation-shape-attlist
@@ -618,9 +618,9 @@ public:
     void apply_from(const presentation_shape_attlist & Other);
 	void serialize(CP_ATTR_NODE);
 
-    _CP_OPT(std::wstring) presentation_class_;
-    _CP_OPT(Bool) presentation_placeholder_;
-    _CP_OPT(Bool) presentation_user_transformed_;
+    _CP_OPT(std::wstring)	presentation_class_;
+    _CP_OPT(Bool)			presentation_placeholder_;
+    _CP_OPT(Bool)			presentation_user_transformed_;
     
 };
 

ASCOfficeOdfFile/src/odf/draw_common.cpp

@@ -216,10 +216,10 @@ int Compute_BorderWidth(const graphic_format_properties & graphicProperties, Bor
 
     switch(borderSide)
     {
-    case sideTop:       borderValue = graphicProperties.common_border_attlist_.fo_border_top_; break;
-    case sideBottom:    borderValue = graphicProperties.common_border_attlist_.fo_border_bottom_; break;
-    case sideLeft:      borderValue = graphicProperties.common_border_attlist_.fo_border_left_; break;
-    case sideRight:     borderValue = graphicProperties.common_border_attlist_.fo_border_right_; break;    
+		case sideTop:       borderValue = graphicProperties.common_border_attlist_.fo_border_top_; break;
+		case sideBottom:    borderValue = graphicProperties.common_border_attlist_.fo_border_bottom_; break;
+		case sideLeft:      borderValue = graphicProperties.common_border_attlist_.fo_border_left_; break;
+		case sideRight:     borderValue = graphicProperties.common_border_attlist_.fo_border_right_; break;    
     }
 
     if (!borderValue)
@@ -281,14 +281,14 @@ void Compute_GradientFill(draw_gradient * image_style,oox::oox_gradient_fill_ptr
 			fill->style = 0;
 		
 			point.pos = 0;
-			if (image_style->draw_start_color_)point.color_ref = image_style->draw_start_color_->get_hex_value();
-			if (image_style->draw_start_intensity_)point.opacity = image_style->draw_start_intensity_->get_value();
+			if (image_style->draw_start_color_)		point.color_ref = image_style->draw_start_color_->get_hex_value();
+			if (image_style->draw_start_intensity_)	point.opacity	= image_style->draw_start_intensity_->get_value();
 
 			fill->colors.push_back(point);
 
 			point.pos = 100;
-			if (image_style->draw_end_color_)point.color_ref = image_style->draw_end_color_->get_hex_value();
-			if (image_style->draw_end_intensity_)point.opacity = image_style->draw_end_intensity_->get_value();
+			if (image_style->draw_end_color_)		point.color_ref = image_style->draw_end_color_->get_hex_value();
+			if (image_style->draw_end_intensity_)	point.opacity	= image_style->draw_end_intensity_->get_value();
 	
 			fill->colors.push_back(point);
 		}break;
@@ -297,20 +297,20 @@ void Compute_GradientFill(draw_gradient * image_style,oox::oox_gradient_fill_ptr
 			fill->style = 0;
 			
 			point.pos = 0;
-			if (image_style->draw_end_color_)point.color_ref = image_style->draw_end_color_->get_hex_value();
-			if (image_style->draw_end_intensity_)point.opacity = image_style->draw_end_intensity_->get_value();
+			if (image_style->draw_end_color_)		point.color_ref = image_style->draw_end_color_->get_hex_value();
+			if (image_style->draw_end_intensity_)	point.opacity	= image_style->draw_end_intensity_->get_value();
 	
 			fill->colors.push_back(point);
 
 			point.pos = 50;
-			if (image_style->draw_start_color_)point.color_ref = image_style->draw_start_color_->get_hex_value();
-			if (image_style->draw_start_intensity_)point.opacity = image_style->draw_start_intensity_->get_value();
+			if (image_style->draw_start_color_)		point.color_ref = image_style->draw_start_color_->get_hex_value();
+			if (image_style->draw_start_intensity_)	point.opacity	= image_style->draw_start_intensity_->get_value();
 
 			fill->colors.push_back(point);
 
 			point.pos = 100;
-			if (image_style->draw_end_color_)point.color_ref = image_style->draw_end_color_->get_hex_value();
-			if (image_style->draw_end_intensity_)point.opacity = image_style->draw_end_intensity_->get_value();
+			if (image_style->draw_end_color_)		point.color_ref = image_style->draw_end_color_->get_hex_value();
+			if (image_style->draw_end_intensity_)	point.opacity	= image_style->draw_end_intensity_->get_value();
 	
 			fill->colors.push_back(point);
 		}break;
@@ -319,41 +319,35 @@ void Compute_GradientFill(draw_gradient * image_style,oox::oox_gradient_fill_ptr
 	case gradient_style::square:
 	case gradient_style::rectangular:
 		{
-			if (style == gradient_style::radial || style == gradient_style::ellipsoid)	fill->style = 2;
+			if (style == gradient_style::radial ||
+				style == gradient_style::ellipsoid)		fill->style = 2;
 			if (style == gradient_style::square )		fill->style = 1;
 			if (style == gradient_style::rectangular)	fill->style = 3;
 			
 			point.pos = 0;
-			if (image_style->draw_end_color_)point.color_ref = image_style->draw_end_color_->get_hex_value();
-			if (image_style->draw_end_intensity_)point.opacity = image_style->draw_end_intensity_->get_value();
-
-			fill->colors.push_back(point);
-
-			point.pos = 100;
-			if (image_style->draw_start_color_)point.color_ref = image_style->draw_start_color_->get_hex_value();
-			if (image_style->draw_start_intensity_)point.opacity = image_style->draw_start_intensity_->get_value();
+			if (image_style->draw_start_color_)		point.color_ref = image_style->draw_start_color_->get_hex_value();
+			if (image_style->draw_start_intensity_)	point.opacity	= image_style->draw_start_intensity_->get_value();
 	
 			fill->colors.push_back(point);
 
-			if (image_style->draw_cx_)//хохма - у мс в конвертилке из open-office перепутаны l & r !!!
+			point.pos = 100;
+			if (image_style->draw_end_color_)		point.color_ref = image_style->draw_end_color_->get_hex_value();
+			if (image_style->draw_end_intensity_)	point.opacity	= image_style->draw_end_intensity_->get_value();
+
+			fill->colors.push_back(point);
+
+			fill->rect[0] = fill->rect[1] = 0;
+			fill->rect[2] = fill->rect[3] = 100;
+		
+			if (image_style->draw_cx_)
 			{
-				fill->rect[0]=image_style->draw_cx_->get_value();
-				fill->rect[2]=100-image_style->draw_cx_->get_value();
-			}
-			else
-			{
-				fill->rect[0]=0;
-				fill->rect[2]=100;
+				fill->rect[0] = 100 - image_style->draw_cx_->get_value();
+				fill->rect[2] = image_style->draw_cx_->get_value();
 			}
 			if (image_style->draw_cy_)
 			{
-				fill->rect[1]=image_style->draw_cy_->get_value();
-				fill->rect[3]=100-image_style->draw_cy_->get_value();
-			}
-			else
-			{
-				fill->rect[1]=0;
-				fill->rect[3]=100;
+				fill->rect[1] = 100 - image_style->draw_cy_->get_value();
+				fill->rect[3] = image_style->draw_cy_->get_value();
 			}
 		}break;
 	}
@@ -427,8 +421,14 @@ void Compute_GraphicFill(const common_draw_fill_attlist & props, const office_el
 				{
 					switch(image->style_repeat_->get_type())
 					{
-						case style_repeat::Repeat	:	fill.bitmap->bTile = true;		break;
-						case style_repeat::Stretch	:	fill.bitmap->bStretch = true;	break;
+						case style_repeat::Repeat	:	
+							fill.bitmap->bTile		= true;		
+							fill.bitmap->bStretch	= false;	
+						break;
+						case style_repeat::Stretch	:	
+							fill.bitmap->bStretch	= true;	
+							fill.bitmap->bTile		= false;  //?? для background точно выключать
+						break;
 					}
 				}
 				if (image->draw_opacity_) 
@@ -445,8 +445,14 @@ void Compute_GraphicFill(const common_draw_fill_attlist & props, const office_el
 		{
 			switch(props.style_repeat_->get_type())
 			{
-				case style_repeat::Repeat	:	fill.bitmap->bTile = true;		break;
-				case style_repeat::Stretch	:	fill.bitmap->bStretch = true;	break;
+				case style_repeat::Repeat	:	
+					fill.bitmap->bTile		= true;		
+					fill.bitmap->bStretch	= false;	
+				break;
+				case style_repeat::Stretch	:	
+					fill.bitmap->bStretch	= true;	
+					fill.bitmap->bTile		= false;
+				break;
 			}
 		}
 		else
@@ -660,7 +666,7 @@ void xlsx_convert_transforms(std::wstring transformStr, oox::xlsx_conversion_con
 	
 	boost::algorithm::split(transforms,transformStr, boost::algorithm::is_any_of(L")"), boost::algorithm::token_compress_on);
 	
-	for (int i = 0; i < transforms.size(); i++)
+	for (size_t i = 0; i < transforms.size(); i++)
 	{			
 		std::vector<std::wstring> transform;
 		boost::algorithm::split(transform, transforms[i], boost::algorithm::is_any_of(L"("), boost::algorithm::token_compress_on);

ASCOfficeOdfFile/src/odf/draw_frame.cpp

@@ -381,7 +381,7 @@ std::wstring draw_object::office_convert(odf_document * odfDocument, int type)
 		std::wstring temp_file = folderPath + FILE_SEPARATOR_STR + href_result;
 
 		COfficeUtils oCOfficeUtils(NULL);
-		oCOfficeUtils.CompressFileOrDirectory(objectOutPath.c_str(), temp_file.c_str(), -1);
+		oCOfficeUtils.CompressFileOrDirectory(objectOutPath.c_str(), temp_file.c_str(), true);
 	}	
     NSDirectory::DeleteDirectory(objectOutPath);
 	

ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp

@@ -592,7 +592,7 @@ int ComputeMarginY(const style_page_layout_properties_attlist		& pageProperties,
     _CP_OPT(vertical_pos) styleVerticallPos = graphicProperties.common_vertical_pos_attlist_.style_vertical_pos_;
 
 	_CP_OPT(double) dVal;	
-	if (GetProperty(additional, L"svg:translate_y", dVal));
+	GetProperty(additional, L"svg:translate_y", dVal);
  	
 	const _CP_OPT(length) translation		= length(dVal ? *dVal : 0, length::pt);
     const _CP_OPT(length) pageHeight		= pageProperties.fo_page_height_;        
@@ -893,17 +893,17 @@ void common_draw_docx_convert(oox::docx_conversion_context & Context, const unio
 
 	Compute_GraphicFill(graphicProperties.common_draw_fill_attlist_, graphicProperties.style_background_image_, Context.root()->odf_context().drawStyles() ,drawing->fill, bTxbx);	
 
-	if ((drawing->fill.bitmap) && (drawing->fill.bitmap->rId.length() < 1))
+	if ((drawing->fill.bitmap) && (drawing->fill.bitmap->rId.empty()))
 	{
 		std::wstring href = drawing->fill.bitmap->xlink_href_;
 		drawing->fill.bitmap->rId = Context.add_mediaitem(href, oox::typeImage, drawing->fill.bitmap->isInternal, href);
 	}
 
 ////////////////////////////////////////////////////
-	drawing->additional.push_back(odf_reader::_property(L"border_width_left",	Compute_BorderWidth(graphicProperties, sideLeft)));
+	drawing->additional.push_back(odf_reader::_property(L"border_width_left",		Compute_BorderWidth(graphicProperties, sideLeft)));
 	drawing->additional.push_back(odf_reader::_property(L"border_width_top",		Compute_BorderWidth(graphicProperties, sideTop)));
-	drawing->additional.push_back(odf_reader::_property(L"border_width_right",	Compute_BorderWidth(graphicProperties, sideRight)));
-	drawing->additional.push_back(odf_reader::_property(L"border_width_bottom",	Compute_BorderWidth(graphicProperties, sideBottom))); 
+	drawing->additional.push_back(odf_reader::_property(L"border_width_right",		Compute_BorderWidth(graphicProperties, sideRight)));
+	drawing->additional.push_back(odf_reader::_property(L"border_width_bottom",		Compute_BorderWidth(graphicProperties, sideBottom))); 
 	
 	if (graphicProperties.common_border_attlist_.fo_border_)
 	{
@@ -1111,7 +1111,7 @@ void draw_image::docx_convert(oox::docx_conversion_context & Context)
 	Context.set_run_state		(false);
 	Context.set_paragraph_state	(false);		
 
-	for (int i = 0; i < content_.size(); i++)
+	for (size_t i = 0; i < content_.size(); i++)
     {
         content_[i]->docx_convert(Context);
     }
@@ -1393,7 +1393,7 @@ void draw_frame::docx_convert(oox::docx_conversion_context & Context)
 	
 	common_draw_docx_convert(Context, common_draw_attlists_, drawing);
 	
-	for (int i = 0 ; i < content_.size(); i++)
+	for (size_t i = 0 ; i < content_.size(); i++)
     {
 		content_[i]->docx_convert(Context);
     }

ASCOfficeOdfFile/src/odf/draw_frame_pptx.cpp

@@ -71,14 +71,9 @@ namespace odf_reader {
 
 void draw_g::pptx_convert(oox::pptx_conversion_context & Context)
 {
-	int i=0;
-	int size = content_.size();
-	while(true)
-    {
-		if (i>=size)break;
-		office_element_ptr const & elm = content_[i];
-        elm->pptx_convert(Context);
-		i++;
+	for (size_t i = 0; i < content_.size(); i++)
+	{
+        content_[i]->pptx_convert(Context);
     }
 }
 void draw_frame::pptx_convert_placeHolder(oox::pptx_conversion_context & Context)
@@ -204,7 +199,7 @@ void draw_frame::pptx_convert(oox::pptx_conversion_context & Context)
 ////////////////////////////////////////////////
 	oox_drawing_ = oox_drawing_ptr(new oox::_pptx_drawing());
 
-	for (int i = 0; i < content_.size(); i++)
+	for (size_t i = 0; i < content_.size(); i++)
     {
         content_[i]->pptx_convert(Context);
     }
@@ -222,7 +217,7 @@ void draw_image::pptx_convert(oox::pptx_conversion_context & Context)
 ////////////////////////////////////в принципе достаточно общая часть ...	
 	Context.get_text_context().start_object();
 
-	for (int i = 0; i < content_.size(); i++)
+	for (size_t i = 0; i < content_.size(); i++)
     {
         content_[i]->pptx_convert(Context);
     }
@@ -238,7 +233,7 @@ void draw_chart::pptx_convert(oox::pptx_conversion_context & Context)
     const std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
 	Context.get_slide_context().set_chart(href);
 
-	for (int i = 0; i < content_.size(); i++)
+	for (size_t i = 0; i < content_.size(); i++)
     {
         content_[i]->pptx_convert(Context);
     }
@@ -249,7 +244,7 @@ void draw_text_box::pptx_convert(oox::pptx_conversion_context & Context)
 	Context.get_slide_context().set_text_box();	//rect с наваротами
 	Context.get_text_context().start_object();
 
-	for (int i = 0; i < content_.size(); i++)
+	for (size_t i = 0; i < content_.size(); i++)
     {
         content_[i]->pptx_convert(Context);
     }

ASCOfficeOdfFile/src/odf/draw_frame_xlsx.cpp

@@ -104,7 +104,7 @@ void draw_g::xlsx_convert(oox::xlsx_conversion_context & Context)
 	}
 ////////////////////////////////////////////////
 
-	for (int i = 0; i < content_.size(); i++)
+	for (size_t i = 0; i < content_.size(); i++)
     {
 		office_element_ptr const & elm = content_[i];
         elm->xlsx_convert(Context);
@@ -178,10 +178,10 @@ void draw_frame::xlsx_convert(oox::xlsx_conversion_context & Context)
 ////////////////////////////////////////////////////////////////////
 	properties.apply_to(Context.get_drawing_context().get_properties());
 
-	Context.get_drawing_context().set_property(odf_reader::_property(L"border_width_left",	Compute_BorderWidth(properties, sideLeft)));
-	Context.get_drawing_context().set_property(odf_reader::_property(L"border_width_top",	Compute_BorderWidth(properties, sideTop)));
-	Context.get_drawing_context().set_property(odf_reader::_property(L"border_width_right",Compute_BorderWidth(properties, sideRight)));
-	Context.get_drawing_context().set_property(odf_reader::_property(L"border_width_bottom", Compute_BorderWidth(properties, sideBottom))); 
+	Context.get_drawing_context().set_property(odf_reader::_property(L"border_width_left",		Compute_BorderWidth(properties, sideLeft)));
+	Context.get_drawing_context().set_property(odf_reader::_property(L"border_width_top",		Compute_BorderWidth(properties, sideTop)));
+	Context.get_drawing_context().set_property(odf_reader::_property(L"border_width_right",		Compute_BorderWidth(properties, sideRight)));
+	Context.get_drawing_context().set_property(odf_reader::_property(L"border_width_bottom",	Compute_BorderWidth(properties, sideBottom))); 
 	
 	if (properties.fo_clip_)
 	{
@@ -196,7 +196,7 @@ void draw_frame::xlsx_convert(oox::xlsx_conversion_context & Context)
 	oox_drawing_ = oox_drawing_ptr(new oox::_xlsx_drawing());
 
 ////////////////////////////////////////////////
-	for (int i = 0 ; i < content_.size(); i++)
+	for (size_t i = 0 ; i < content_.size(); i++)
     {
 		office_element_ptr const & elm = content_[i];
         elm->xlsx_convert(Context);
@@ -215,7 +215,7 @@ void draw_image::xlsx_convert(oox::xlsx_conversion_context & Context)
 ////////////////////////////////////в принципе достаточно общая часть ...
 	Context.get_text_context().start_drawing_content();//...  если в объекте есть текст он привяжется к объекту - иначе к ячейке
 
-	for (int i = 0 ; i < content_.size(); i++)
+	for (size_t i = 0 ; i < content_.size(); i++)
     {
 		content_[i]->xlsx_convert(Context);
     }
@@ -232,7 +232,7 @@ void draw_chart::xlsx_convert(oox::xlsx_conversion_context & Context)
     const std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
     Context.get_drawing_context().set_chart(href);
 
- 	for (int i = 0 ; i < content_.size(); i++)
+ 	for (size_t i = 0 ; i < content_.size(); i++)
     {
 		content_[i]->xlsx_convert(Context);
     }
@@ -243,7 +243,7 @@ void draw_text_box::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 	Context.get_text_context().start_drawing_content();
 
-	for (int i = 0 ; i < content_.size(); i++)
+	for (size_t i = 0 ; i < content_.size(); i++)
     {
 		content_[i]->xlsx_convert(Context);
     }

ASCOfficeOdfFile/src/odf/draw_shapes.cpp

@@ -47,11 +47,12 @@
 #include "serialize_elements.h"
 #include "style_graphic_properties.h"
 
+#include "odfcontext.h"
+
 #include "datatypes/length.h"
 #include "datatypes/borderstyle.h"
 
-#include "odfcontext.h"
-#include "../odf/svg_parser.h"
+#include "../docx/oox_drawing.h"
 
 namespace cpdoccore { 
 
@@ -235,14 +236,16 @@ void draw_path::reset_svg_path()
 	}
 	else
 	{
-		std::vector<svg_path::_polyline> o_Polyline_pt;
-		std::vector<svg_path::_polyline> o_Polyline_cm;
+		std::vector<::svg_path::_polyline> o_Polyline_pt;
+		std::vector<::svg_path::_polyline> o_Polyline_cm;
 	
-		bool res = svg_path::parseSvgD(o_Polyline_cm,draw_path_attlist_.svg_d_.get(),false);
+		bool res = ::svg_path::parseSvgD(o_Polyline_cm, draw_path_attlist_.svg_d_.get(), false);
 		
-		BOOST_FOREACH(svg_path::_polyline  & poly, o_Polyline_cm)
+		for (size_t i = 0; i < o_Polyline_cm.size(); i++)
 		{
-			for (long i=0;i<poly.points.size();i++)
+			::svg_path::_polyline  & poly = o_Polyline_cm[i];
+
+			for (size_t i = 0; i < poly.points.size(); i++)
 			{
 				if (poly.points[i].x)
 				{
@@ -259,7 +262,7 @@ void draw_path::reset_svg_path()
 		{
 			//сформируем xml-oox сдесь ... а то придется плодить массивы в drawing .. хоть и не красиво..
 			std::wstringstream output_;   
-            svg_path::oox_serialize(output_, o_Polyline_pt);
+            ::svg_path::oox_serialize(output_, o_Polyline_pt);
 			additional_.push_back(odf_reader::_property(L"custom_path",output_.str()));
 		}
 	}
@@ -295,14 +298,16 @@ void draw_polygon::reset_polygon_path()
 	}
 	else
 	{
-		std::vector<svg_path::_polyline> o_Polyline_pt;
-		std::vector<svg_path::_polyline> o_Polyline_cm;
+		std::vector<::svg_path::_polyline> o_Polyline_pt;
+		std::vector<::svg_path::_polyline> o_Polyline_cm;
 
-		bool res = svg_path::parsePolygon(o_Polyline_cm,draw_polygon_attlist_.draw_points_.get(),false, true);
+		bool res = ::svg_path::parsePolygon(o_Polyline_cm, draw_polygon_attlist_.draw_points_.get(),false, true);
 		
-		BOOST_FOREACH(svg_path::_polyline  & poly, o_Polyline_cm)
+		for (size_t ind = 0 ; ind < o_Polyline_cm.size(); ind++)
 		{
-			for (long i=0;i<poly.points.size();i++)
+			::svg_path::_polyline  & poly = o_Polyline_cm[ind];
+			
+			for (size_t i = 0; i < poly.points.size(); i++)
 			{
 				if (poly.points[i].x)
 				{
@@ -319,7 +324,7 @@ void draw_polygon::reset_polygon_path()
 		{
 			//сформируем xml-oox сдесь ... а то придется плодить массивы в drawing .. хоть и не красиво..
 			std::wstringstream output_;   
-            svg_path::oox_serialize(output_, o_Polyline_pt);
+            ::svg_path::oox_serialize(output_, o_Polyline_pt);
 			additional_.push_back(odf_reader::_property(L"custom_path",output_.str()));
 		}
 	}
@@ -351,28 +356,30 @@ void draw_polyline::reset_polyline_path()
 	}
 	else
 	{
-		std::vector<svg_path::_polyline> o_Polyline_pt;
-		std::vector<svg_path::_polyline> o_Polyline_cm;
+		std::vector<::svg_path::_polyline> o_Polyline_pt;
+		std::vector<::svg_path::_polyline> o_Polyline_cm;
 
-		bool res = svg_path::parsePolygon(o_Polyline_cm, draw_polyline_attlist_.draw_points_.get(), false, true);
+		bool res = ::svg_path::parsePolygon(o_Polyline_cm, draw_polyline_attlist_.draw_points_.get(), false, true);
 
 		_CP_OPT(double) start_x, start_y;
 		
-		BOOST_FOREACH(svg_path::_polyline  & poly, o_Polyline_cm)
+		for (size_t ind = 0 ; ind < o_Polyline_cm.size(); ind++)
 		{
-			for (long i=0;i<poly.points.size();i++)
+			::svg_path::_polyline  & poly = o_Polyline_cm[ind];
+			
+			for (size_t i = 0; i < poly.points.size(); i++)
 			{
 				if (poly.points[i].x)
 				{
 					if (!start_x)//вообщето это не верно .. но из за разных точек осей поворота фигура может "улететь"
-						start_x = length(poly.points[i].x.get()/1000.,length::cm).get_value_unit(length::emu); 
-					poly.points[i].x =  length(poly.points[i].x.get()/1000.,length::cm).get_value_unit(length::emu);// - *start_x; 
+						start_x = length(poly.points[i].x.get()/1000., length::cm).get_value_unit(length::emu); 
+					poly.points[i].x =  length(poly.points[i].x.get()/1000., length::cm).get_value_unit(length::emu);// - *start_x; 
 				}
 				if (poly.points[i].y)
 				{
 					if (!start_y)
-						start_y = length(poly.points[i].y.get()/1000.,length::cm).get_value_unit(length::emu); 
-					poly.points[i].y = length(poly.points[i].y.get()/1000.,length::cm).get_value_unit(length::emu);// - *start_y; 
+						start_y = length(poly.points[i].y.get()/1000., length::cm).get_value_unit(length::emu); 
+					poly.points[i].y = length(poly.points[i].y.get()/1000., length::cm).get_value_unit(length::emu);// - *start_y; 
 				}
 			}
 			o_Polyline_pt.push_back(poly);
@@ -381,8 +388,9 @@ void draw_polyline::reset_polyline_path()
 		{
 			//сформируем xml-oox сдесь ... а то придется плодить массивы в drawing .. хоть и не красиво..
 			std::wstringstream output_;   
-            svg_path::oox_serialize(output_, o_Polyline_pt);
-			additional_.push_back(odf_reader::_property(L"custom_path",output_.str()));
+            
+			::svg_path::oox_serialize(output_, o_Polyline_pt);
+			additional_.push_back(odf_reader::_property(L"custom_path", output_.str()));
 		}
 	}
 }
@@ -592,9 +600,9 @@ void draw_caption::add_attributes( const xml::attributes_wc_ptr & Attributes )
 /// draw-connector-attlist
 void draw_connector_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    CP_APPLY_ATTR(L"svg:d", svg_d_);
-    CP_APPLY_ATTR(L"svg:viewBox", svg_viewbox_);
-    CP_APPLY_ATTR(L"draw:type",draw_type_);
+    CP_APPLY_ATTR(L"svg:d",			svg_d_);
+    CP_APPLY_ATTR(L"svg:viewBox",	svg_viewbox_);
+    CP_APPLY_ATTR(L"draw:type",		draw_type_);
 
 }
 // draw:connector
@@ -618,35 +626,37 @@ void draw_connector::reset_svg_path()
 	}
 	else
 	{
-		std::vector<svg_path::_polyline> o_Polyline_pt;
-		std::vector<svg_path::_polyline> o_Polyline_cm;
+		std::vector<::svg_path::_polyline> o_Polyline_pt;
+		std::vector<::svg_path::_polyline> o_Polyline_cm;
 	
-		bool res = svg_path::parseSvgD(o_Polyline_cm,draw_connector_attlist_.svg_d_.get(),false);
+		bool res = ::svg_path::parseSvgD(o_Polyline_cm, draw_connector_attlist_.svg_d_.get(), false);
 	
 		double x1=common_draw_attlists_.position_.svg_x_.get_value_or(length(0)).get_value_unit(length::emu);
 		double y1=common_draw_attlists_.position_.svg_y_.get_value_or(length(0)).get_value_unit(length::emu);
 		
-		BOOST_FOREACH(svg_path::_polyline  & poly, o_Polyline_cm)
+		for (size_t ind = 0 ; ind < o_Polyline_cm.size(); ind++)
 		{
-			for (long i=0;i<poly.points.size();i++)
+			::svg_path::_polyline  & poly = o_Polyline_cm[ind];
+			
+			for (size_t i = 0; i < poly.points.size();i++)
 			{
 				if (poly.points[i].x)
 				{
-					poly.points[i].x =  length(poly.points[i].x.get()/1000.,length::cm).get_value_unit(length::emu) - x1; 
+					poly.points[i].x =  length(poly.points[i].x.get()/1000., length::cm).get_value_unit(length::emu) - x1; 
 				}
 				if (poly.points[i].y)
 				{
-					poly.points[i].y = length(poly.points[i].y.get()/1000.,length::cm).get_value_unit(length::emu) - y1; 
+					poly.points[i].y = length(poly.points[i].y.get()/1000., length::cm).get_value_unit(length::emu) - y1; 
 				}
 			}
 			o_Polyline_pt.push_back(poly);
 		}
-		if (o_Polyline_pt.size()>0)
+		if (o_Polyline_pt.size() > 0)
 		{
 			sub_type_ = 6;
 			//сформируем xml-oox сдесь ... а то придется плодить массивы в drawing .. хоть и не красиво..
 			std::wstringstream output_;   
-            svg_path::oox_serialize(output_, o_Polyline_pt);
+            ::svg_path::oox_serialize(output_, o_Polyline_pt);
 			additional_.push_back(odf_reader::_property(L"custom_path",output_.str()));
 		}
 	}

ASCOfficeOdfFile/src/odf/draw_shapes.h

@@ -40,8 +40,6 @@
 #include "datatypes/common_attlists.h"
 #include "../docx/xlsxconversioncontext.h"
 
-#include "svg_parser.h"
-
 namespace cpdoccore 
 {
 

ASCOfficeOdfFile/src/odf/draw_shapes_docx.cpp

@@ -45,7 +45,6 @@
 #include <cpdoccore/odf/odf_document.h>
 
 #include "serialize_elements.h"
-#include "../docx/xlsx_utils.h"
 #include "style_graphic_properties.h"
 
 #include "odfcontext.h"
@@ -53,6 +52,9 @@
 #include "datatypes/length.h"
 #include "datatypes/borderstyle.h"
 
+#include "../docx/xlsx_utils.h"
+#include "../docx/oox_drawing.h"
+
 namespace cpdoccore { 
 
 	using namespace odf_types;
@@ -260,13 +262,13 @@ void draw_enhanced_geometry::docx_convert(oox::docx_conversion_context & Context
 	
 	if (draw_enhanced_geometry_attlist_.draw_enhanced_path_)
 	{
-		std::vector<svg_path::_polyline> o_Polyline;
+		std::vector<::svg_path::_polyline> o_Polyline;
 	
 		bool res = false;
 		
 		try
 		{
-			res = svg_path::parseSvgD(o_Polyline, draw_enhanced_geometry_attlist_.draw_enhanced_path_.get(), true);
+			res = ::svg_path::parseSvgD(o_Polyline, draw_enhanced_geometry_attlist_.draw_enhanced_path_.get(), true);
 		}
 		catch(...)
 		{
@@ -277,7 +279,8 @@ void draw_enhanced_geometry::docx_convert(oox::docx_conversion_context & Context
 		{
 			//сформируем xml-oox сдесь ... а то придется плодить массивы в drawing .. хоть и не красиво..
 			std::wstringstream output_;   
-            svg_path::oox_serialize(output_, o_Polyline);
+            
+			::svg_path::oox_serialize(output_, o_Polyline);
 			shape->additional_.push_back(odf_reader::_property(L"custom_path", output_.str()));
 			
 			set_shape = true;

ASCOfficeOdfFile/src/odf/draw_shapes_pptx.cpp

@@ -53,7 +53,8 @@
 
 #include "odfcontext.h"
 #include "calcs_styles.h"
-#include "svg_parser.h"
+
+#include "../docx/oox_drawing.h"
 
 namespace cpdoccore { 
 
@@ -320,13 +321,13 @@ void draw_enhanced_geometry::pptx_convert(oox::pptx_conversion_context & Context
 
 	if (draw_enhanced_geometry_attlist_.draw_enhanced_path_)
 	{
-		std::vector<svg_path::_polyline> o_Polyline;
+		std::vector<::svg_path::_polyline> o_Polyline;
 	
 		bool res = false;
 		
 		try
 		{
-			res = svg_path::parseSvgD(o_Polyline, draw_enhanced_geometry_attlist_.draw_enhanced_path_.get(), true);
+			res = ::svg_path::parseSvgD(o_Polyline, draw_enhanced_geometry_attlist_.draw_enhanced_path_.get(), true);
 		}
 		catch(...)
 		{
@@ -337,7 +338,7 @@ void draw_enhanced_geometry::pptx_convert(oox::pptx_conversion_context & Context
 		{
 			//сформируем xml-oox сдесь ... а то придется плодить массивы в drawing .. хоть и не красиво..
 			std::wstringstream output_;   
-            svg_path::oox_serialize(output_, o_Polyline);
+            ::svg_path::oox_serialize(output_, o_Polyline);
 			Context.get_slide_context().set_property(odf_reader::_property(L"custom_path", output_.str()));
 
 			set_shape = true;

ASCOfficeOdfFile/src/odf/draw_shapes_xlsx.cpp

@@ -45,15 +45,16 @@
 #include <cpdoccore/odf/odf_document.h>
 
 #include "serialize_elements.h"
-#include "../docx/xlsx_utils.h"
 #include "style_graphic_properties.h"
 #include "odfcontext.h"
 #include "calcs_styles.h"
-#include "svg_parser.h"
 
 #include "datatypes/length.h"
 #include "datatypes/borderstyle.h"
 
+#include "../docx/xlsx_utils.h"
+#include "../docx/oox_drawing.h"
+
 namespace cpdoccore { 
 
 	using namespace odf_types;
@@ -274,13 +275,13 @@ void draw_enhanced_geometry::xlsx_convert(oox::xlsx_conversion_context & Context
 
 	if (draw_enhanced_geometry_attlist_.draw_enhanced_path_)
 	{
-		std::vector<svg_path::_polyline> o_Polyline;
+		std::vector<::svg_path::_polyline> o_Polyline;
 	
 		bool res = false;
 		
 		try
 		{
-			res = svg_path::parseSvgD(o_Polyline, draw_enhanced_geometry_attlist_.draw_enhanced_path_.get(), true);
+			res = ::svg_path::parseSvgD(o_Polyline, draw_enhanced_geometry_attlist_.draw_enhanced_path_.get(), true);
 		}
 		catch(...)
 		{
@@ -291,7 +292,7 @@ void draw_enhanced_geometry::xlsx_convert(oox::xlsx_conversion_context & Context
 		{
 			//сформируем xml-oox сдесь ... а то придется плодить массивы в drawing .. хоть и не красиво..
 			std::wstringstream output_;   
-            svg_path::oox_serialize(output_, o_Polyline);
+            ::svg_path::oox_serialize(output_, o_Polyline);
 			Context.get_drawing_context().set_property(odf_reader::_property(L"custom_path", output_.str()));
 
 			if (draw_enhanced_geometry_attlist_.drawooo_sub_view_size_)

ASCOfficeOdfFile/src/odf/math_elements.cpp

@@ -99,7 +99,7 @@ void math_semantics::add_child_element( xml::sax * Reader, const std::wstring &
 
 void math_semantics::oox_convert(oox::math_context & Context)
 {
-	for (int i = 0 ; i < content_.size(); i++)
+	for (size_t i = 0 ; i < content_.size(); i++)
     {
 		office_math_element* math_element = dynamic_cast<office_math_element*>(content_[i].get());
         math_element->oox_convert(Context);

ASCOfficeOdfFile/src/odf/math_layout_elements.cpp

@@ -193,7 +193,7 @@ void math_msqrt::oox_convert(oox::math_context & Context)
 		strm << L"<m:deg/>";
 		
 		strm << L"<m:e>";		
-			for (int i = 0 ; i < content_.size(); i++)
+			for (size_t i = 0 ; i < content_.size(); i++)
 			{
 				office_math_element* math_element = dynamic_cast<office_math_element*>(content_[i].get());
 				math_element->oox_convert(Context);
@@ -297,7 +297,7 @@ void math_mstyle::oox_convert(oox::math_context & Context)
 		}
 	}
 
-	for (int i = 0; i < content_.size(); i++)
+	for (size_t i = 0; i < content_.size(); i++)
 	{
 		office_math_element* math_element = dynamic_cast<office_math_element*>(content_[i].get());
 		math_element->oox_convert(Context);

ASCOfficeOdfFile/src/odf/math_table_elements.cpp

@@ -64,7 +64,7 @@ void math_mtable::oox_convert(oox::math_context & Context)
 	std::wostream & strm = Context.output_stream();
 	
 	strm << L"<m:m>";		
-		for (int i = 0; i < content_.size(); i++)
+		for (size_t i = 0; i < content_.size(); i++)
 		{
 			office_math_element* math_element = dynamic_cast<office_math_element*>(content_[i].get());
 			math_element->oox_convert(Context);
@@ -92,12 +92,12 @@ void math_mtr::oox_convert(oox::math_context & Context)
 	std::wostream & strm = Context.output_stream();
 
 	strm << L"<m:mr>";		
-		for (int i = 0; i < content_.size(); i++)
+		for (size_t i = 0; i < content_.size(); i++)
 		{
-		strm << L"<m:e>";
+		//strm << L"<m:e>"; // EqArray записался в числитель вместо знаменателя.docx - дублирование
 			office_math_element* math_element = dynamic_cast<office_math_element*>(content_[i].get());
 			math_element->oox_convert(Context);
-		strm << L"</m:e>";
+		//strm << L"</m:e>";
 		}
 	strm << L"</m:mr>";
 }
@@ -142,7 +142,7 @@ void math_mtd::oox_convert(oox::math_context & Context)
 	std::wostream & strm = Context.output_stream();
 
 	strm << L"<m:e>";		
-		for (int i = 0; i < content_.size(); i++)
+		for (size_t i = 0; i < content_.size(); i++)
 		{
 			office_math_element* math_element = dynamic_cast<office_math_element*>(content_[i].get());
 			math_element->oox_convert(Context);

ASCOfficeOdfFile/src/odf/odf_document_impl.cpp

@@ -187,8 +187,10 @@ void odf_document::Impl::parse_fonts()
             break;
         }
 
-        BOOST_FOREACH(office_element_ptr & elm, fontFaceDecls->style_font_face_)
-        {
+		for (size_t i = 0; i < fontFaceDecls->style_font_face_.size(); i++)
+		{
+			office_element_ptr & elm = fontFaceDecls->style_font_face_[i];
+
             style_font_face* fontFace = dynamic_cast<style_font_face*>( elm.get() );
             if (!fontFace)
             {
@@ -243,8 +245,10 @@ void odf_document::Impl::parse_manifests()
 	if (!document)return;
 
 	int res =-1;
-	BOOST_FOREACH(office_element_ptr & elm, document->manifests_)
-    {
+	for (size_t i = 0; i < document->manifests_.size(); i++)
+	{	
+		office_element_ptr & elm = document->manifests_[i];
+
 		manifest_entry * entry = dynamic_cast<manifest_entry *>(elm.get());
 		if (!entry)continue;
 
@@ -281,15 +285,18 @@ void odf_document::Impl::parse_settings()
 	office_settings * settings = dynamic_cast<office_settings*>(document->office_settings_.get());
 	if (!settings)	return;
 
-	BOOST_FOREACH(office_element_ptr & elm, settings->content_)
-    {
+	for (size_t i = 0; i < settings->content_.size(); i++)
+	{	
+		office_element_ptr & elm = settings->content_[i];
+
 		settings_config_item_set * item_set = dynamic_cast<settings_config_item_set *>(elm.get());
 		if (!item_set)continue;
 
 		if (item_set->config_name_ == L"ooo:configuration-settings")
 		{
-			BOOST_FOREACH(office_element_ptr & elm_sett, item_set->content_)
-			{		
+			for (size_t j = 0; j < item_set->content_.size(); j++)
+			{	
+				office_element_ptr & elm_sett = item_set->content_[j];
 				settings_config_item * sett = dynamic_cast<settings_config_item *>(elm_sett.get());
 				if (!sett)continue;
 
@@ -298,8 +305,10 @@ void odf_document::Impl::parse_settings()
 		}
 		else if (item_set->config_name_ == L"ooo:view-settings")
 		{
-			BOOST_FOREACH(office_element_ptr & elm_sett, item_set->content_)
-			{		
+			for (size_t j = 0; j < item_set->content_.size(); j++)
+			{	
+				office_element_ptr & elm_sett = item_set->content_[j];
+	
 				settings_config_item * sett = dynamic_cast<settings_config_item *>(elm_sett.get());
 				if (sett)
 					context_->Settings().add_view(sett->config_name_, sett->content_);
@@ -308,13 +317,13 @@ void odf_document::Impl::parse_settings()
 					settings_config_item_map_indexed *map_sett = dynamic_cast<settings_config_item_map_indexed *>(elm_sett.get());
 					if ((map_sett) && (map_sett->config_name_ == L"Views"))
 					{
-						for (int i = 0; i < map_sett->content_.size(); i++)
+						for (size_t i = 0; i < map_sett->content_.size(); i++)
 						{
 							settings_config_item_map_entry *entry = dynamic_cast<settings_config_item_map_entry *>(map_sett->content_[i].get());
 							if (!entry) continue;
 							
 							context_->Settings().start_view();
-							for (int j = 0; j < entry->content_.size(); j++)
+							for (size_t j = 0; j < entry->content_.size(); j++)
 							{
 								settings_config_item * sett = dynamic_cast<settings_config_item *>(entry->content_[j].get());
 								if (sett)
@@ -323,14 +332,14 @@ void odf_document::Impl::parse_settings()
 								settings_config_item_map_named *map_v = dynamic_cast<settings_config_item_map_named *>(entry->content_[j].get());
 								if (map_v)
 								{
-									for (int n = 0; n < map_v->content_.size(); n++)
+									for (size_t n = 0; n < map_v->content_.size(); n++)
 									{
 										settings_config_item_map_entry *entry_v = dynamic_cast<settings_config_item_map_entry *>(map_v->content_[n].get());
 										if (!entry_v) continue;
 										
 										context_->Settings().start_table_view(entry_v->config_name_);
 										
-										for (int k = 0; k < entry_v->content_.size(); k++)
+										for (size_t k = 0; k < entry_v->content_.size(); k++)
 										{
 											sett = dynamic_cast<settings_config_item *>(entry_v->content_[k].get());
 											if (sett)
@@ -378,9 +387,11 @@ void odf_document::Impl::parse_styles()
             }
 
             // parse page layout
-            BOOST_FOREACH(office_element_ptr & elm, automaticStyles->style_page_layout_)
-            {
-                style_page_layout * pageLayout = dynamic_cast<style_page_layout *>(elm.get());
+			for (size_t i = 0; i < automaticStyles->style_page_layout_.size(); i++)
+			{	
+				office_element_ptr & elm = automaticStyles->style_page_layout_[i];
+
+				style_page_layout * pageLayout = dynamic_cast<style_page_layout *>(elm.get());
                 if (!pageLayout)
                 {
                     _CP_LOG << L"[warning] error reading page layout\n";
@@ -390,9 +401,11 @@ void odf_document::Impl::parse_styles()
                 context_->pageLayoutContainer().add_page_layout(pageLayout);
             } // end parse page layout
 
-            BOOST_FOREACH(office_element_ptr & elm, automaticStyles->styles_.style_style_)
-            {
-                style * styleInst = dynamic_cast<style*>(elm.get());
+			for (size_t i = 0; i < automaticStyles->styles_.style_style_.size(); i++)
+			{	
+				office_element_ptr & elm = automaticStyles->styles_.style_style_[i];
+
+				style * styleInst = dynamic_cast<style*>(elm.get());
                 if (!styleInst)
                 {
                     _CP_LOG << L"[warning] error reading style\n";
@@ -412,9 +425,11 @@ void odf_document::Impl::parse_styles()
                     );
             }
             // list styles
-            BOOST_FOREACH(office_element_ptr & elm, automaticStyles->styles_.text_list_style_)
-            {
-                text_list_style * listStyle = dynamic_cast<text_list_style *>(elm.get());
+			for (size_t i = 0; i < automaticStyles->styles_.text_list_style_.size(); i++)
+			{	
+				office_element_ptr & elm = automaticStyles->styles_.text_list_style_[i];
+
+				text_list_style * listStyle = dynamic_cast<text_list_style *>(elm.get());
                 if (!listStyle)
                 {
                     _CP_LOG << L"[warning] error list style\n";
@@ -436,9 +451,11 @@ void odf_document::Impl::parse_styles()
                 break;
             }
 
-            BOOST_FOREACH(office_element_ptr & elm, masterStyles->style_master_page_)
-            {
-                style_master_page * masterPage = dynamic_cast<style_master_page *>(elm.get());
+			for (size_t i = 0; i < masterStyles->style_master_page_.size(); i++)
+			{	
+				office_element_ptr & elm = masterStyles->style_master_page_[i];
+
+				style_master_page * masterPage = dynamic_cast<style_master_page *>(elm.get());
                 if (!masterPage)
                 {
                     _CP_LOG << L"[warning] error reading master page\n";
@@ -464,9 +481,11 @@ void odf_document::Impl::parse_styles()
             }
 
             // default styles
-            BOOST_FOREACH(office_element_ptr & elm, docStyles->style_default_style_)
-            {
-                default_style * styleInst = dynamic_cast<default_style *>(elm.get());
+			for (size_t i = 0; i < docStyles->style_default_style_.size(); i++)
+			{	
+				office_element_ptr & elm = docStyles->style_default_style_[i];
+
+				default_style * styleInst = dynamic_cast<default_style *>(elm.get());
                 if (!styleInst)
                 {
                     _CP_LOG << L"[warning] error reading default style\n";
@@ -483,9 +502,11 @@ void odf_document::Impl::parse_styles()
                     L"",
                     L"");                                            
             }
-            BOOST_FOREACH(office_element_ptr & elm, docStyles->style_presentation_page_layout_)
-            {
-                style_presentation_page_layout * pageLayout = dynamic_cast<style_presentation_page_layout *>(elm.get());
+			for (size_t i = 0; i < docStyles->style_presentation_page_layout_.size(); i++)
+			{	
+				office_element_ptr & elm = docStyles->style_presentation_page_layout_[i];
+
+				style_presentation_page_layout * pageLayout = dynamic_cast<style_presentation_page_layout *>(elm.get());
 
                 if (!pageLayout)
                     continue;
@@ -494,9 +515,11 @@ void odf_document::Impl::parse_styles()
             }
         
             // common styles
-            BOOST_FOREACH(office_element_ptr & elm, docStyles->styles_.style_style_)
-            {
-                style * styleInst = dynamic_cast<style*>(elm.get());
+			for (size_t i = 0; i < docStyles->styles_.style_style_.size(); i++)
+			{	
+				office_element_ptr & elm = docStyles->styles_.style_style_[i];
+
+				style * styleInst = dynamic_cast<style*>(elm.get());
                 if (!styleInst)
                 {
                     _CP_LOG << L"[warning] error reading style\n";
@@ -519,8 +542,10 @@ void odf_document::Impl::parse_styles()
             }
 
             // list styles
-            BOOST_FOREACH(office_element_ptr & elm, docStyles->styles_.text_list_style_)
-            {
+			for (size_t i = 0; i < docStyles->styles_.text_list_style_.size(); i++)
+			{	
+				office_element_ptr & elm = docStyles->styles_.text_list_style_[i];
+
                 text_list_style * listStyle = dynamic_cast<text_list_style *>(elm.get());
                 if (!listStyle)
                 {
@@ -531,9 +556,11 @@ void odf_document::Impl::parse_styles()
                 context_->listStyleContainer().add_list_style(listStyle);
             }
 
-            BOOST_FOREACH(const office_element_ptr & elm, docStyles->text_notes_configuration_)
-            {
-                const text_notes_configuration * conf = dynamic_cast<const text_notes_configuration *>(elm.get());
+			for (size_t i = 0; i < docStyles->text_notes_configuration_.size(); i++)
+			{	
+				office_element_ptr & elm = docStyles->text_notes_configuration_[i];
+
+				const text_notes_configuration * conf = dynamic_cast<const text_notes_configuration *>(elm.get());
                 if (!conf)
                     continue;
                 
@@ -542,53 +569,65 @@ void odf_document::Impl::parse_styles()
                                 
             }
 
-            BOOST_FOREACH(const office_element_ptr & elm, docStyles->styles_.number_styles_)
-            {
-                const number_style_base * style = dynamic_cast<const number_style_base *>(elm.get());
+			for (size_t i = 0; i < docStyles->styles_.number_styles_.size(); i++)
+			{	
+				office_element_ptr & elm = docStyles->styles_.number_styles_[i];
+
+				const number_style_base * style = dynamic_cast<const number_style_base *>(elm.get());
 
                 if (!style)
                     continue;
 
                 context_->numberStyles().add(style->get_style_name(), elm);
             }
-           BOOST_FOREACH(const office_element_ptr & elm, docStyles->draw_styles_.draw_gradient_)
-            {
-                draw_gradient * style = dynamic_cast<draw_gradient *>(elm.get());
+			for (size_t i = 0; i < docStyles->draw_styles_.draw_gradient_.size(); i++)
+			{	
+				office_element_ptr & elm = docStyles->draw_styles_.draw_gradient_[i];
+
+				draw_gradient * style = dynamic_cast<draw_gradient *>(elm.get());
 
                 if (!style)
                     continue;
 
 				context_->drawStyles().add(L"gradient:" + style->get_style_name(), elm);
             }
-            BOOST_FOREACH(const office_element_ptr & elm, docStyles->draw_styles_.draw_fill_image_)
-            {
-                draw_fill_image * style = dynamic_cast<draw_fill_image *>(elm.get());
+			for (size_t i = 0; i < docStyles->draw_styles_.draw_fill_image_.size(); i++)
+			{	
+				office_element_ptr & elm = docStyles->draw_styles_.draw_fill_image_[i];
+
+				draw_fill_image * style = dynamic_cast<draw_fill_image *>(elm.get());
 
                 if (!style)
                     continue;
 
 				context_->drawStyles().add(L"bitmap:" + style->get_style_name(), elm);
             }
-			BOOST_FOREACH(const office_element_ptr & elm, docStyles->draw_styles_.draw_opacity_)
-            {
-                draw_opacity * style = dynamic_cast<draw_opacity *>(elm.get());
+			for (size_t i = 0; i < docStyles->draw_styles_.draw_opacity_.size(); i++)
+			{	
+				office_element_ptr & elm = docStyles->draw_styles_.draw_opacity_[i];
+
+				draw_opacity * style = dynamic_cast<draw_opacity *>(elm.get());
 
                 if (!style)
                     continue;
 
 				context_->drawStyles().add(L"opacity:" + style->get_style_name(), elm);
             }
-			BOOST_FOREACH(const office_element_ptr & elm, docStyles->draw_styles_.draw_hatch_)
-            {
-                draw_hatch * style = dynamic_cast<draw_hatch *>(elm.get());
+			for (size_t i = 0; i < docStyles->draw_styles_.draw_hatch_.size(); i++)
+			{	
+				office_element_ptr & elm = docStyles->draw_styles_.draw_hatch_[i];
+
+				draw_hatch * style = dynamic_cast<draw_hatch *>(elm.get());
 
                 if (!style)
                     continue;
 
 				context_->drawStyles().add(L"hatch:" + style->get_style_name(), elm);
             }
-            BOOST_FOREACH(const office_element_ptr & elm, docStyles->templates_.table_templates_)
-            {
+			for (size_t i = 0; i < docStyles->templates_.table_templates_.size(); i++)
+			{	
+				office_element_ptr & elm = docStyles->templates_.table_templates_[i];
+
 				table_table_template * style = dynamic_cast<table_table_template *>(elm.get());
 
                 if (!style)
@@ -626,9 +665,11 @@ void odf_document::Impl::parse_styles()
                 break;
             }
 
-            BOOST_FOREACH(office_element_ptr & elm, automaticStyles->styles_.style_style_)
-            {
-                style * styleInst = dynamic_cast<style*>(elm.get());
+			for (size_t i = 0; i < automaticStyles->styles_.style_style_.size(); i++)
+			{	
+				office_element_ptr & elm = automaticStyles->styles_.style_style_[i];
+
+				style * styleInst = dynamic_cast<style*>(elm.get());
                 if (!styleInst)
                 {
                     _CP_LOG << L"[warning] error reading style\n";
@@ -650,9 +691,11 @@ void odf_document::Impl::parse_styles()
                     );
             }
 
-            BOOST_FOREACH(office_element_ptr & elm, automaticStyles->styles_.text_list_style_)
-            {
-                text_list_style * listStyle = dynamic_cast<text_list_style *>(elm.get());
+			for (size_t i = 0; i < automaticStyles->styles_.text_list_style_.size(); i++)
+			{	
+				office_element_ptr & elm = automaticStyles->styles_.text_list_style_[i];
+
+				text_list_style * listStyle = dynamic_cast<text_list_style *>(elm.get());
                 if (!listStyle)
                 {
                     _CP_LOG << L"[warning] error reading list style\n";
@@ -662,9 +705,11 @@ void odf_document::Impl::parse_styles()
                 context_->listStyleContainer().add_list_style(listStyle);
             }
 
-            BOOST_FOREACH(const office_element_ptr & elm, automaticStyles->styles_.number_styles_)
-            {
-                const number_style_base * style = dynamic_cast<const number_style_base *>(elm.get());
+			for (size_t i = 0; i < automaticStyles->styles_.number_styles_.size(); i++)
+			{	
+				office_element_ptr & elm = automaticStyles->styles_.number_styles_[i];
+
+				const number_style_base * style = dynamic_cast<const number_style_base *>(elm.get());
 
                 if (!style)  continue;
 

ASCOfficeOdfFile/src/odf/odfcontext.cpp

@@ -223,8 +223,9 @@ void styles_container::add_master_page_name(const std::wstring & StyleName, cons
 std::pair<int,std::wstring> presentation_layouts_instance::add_or_find(const std::wstring & layout_name,const std::wstring & master_name)
 {
 	bool find = false;
-	int index =0;
-	for (index=0;index<content.size();index++)
+	size_t index =0;
+	
+	for (index = 0; index < content.size(); index++)
 	{
 		if (content[index].layout_name == layout_name && content[index].master_name == master_name)
 		{
@@ -250,8 +251,8 @@ std::pair<int,std::wstring> presentation_layouts_instance::add_or_find(const std
 std::pair<int,std::wstring> presentation_masters_instance::add_or_find(const std::wstring & master_name)
 {
 	bool find = false;
-	int index =0;
-	for (index=0;index<content.size();index++)
+	size_t  index =0;
+	for (index = 0; index < content.size(); index++)
 	{
 		if (content[index].master_name == master_name)
 		{
@@ -276,8 +277,8 @@ std::pair<int,std::wstring> presentation_masters_instance::add_or_find(const std
 void presentation_masters_instance::add_layout_to(const std::wstring & master_name, presentation_layouts_instance::_layout & layout)
 {
 	bool find = false;
-	int index =0;
-	for (index=0;index<content.size();index++)
+	size_t index = 0;
+	for (index = 0; index < content.size(); index++)
 	{
 		if (content[index].master_name == master_name)
 		{

ASCOfficeOdfFile/src/odf/office_body.cpp

@@ -41,7 +41,9 @@
 #include <cpdoccore/xml/attributes.h>
 
 #include <cpdoccore/odf/odf_document.h>
+
 #include "odfcontext.h"
+#include "draw_common.h"
 
 namespace cpdoccore { 
 
@@ -111,14 +113,29 @@ void office_body::docx_convert(oox::docx_conversion_context & Context)
 		Context.add_page_properties(L""); // 
 		Context.add_page_properties(L"");
 	}
-//backcolor (for all pages) 
+//background (for all pages) 
     if (page_layout_instance * firtsPageLayout = Context.root()->odf_context().pageLayoutContainer().page_layout_by_name(Context.get_page_properties()))
 	{
         if (style_page_layout_properties * prop = firtsPageLayout->properties())
 		{
-			if (prop->docx_back_serialize(Context.output_stream(), Context))
+			oox::_oox_fill fill;
+			
+			Compute_GraphicFill(prop->style_page_layout_properties_attlist_.common_draw_fill_attlist_, 
+								prop->style_page_layout_properties_elements_.style_background_image_, 
+								Context.root()->odf_context().drawStyles(), fill);
+
+			if (prop->style_page_layout_properties_attlist_.common_background_color_attlist_.fo_background_color_ || fill.type != 0)
 			{
-				Context.set_settings_property(odf_reader::_property(L"displayBackgroundShape",true));
+				if ((fill.bitmap) && (fill.bitmap->rId.empty()))
+				{
+					std::wstring href = fill.bitmap->xlink_href_;
+					fill.bitmap->rId = Context.add_mediaitem(href, oox::typeImage, fill.bitmap->isInternal, href);
+				}		
+				int id = Context.get_drawing_context().get_current_shape_id();
+				if (prop->docx_background_serialize(Context.output_stream(), Context, fill, id))
+				{
+					Context.set_settings_property(odf_reader::_property(L"displayBackgroundShape", true));
+				}
 			}
 		}
 	}

ASCOfficeOdfFile/src/odf/office_elements.h

@@ -57,7 +57,7 @@ class document_context;
 class office_element;
 typedef shared_ptr<office_element>::Type	office_element_ptr;
 typedef weak_ptr<office_element>::Type		office_element_weak_ptr;
-typedef std::vector<office_element_ptr>	office_element_ptr_array;
+typedef std::vector<office_element_ptr>		office_element_ptr_array;
 
 class office_element : public xml::element<wchar_t>,
     public common::read_doc_element,

ASCOfficeOdfFile/src/odf/style_graphic_properties.h

@@ -73,11 +73,11 @@ public:
 
 public:
     
-	_CP_OPT(odf_types::length_or_percent) fo_min_width_;
-    _CP_OPT(odf_types::length_or_percent) fo_min_height_;
+	_CP_OPT(odf_types::length_or_percent)	fo_min_width_;
+    _CP_OPT(odf_types::length_or_percent)	fo_min_height_;
     
-    _CP_OPT(odf_types::length_or_percent) fo_max_width_;
-    _CP_OPT(odf_types::length_or_percent) fo_max_height_;
+    _CP_OPT(odf_types::length_or_percent)	fo_max_width_;
+    _CP_OPT(odf_types::length_or_percent)	fo_max_height_;
 
 ///////////////////////////////
 	_CP_OPT(odf_types::color)				svg_stroke_color_;

ASCOfficeOdfFile/src/odf/style_paragraph_properties.h

@@ -98,17 +98,17 @@ private:
     virtual void add_text(const std::wstring & Text);
 
 private:
-    odf_types::length style_position_;
-    _CP_OPT(odf_types::style_type) style_type_;
-    _CP_OPT(wchar_t) style_char_;
+    odf_types::length						style_position_;
+    _CP_OPT(odf_types::style_type)			style_type_;
+    _CP_OPT(wchar_t)						style_char_;
 
-	_CP_OPT(odf_types::line_type) style_leader_type_;
-    _CP_OPT(odf_types::line_style) style_leader_style_;
-    _CP_OPT(odf_types::line_width) style_leader_width_;
-    _CP_OPT(odf_types::style_leader_color) style_leader_color_;
+	_CP_OPT(odf_types::line_type)			style_leader_type_;
+    _CP_OPT(odf_types::line_style)			style_leader_style_;
+    _CP_OPT(odf_types::line_width)			style_leader_width_;
+    _CP_OPT(odf_types::style_leader_color)	style_leader_color_;
 
-    _CP_OPT( std::wstring ) style_leader_text_;
-    _CP_OPT( odf_types::style_ref ) style_leader_text_style_;            
+    _CP_OPT( std::wstring )					style_leader_text_;
+    _CP_OPT( odf_types::style_ref )			style_leader_text_style_;            
 
 };
 

ASCOfficeOdfFile/src/odf/styles.cpp

@@ -54,7 +54,6 @@
 
 #include "serialize_elements.h"
 #include "odfcontext.h"
-
 #include "draw_common.h"
 
 namespace cpdoccore { 
@@ -904,12 +903,12 @@ void style_page_layout::add_child_element( xml::sax * Reader, const std::wstring
 // style-page-layout-properties-attlist
 void style_page_layout_properties_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    CP_APPLY_ATTR(L"fo:page-width", fo_page_width_);
-    CP_APPLY_ATTR(L"fo:page-height", fo_page_height_);
+    CP_APPLY_ATTR(L"fo:page-width",		fo_page_width_);
+    CP_APPLY_ATTR(L"fo:page-height",	fo_page_height_);
     common_num_format_attlist_.add_attributes(Attributes);
     common_num_format_prefix_suffix_attlist_.add_attributes(Attributes);
-    CP_APPLY_ATTR(L"style:paper-tray-name", style_paper_tray_name_);
-    CP_APPLY_ATTR(L"style:print-orientation", style_print_orientation_);
+    CP_APPLY_ATTR(L"style:paper-tray-name",		style_paper_tray_name_);
+    CP_APPLY_ATTR(L"style:print-orientation",	style_print_orientation_);
    
 	common_horizontal_margin_attlist_.add_attributes(Attributes);
     common_vertical_margin_attlist_.add_attributes(Attributes);
@@ -919,7 +918,8 @@ void style_page_layout_properties_attlist::add_attributes( const xml::attributes
     common_padding_attlist_.add_attributes(Attributes);
     common_shadow_attlist_.add_attributes(Attributes);
     common_background_color_attlist_.add_attributes(Attributes);
-    
+	common_draw_fill_attlist_.add_attributes(Attributes);
+
 	CP_APPLY_ATTR(L"style:register-truth-ref-style-name", style_register_truth_ref_style_name_);
     CP_APPLY_ATTR(L"style:print",					style_print_);
     CP_APPLY_ATTR(L"style:print-page-order",		style_print_page_order_);
@@ -1260,18 +1260,26 @@ void style_page_layout_properties::add_child_element( xml::sax * Reader, const s
 {
     style_page_layout_properties_elements_.add_child_element(Reader, Ns, Name, getContext());
 }
-bool style_page_layout_properties::docx_back_serialize(std::wostream & strm, oox::docx_conversion_context & Context)
-{
-	if (!style_page_layout_properties_attlist_.common_background_color_attlist_.fo_background_color_)return false;
 
-    if (style_page_layout_properties_attlist_.common_background_color_attlist_.fo_background_color_->get_type() == background_color::Transparent) return true;
+bool style_page_layout_properties::docx_background_serialize(std::wostream & strm, oox::docx_conversion_context & Context, oox::_oox_fill & fill, int id)
+{
+	if (style_page_layout_properties_attlist_.common_background_color_attlist_.fo_background_color_ && 
+		style_page_layout_properties_attlist_.common_background_color_attlist_.fo_background_color_->get_type() == background_color::Transparent)
+		return true; //??
     //прозрачный фон
+	
 	CP_XML_WRITER(strm)
 	{
 		CP_XML_NODE(L"w:background")
 		{
-			std::wstring color = style_page_layout_properties_attlist_.common_background_color_attlist_.fo_background_color_->get_color().get_hex_value();
-			CP_XML_ATTR(L"w:color",color);
+			std::wstring color = L"ffffff";
+			
+			if (style_page_layout_properties_attlist_.common_background_color_attlist_.fo_background_color_)
+				color = style_page_layout_properties_attlist_.common_background_color_attlist_.fo_background_color_->get_color().get_hex_value();
+			
+			CP_XML_ATTR(L"w:color", color);
+
+			oox::vml_serialize_background(CP_XML_STREAM(), fill, color, id);
 		}
 	}
 	return true;
@@ -1556,7 +1564,7 @@ void header_footer_impl::docx_convert(oox::docx_conversion_context & Context)
 	if (content_.header_footer_content_.tracked_changes_)
 		content_.header_footer_content_.tracked_changes_->docx_convert(Context);
 
-    for (int i=0; i < content_.header_footer_content_.content_.size(); i++)
+    for (size_t i = 0; i < content_.header_footer_content_.content_.size(); i++)
     {
         content_.header_footer_content_.content_[i]->docx_convert(Context);
     }

ASCOfficeOdfFile/src/odf/styles.h

@@ -892,54 +892,26 @@ public:
     odf_types::common_padding_attlist			common_padding_attlist_;
     odf_types::common_shadow_attlist			common_shadow_attlist_;
     
-    // 15.2.10 
-    odf_types::common_background_color_attlist common_background_color_attlist_;
-    // 15.2.12
-    _CP_OPT(odf_types::style_ref) style_register_truth_ref_style_name_;
-    // 15.2.13 TODO
-    _CP_OPT(std::wstring) style_print_;
-        
-    // 15.2.14
-    _CP_OPT(odf_types::direction) style_print_page_order_;
-
-    // 15.2.15 TODO
-    _CP_OPT(std::wstring) style_first_page_number_;
-
-    // 15.2.16
-    _CP_OPT(odf_types::percent) style_scale_to_;
-    _CP_OPT(unsigned int) style_scale_to_pages_;
-
-    // 15.2.17
-    _CP_OPT(odf_types::table_centering) style_table_centering_;
-    // 15.2.18
-    _CP_OPT(odf_types::length) style_footnote_max_height_;
-
-    // 15.2.19
-    odf_types::common_writing_mode_attlist common_writing_mode_attlist_;
-
-    // 15.2.21
-    _CP_OPT(odf_types::layout_grid_mode) style_layout_grid_mode_;
-
-    // 15.2.22
-    _CP_OPT(odf_types::length) style_layout_grid_base_height_;
-
-    // 15.2.23
-    _CP_OPT(odf_types::length) style_layout_grid_ruby_height_;
-
-    // 15.2.24
-    _CP_OPT(unsigned int) style_layout_grid_lines_;
-
-    // 15.2.25
-    _CP_OPT(odf_types::color) style_layout_grid_color_;
-
-    // 15.2.26
-    _CP_OPT(bool) style_layout_grid_ruby_below_;  
-
-    // 15.2.27
-    _CP_OPT(bool) style_layout_grid_print_;
-
-    // 15.2.28
-    _CP_OPT(bool) style_layout_grid_display_;
+    odf_types::common_background_color_attlist	common_background_color_attlist_;
+ 	odf_types::common_draw_fill_attlist			common_draw_fill_attlist_;
+  
+	_CP_OPT(odf_types::style_ref)			style_register_truth_ref_style_name_;
+    _CP_OPT(std::wstring)					style_print_;
+    _CP_OPT(odf_types::direction)			style_print_page_order_;
+    _CP_OPT(std::wstring)					style_first_page_number_;
+    _CP_OPT(odf_types::percent)				style_scale_to_;
+    _CP_OPT(unsigned int)					style_scale_to_pages_;
+    _CP_OPT(odf_types::table_centering)		style_table_centering_;
+    _CP_OPT(odf_types::length)				style_footnote_max_height_;
+    odf_types::common_writing_mode_attlist	common_writing_mode_attlist_;
+    _CP_OPT(odf_types::layout_grid_mode)	style_layout_grid_mode_;
+    _CP_OPT(odf_types::length)				style_layout_grid_base_height_;
+    _CP_OPT(odf_types::length)				style_layout_grid_ruby_height_;
+    _CP_OPT(unsigned int)					style_layout_grid_lines_;
+    _CP_OPT(odf_types::color)				style_layout_grid_color_;
+    _CP_OPT(bool)							style_layout_grid_ruby_below_;  
+	_CP_OPT(bool)							style_layout_grid_print_;
+    _CP_OPT(bool)							style_layout_grid_display_;
 
 };
 
@@ -992,7 +964,7 @@ public:
 
 };
 
-//          style:page-layout-properties
+// style:page-layout-properties
 class style_page_layout_properties : public office_element_impl<style_page_layout_properties>
 {
 public:
@@ -1005,7 +977,7 @@ public:
     void docx_convert_serialize(std::wostream & strm, oox::docx_conversion_context & Context);
     void pptx_convert(oox::pptx_conversion_context & Context);
     
-	bool docx_back_serialize(std::wostream & strm, oox::docx_conversion_context & Context);
+	bool docx_background_serialize(std::wostream & strm, oox::docx_conversion_context & Context, oox::_oox_fill & fill, int id);
 
     style_page_layout_properties() { }
 
@@ -1020,7 +992,7 @@ private:
 
 CP_REGISTER_OFFICE_ELEMENT2(style_page_layout_properties);
 
-//          text:notes-configuration
+// text:notes-configuration
 class text_notes_configuration : public office_element_impl<text_notes_configuration>
 {
 public:

ASCOfficeOdfFile/src/odf/svg_parser.cpp

@@ -35,8 +35,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
-namespace cpdoccore 
-{ 
 namespace svg_path
 {
     void skipSpaces(int& io_rPos, const std::wstring& rStr, const int nLen)
@@ -69,7 +67,7 @@ namespace svg_path
 		return isOnNumberChar(rStr[nPos],bSignAllowed);
 	}
 
-	bool getDoubleChar(double&  o_fRetval,int &  io_rPos, const std::wstring&      rStr)
+	bool getDoubleChar(double&  o_fRetval,int &  io_rPos, const std::wstring& rStr)
 	{
 		wchar_t aChar( rStr[io_rPos] );
 		std::wstring  sNumberString;
@@ -121,7 +119,7 @@ namespace svg_path
 		return false;
 	}
 
-	bool importDoubleAndSpaces( double&             o_fRetval, int&          io_rPos, const std::wstring&     rStr, const int    nLen )
+	bool importDoubleAndSpaces( double& o_fRetval, int& io_rPos, const std::wstring& rStr, const int nLen )
 	{
 		if( !getDoubleChar(o_fRetval, io_rPos, rStr) )
 			return false;
@@ -131,7 +129,7 @@ namespace svg_path
 		return true;
 	}
 
-	bool importFlagAndSpaces(int&         o_nRetval, int&         io_rPos, const std::wstring&    rStr, const int    nLen)
+	bool importFlagAndSpaces(int& o_nRetval, int& io_rPos, const std::wstring& rStr, const int nLen)
 	{
 		wchar_t aChar( rStr[io_rPos] );
 
@@ -181,7 +179,6 @@ namespace svg_path
 		return bUseRelativeCoordinates ? cLowerCaseCommand : cUpperCaseCommand;
 	}
 
-
 	bool parseSvgD(std::vector<_polyline> & Polyline, const std::wstring &  rSvgDStatement, bool bWrongPositionAfterZ)
     {
         Polyline.clear();
@@ -808,6 +805,152 @@ namespace svg_path
     }
 
 
-}
+	bool parseVml(std::vector<_polyline> & Polyline, const std::wstring &  rSvgDStatement)
+	{
+        Polyline.clear();
+        const int nLen(rSvgDStatement.length());
+        int nPos(0);
+        bool bIsClosed(false);
+        
+		double nLastX( 0.0 );
+        double nLastY( 0.0 );
+		
+		double nLastControlX( 0.0 );
+ 		double nLastControlY( 0.0 );
+		
+		_polyline aCurrPoly;
+
+        skipSpaces(nPos, rSvgDStatement, nLen);
+
+        while(nPos < nLen)
+        {
+            bool bRelative	(false);
+            bool bMoveTo	(false);
+            const wchar_t aCurrChar(rSvgDStatement[nPos]);
+
+			aCurrPoly.command.clear();
+
+            switch(aCurrChar)
+            {
+                case 'x' :
+                {
+                    nPos++;
+                    bIsClosed = true;
+
+                } break;
+                case 'm' :
+                case 't' :
+                {
+                    bMoveTo = true;
+                }
+                case 'l' :
+                case 'r' :
+                {
+                    if('t' == aCurrChar || 'r' == aCurrChar)
+                    {
+                        bRelative = true;
+                    }
+					
+                    if(aCurrPoly.points.size() > 0)
+                    {
+                        if(bIsClosed)
+                        {
+                        }
+                        Polyline.push_back(aCurrPoly);
+
+                        bIsClosed = false;
+						
+						if(bMoveTo)	aCurrPoly.command = L"m";
+						else		aCurrPoly.command = L"l";
+						
+						aCurrPoly.points.clear();
+                    }
+                    nPos++;
+                    skipSpaces(nPos, rSvgDStatement, nLen);
+					aCurrPoly.command.clear();
+
+                    while(nPos < nLen && isOnNumberChar(rSvgDStatement, nPos))
+                    {
+                        double nX, nY;
+
+                        if(!importDoubleAndSpaces(nX, nPos, rSvgDStatement, nLen)) return false;
+                        if(!importDoubleAndSpaces(nY, nPos, rSvgDStatement, nLen)) return false;
+
+                        if(bRelative)
+                        {
+                            nX += nLastX;
+                            nY += nLastY;
+                        }
+
+                        nLastX = nX;
+                        nLastY = nY;
+
+ 						if(bMoveTo)	aCurrPoly.command = L"m";
+						else		aCurrPoly.command = L"l";
+						
+						aCurrPoly.points.push_back(_point(nX, nY));
+                        Polyline.push_back(aCurrPoly);
+						aCurrPoly.points.clear();   
+					}    
+                }break;
+
+				case 'v' :
+					bRelative = true;
+				case 'c' :
+                {
+                    nPos++;
+                    skipSpaces(nPos, rSvgDStatement, nLen);
+
+                    while(nPos < nLen && isOnNumberChar(rSvgDStatement, nPos))
+                    {
+                        double nX, nY;
+                        double nX1, nY1;
+                        double nX2, nY2;
+
+						if(!importDoubleAndSpaces(nX1, nPos, rSvgDStatement, nLen))	return false;
+                        if(!importDoubleAndSpaces(nY1, nPos, rSvgDStatement, nLen))	return false;
+                        if(!importDoubleAndSpaces(nX2, nPos, rSvgDStatement, nLen))	return false;
+                        if(!importDoubleAndSpaces(nY2, nPos, rSvgDStatement, nLen))	return false;
+                        if(!importDoubleAndSpaces(nX, nPos, rSvgDStatement, nLen))	return false;
+                        if(!importDoubleAndSpaces(nY, nPos, rSvgDStatement, nLen))	return false;
+
+                        if(bRelative)
+                        {
+                            nX1 += nLastX;
+                            nY1 += nLastY;
+                            nX2 += nLastX;
+                            nY2 += nLastY;
+                            nX += nLastX;
+                            nY += nLastY;
+                        }
+						aCurrPoly.command = L"c";
+
+						aCurrPoly.points.push_back(_point(nX1, nY1));
+						aCurrPoly.points.push_back(_point(nX2, nY2));
+						aCurrPoly.points.push_back(_point(nX, nY));
+
+                        Polyline.push_back(aCurrPoly);
+						aCurrPoly.points.clear();   
+
+                        nLastX = nX;
+                        nLastY = nY;
+
+						nLastControlX = nX2;
+						nLastControlY = nY2;
+                    }                    
+                }break;
+
+                 default:
+                {
+                     ++nPos;
+                    break;
+                }
+            }
+        }
+        return true;
+    }
+
+
+
 }
 

ASCOfficeOdfFile/src/odf/svg_parser.h

@@ -39,10 +39,7 @@
 #include <boost/foreach.hpp>
 #include <boost/regex.hpp>
 
-#include <cpdoccore/CPOptional.h>
-
-namespace cpdoccore 
-{ 
+#include "../../include/cpdoccore/CPOptional.h"
 
 namespace svg_path
 {
@@ -60,23 +57,10 @@ namespace svg_path
 		std::vector<_point> points; //будем бить строку пути по количеству точек в буковках
 
 	};
-	//m - 1 point
-	//c - 3 point
-	//s - 2 point
-	//l - 1 point
-	//z - finish
-	//h - 0.5 point :)
-	//v - 0.5 point
-	//q - 2 point
-	//t - 1 point
-	//a - [[[[
-    void oox_serialize(std::wostream & _Wostream, _point const & val);
-    void oox_serialize(std::wostream & _Wostream, _polyline const & val);
-    void oox_serialize(std::wostream & _Wostream, std::vector<svg_path::_polyline> & path);
 
-	bool parseSvgD(std::vector<_polyline> & Polyline, const std::wstring &  rSvgDStatement, bool bWrongPositionAfterZ);
-	bool parsePolygon(std::vector<_polyline> & Polyline, const std::wstring &  rPolygonStatement, bool bWrongPositionAfterZ, bool closed);
-
-}
+	bool parseVml(std::vector<_polyline> & Polyline, const std::wstring &  path);
+	bool parseSvgD(std::vector<_polyline> & Polyline, const std::wstring &  path, bool bWrongPositionAfterZ);
+	bool parsePolygon(std::vector<_polyline> & Polyline, const std::wstring &  path, bool bWrongPositionAfterZ, bool closed);
 }
 
+

ASCOfficeOdfFile/src/odf/table.cpp

@@ -640,14 +640,14 @@ const wchar_t * table_shapes::name = L"shapes";
 
 void table_shapes::docx_convert(oox::docx_conversion_context & Context)
 {
-	for (int i = 0 ; i < content_.size(); i++)
+	for (size_t i = 0 ; i < content_.size(); i++)
 	{
         content_[i]->docx_convert(Context);
     }
 }
 void table_shapes::pptx_convert(oox::pptx_conversion_context & Context)
 {
-	for (int i = 0 ; i < content_.size(); i++)
+	for (size_t i = 0 ; i < content_.size(); i++)
 	{
         content_[i]->pptx_convert(Context);
     }
@@ -655,7 +655,7 @@ void table_shapes::pptx_convert(oox::pptx_conversion_context & Context)
 
 void table_shapes::xlsx_convert(oox::xlsx_conversion_context & Context) 
 {
-	for (int i = 0 ; i < content_.size(); i++)
+	for (size_t i = 0 ; i < content_.size(); i++)
 	{
 		content_[i]->xlsx_convert(Context);
     }

ASCOfficeOdfFile/src/odf/table_database_ranges.cpp

@@ -60,7 +60,7 @@ void table_database_ranges::add_child_element( xml::sax * Reader, const std::wst
 
 void table_database_ranges::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-	for (int i = 0; i < content_.size(); i++)
+	for (size_t i = 0; i < content_.size(); i++)
 	{
 		content_[i]->xlsx_convert(Context);
 	}
@@ -101,7 +101,7 @@ void table_database_range::xlsx_convert(oox::xlsx_conversion_context & Context)
 	if (table_contains_header_)
 		Context.get_table_context().set_database_header(table_contains_header_->get());
 
-	for (int i = 0; i < content_.size(); i++)
+	for (size_t i = 0; i < content_.size(); i++)
 	{
 		content_[i]->xlsx_convert(Context);
 	}
@@ -124,7 +124,7 @@ void table_sort::add_child_element( xml::sax * Reader, const std::wstring & Ns,
 
 void table_sort::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-	for (int i = 0; i < table_sort_by_.size(); i++)
+	for (size_t i = 0; i < table_sort_by_.size(); i++)
 	{
 		table_sort_by * sort_by = dynamic_cast<table_sort_by*>(table_sort_by_[i].get());
 

ASCOfficeOdfFile/src/odf/table_xlsx.cpp

@@ -67,7 +67,7 @@ int table_table_cell_content::xlsx_convert(oox::xlsx_conversion_context & Contex
     Context.get_table_context().start_cell_content();
 	Context.get_text_context().set_cell_text_properties(text_properties);
     
-	for (int i = 0 ; i < elements_.size(); i++)
+	for (size_t i = 0 ; i < elements_.size(); i++)
     {
         elements_[i]->xlsx_convert(Context);
     }
@@ -191,7 +191,7 @@ void table_table_row::xlsx_convert(oox::xlsx_conversion_context & Context)
 
                     CP_XML_STREAM();
 
-					for (int i = 0 ; i < content_.size(); i++)
+					for (size_t i = 0 ; i < content_.size(); i++)
                     {
 						office_element_ptr & elm = content_[i];
 
@@ -233,7 +233,7 @@ void table_table_row::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 void table_table_rows::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-   	for (int i = 0; i < table_table_row_.size(); i++)
+   	for (size_t i = 0; i < table_table_row_.size(); i++)
 	{
         table_table_row_[i]->xlsx_convert(Context);
     }
@@ -241,7 +241,7 @@ void table_table_rows::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 void table_table_header_rows::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-   	for (int i = 0; i < table_table_row_.size(); i++)
+   	for (size_t i = 0; i < table_table_row_.size(); i++)
 	{
         table_table_row_[i]->xlsx_convert(Context);
     }
@@ -274,7 +274,7 @@ void table_rows::xlsx_convert(oox::xlsx_conversion_context & Context)
 			}
 
 		}
-   		for (int i = 0; i < table_table_row_.size(); i++)
+   		for (size_t i = 0; i < table_table_row_.size(); i++)
         {
             table_table_row_[i]->xlsx_convert(Context);
         }
@@ -293,7 +293,7 @@ void table_rows_no_group::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 void table_rows_and_groups::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
- 	for (int i = 0; i < content_.size(); i++)
+ 	for (size_t i = 0; i < content_.size(); i++)
     {
         content_[i]->xlsx_convert(Context);
     }
@@ -336,7 +336,7 @@ void table_table::xlsx_convert(oox::xlsx_conversion_context & Context)
  	if (conditional_formats_)
 		conditional_formats_->xlsx_convert(Context);
 
-	for (int i = 0 ; i < table_named_.size(); i++)
+	for (size_t i = 0 ; i < table_named_.size(); i++)
 	{
 		table_named_[i]->xlsx_convert(Context);
 	}
@@ -349,7 +349,7 @@ void table_columns::xlsx_convert(oox::xlsx_conversion_context & Context)
     if (table_table_columns_)
         table_table_columns_->xlsx_convert(Context);
 
-  	for (int i = 0; i < table_table_column_.size(); i++)
+  	for (size_t i = 0; i < table_table_column_.size(); i++)
     {
         table_table_column_[i]->xlsx_convert(Context);
     }
@@ -374,7 +374,7 @@ void table_columns_and_groups::xlsx_convert(oox::xlsx_conversion_context & Conte
         table_columns_no_group_.xlsx_convert(Context);
     */
 
-  	for (int i = 0; i < content_.size(); i++)
+  	for (size_t i = 0; i < content_.size(); i++)
     {
 		office_element_ptr & elm = content_[i];
         elm->xlsx_convert(Context);
@@ -383,7 +383,7 @@ void table_columns_and_groups::xlsx_convert(oox::xlsx_conversion_context & Conte
 
 void table_table_header_columns::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-  	for (int i = 0; i < table_table_column_.size(); i++)
+  	for (size_t i = 0; i < table_table_column_.size(); i++)
     {
         table_table_column_[i]->xlsx_convert(Context);
     }