x2t - delete unused files

ASCOfficeDocFile/DocxDocConverter/OfficeArt/BlipFactory.cpp

-/*
- * (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;
-	}
-}
\ No newline at end of file

ASCOfficeDocFile/DocxDocConverter/ShapePath.cpp

-/*
- * (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;
-	}
-}
\ No newline at end of file

ASCOfficeDocxFile2/ASCOfficeDocxFile2.cpp

-/*
- * (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") ];
\ No newline at end of file

ASCOfficeDocxFile2/ASCOfficeDocxFile2.rc

-// 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

-HKCR
-{
-	NoRemove AppID
-	{
-		'%APPID%' = s 'ASCOfficeDocxFile2'
-		'ASCOfficeDocxFile2.DLL'
-		{
-			val AppID = s '%APPID%'
-		}
-	}
-}

ASCOfficeDocxFile2/ASCOfficeDocxFile2.sln

-
-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.filters

-<?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>
\ No newline at end of file

ASCOfficeDocxFile2/ASCOfficeDocxFile2_2013.sln

-
-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/DocxFile2.h

-/*
- * (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:
-};
\ No newline at end of file

ASCOfficeDocxFile2/dlldata.c

-/*********************************************************
-   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 */

ASCOfficeOdfFileW/source/OdfFormat/odt_conversion_context.cpp

@@ -448,7 +448,7 @@ void odt_conversion_context::set_master_page_name(std::wstring master_name)
 int odt_conversion_context::get_current_section_columns()
 {
 	if (sections_.size() > 0)
-		sections_.back().count_columns;
+		return sections_.back().count_columns;
 	else return 1;
 }
 void odt_conversion_context::add_section(bool continuous)