Merge branch 'hotfix/v.4.2.6' into develop

add bin2imageBase64 to generate thumbnail from pdf command in base64 format

ASCOfficeDocFile/DocDocxConverter/PropertiesMapping.cpp

@@ -35,7 +35,7 @@
 namespace DocFileFormat
 {
 	std::map<unsigned char, std::wstring>	PropertiesMapping::brcTypeMap;
-	ASCOfficeCriticalSection				PropertiesMapping::brcTypeMapLock;
+	OfficeCriticalSection				PropertiesMapping::brcTypeMapLock;
 	
 	void PropertiesMapping::init()
 	{

ASCOfficeDocFile/DocDocxConverter/PropertiesMapping.h

@@ -40,7 +40,7 @@
 #include "SinglePropertyModifier.h"
 
 
-#include "../Win32/ASCOfficeCriticalSection.h" //for linux make inside
+#include "../../OfficeUtils/src/ASCOfficeCriticalSection.h" //for linux make inside
 
 namespace DocFileFormat
 {
@@ -76,6 +76,6 @@ namespace DocFileFormat
 		XMLTools::CStringXmlWriter* m_pXmlWriter;
 
 		static std::map<unsigned char, std::wstring>	brcTypeMap;		
-		static ASCOfficeCriticalSection					brcTypeMapLock;
+		static OfficeCriticalSection					brcTypeMapLock;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/StyleSheetMapping.cpp

@@ -36,7 +36,7 @@
 namespace DocFileFormat
 {
 	std::map<std::wstring, std::wstring>	StyleSheetMapping::m_mapStyleId;
-	ASCOfficeCriticalSection				StyleSheetMapping::m_mapStyleIdLock;
+	OfficeCriticalSection				StyleSheetMapping::m_mapStyleIdLock;
 
 	StyleSheetMapping::StyleSheetMapping( ConversionContext* ctx ) : AbstractOpenXmlMapping( new XMLTools::CStringXmlWriter() )
 	{

ASCOfficeDocFile/DocDocxConverter/StyleSheetMapping.h

@@ -55,7 +55,7 @@ namespace DocFileFormat
 		/// Generates a style id for custom style names or returns the build-in identifier for build-in styles.
 		static std::wstring MakeStyleId( StyleSheetDescription* std );
 		static std::map<std::wstring, std::wstring> m_mapStyleId;
-		static ASCOfficeCriticalSection m_mapStyleIdLock;
+		static OfficeCriticalSection m_mapStyleIdLock;
 		virtual ~StyleSheetMapping();
 
 	private:

ASCOfficeDocFile/DocFormatTest/DocFormatTest.vcproj

@@ -382,10 +382,6 @@
 			RelativePath="..\..\Common\FileDownloader\FileDownloader_win.cpp"
 			>
 		</File>
-		<File
-			RelativePath="..\..\Common\DocxFormat\Source\XML\libxml2\libxml2.cpp"
-			>
-		</File>
 		<File
 			RelativePath="..\..\UnicodeConverter\UnicodeConverter.cpp"
 			>

ASCOfficeDocFile/Linux/DocFileConverter.cpp

@@ -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
- *
- */
-#include "../DocFormatLib/DocFormatLib.h"
-
-#include "../Win32/ASCOfficeCriticalSection.h"
-
-#include <iostream>
-#include "../version.h"
-
-static std::wstring utf8_to_unicode(const char *src)
-{
-    if (src == NULL) return _T("");
-    std::string temp = src;
-
-    unsigned int nLength = temp.length();
-
-    UTF32 *pStrUtf32 = new UTF32 [nLength+1];
-    memset ((void *) pStrUtf32, 0, sizeof (UTF32) * (nLength+1));
-
-
-    UTF8 *pStrUtf8 = (UTF8 *) src;
-
-    // this values will be modificated
-    const UTF8 *pStrUtf8_Conv = pStrUtf8;
-    UTF32 *pStrUtf32_Conv = pStrUtf32;
-
-    ConversionResult eUnicodeConversionResult = ConvertUTF8toUTF32 (&pStrUtf8_Conv,
-                                         &pStrUtf8[nLength]
-                    , &pStrUtf32_Conv
-                    , &pStrUtf32 [nLength]
-                    , strictConversion);
-
-            if (conversionOK != eUnicodeConversionResult)
-            {
-                delete [] pStrUtf32;
-                return L"";
-            }
-            std::wstring wsEntryName ((wchar_t *) pStrUtf32);
-
-            delete [] pStrUtf32;
-            return wsEntryName;
-}
-
-ASCOfficeCriticalSection  g_oCriticalSection;
-
-int main(int argc, char *argv[])
-{
-   // check arguments
-    if (argc < 3)
-    {
-        // print out help topic
-
-        std::cout << std::endl;
-        std::cout << std::endl;
-        std::cout << "-------------------------------------------------------------------------------" << std::endl;
-        std::cout << "\t\tDoc/Docx file converter. Version: " << STRVER  << std::endl;
-        std::cout << "-------------------------------------------------------------------------------" << std::endl;
-        std::cout << std::endl;
-        std::cout << "USAGE: ASCDocConverter \"path_to_file_1\" \"path_to_file_2\" " << std::endl;
-        std::cout << "WHERE:" << std::endl;
-        std::cout << "\t\"path_to_file_1\" is a path to file to be converted" << std::endl;
-        std::cout << "\t\"path_to_file_2\" is a path to the corresponding output file" << std::endl << std::endl;
-       return 1;
-    }
-    CString sArg1, sArg2, sExePath;
-
-    sExePath    = utf8_to_unicode(argv [0]);
-    sArg1       = utf8_to_unicode(argv [1]);
-    sArg2       = utf8_to_unicode(argv [2]);
-
-
-    CString sXMLOptions = _T("");
-
-    {// doc->docx
-        COfficeDocFile docFile;
-
-        HRESULT hRes = docFile.LoadFromFile(sArg1, sArg2, sXMLOptions);
-
-        if (hRes != S_OK)return 2;
-
-    }
-    return 0;
-}

ASCOfficeDocFile/Linux/DocFileConverter.pro

@@ -1,110 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2014-12-16T18:25:28
-#
-#-------------------------------------------------
-
-QT       -= core
-
-QT       -= gui
-
-QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
-
-DEFINES += UNICODE \
-    _UNICODE \
-    _USE_LIBXML2_READER_ \
-    _LINUX_QT \
-     LINUX \
-    _USE_XMLLITE_READER_ \
-    USE_LITE_READER \
-
-TARGET = ASCDocConverter
-
-CONFIG   += console
-CONFIG   -= app_bundle
-
-TEMPLATE = app
-
-INCLUDEPATH += \
-    /usr/include/libxml2
-
-SOURCES += \
-    DocFileConverter.cpp
-
-CONFIG(debug, debug|release){
-
-message(Debug)
-
-linux-g++{
-
-    message(64 bit)
-
-    unix:!macx: LIBS += -L$$PWD/../DocFormatLib/Linux/build-DocFormatLib-Desktop64-Debug/ -lDocFormatLib
-    unix:!macx: PRE_TARGETDEPS += $$PWD/../DocFormatLib/Linux/build-DocFormatLib-Desktop64-Debug/libDocFormatLib.a
-
-    unix:!macx: LIBS += -L$$PWD/../../ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop64-Debug/ -lASCOfficeUtilsLib
-    unix:!macx: PRE_TARGETDEPS += $$PWD/../../ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop64-Debug/libASCOfficeUtilsLib.a
-
-    unix:!macx: LIBS += -L$$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop64-Debug/ -lDocxFormatLib
-    unix:!macx: PRE_TARGETDEPS += $$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop64-Debug/libDocxFormatLib.a
-
-    unix:!macx: LIBS += -L$$PWD/../../DesktopEditor/Qt_build/graphics/build-graphics-Desktop64-Debug/ -lgraphics
-    unix:!macx: PRE_TARGETDEPS += $$PWD/../../DesktopEditor/Qt_build/graphics/build-graphics-Desktop64-Debug/libgraphics.a
-}
-
-else{
-
-    message(32 bit)
-
-    unix:!macx: LIBS += -L$$PWD/../DocFormatLib/Linux/build-DocFormatLib-Desktop-Debug/ -lDocFormatLib
-    unix:!macx: PRE_TARGETDEPS += $$PWD/../DocFormatLib/Linux/build-DocFormatLib-Desktop-Debug/libDocFormatLib.a
-
-    unix:!macx: LIBS += -L$$PWD/../../ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop-Debug/ -lASCOfficeUtilsLib
-    unix:!macx: PRE_TARGETDEPS += $$PWD/../../ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop-Debug/libASCOfficeUtilsLib.a
-
-    unix:!macx: LIBS += -L$$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop-Debug/ -lDocxFormatLib
-    unix:!macx: PRE_TARGETDEPS += $$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop-Debug/libDocxFormatLib.a
-
-    unix:!macx: LIBS += -L$$PWD/../../DesktopEditor/Qt_build/graphics/build-graphics-Desktop-Debug/ -lgraphics
-    unix:!macx: PRE_TARGETDEPS += $$PWD/../../DesktopEditor/Qt_build/graphics/build-graphics-Desktop-Debug/libgraphics.a
-}
-}
-
-CONFIG(release, debug|release){
-
-message(Release)
-
-linux-g++{
-
-    message(64 bit)
-
-    unix:!macx: LIBS += -L$$PWD/../DocFormatLib/Linux/build-DocFormatLib-Desktop64-Release/ -lDocFormatLib
-    unix:!macx: PRE_TARGETDEPS += $$PWD/../DocFormatLib/Linux/build-DocFormatLib-Desktop64-Release/libDocFormatLib.a
-
-    unix:!macx: LIBS += -L$$PWD/../../ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop64-Release/ -lASCOfficeUtilsLib
-    unix:!macx: PRE_TARGETDEPS += $$PWD/../../ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop64-Release/libASCOfficeUtilsLib.a
-
-    unix:!macx: LIBS += -L$$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop64-Release/ -lDocxFormatLib
-    unix:!macx: PRE_TARGETDEPS += $$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop64-Release/libDocxFormatLib.a
-
-    unix:!macx: LIBS += -L$$PWD/../../DesktopEditor/Qt_build/graphics/build-graphics-Desktop64-Release/ -lgraphics
-    unix:!macx: PRE_TARGETDEPS += $$PWD/../../DesktopEditor/Qt_build/graphics/build-graphics-Desktop64-Release/libgraphics.a
-}
-
-else{
-
-    message(32 bit)
-
-    unix:!macx: LIBS += -L$$PWD/../DocFormatLib/Linux/build-DocFormatLib-Desktop-Release/ -lDocFormatLib
-    unix:!macx: PRE_TARGETDEPS += $$PWD/../DocFormatLib/Linux/build-DocFormatLib-Desktop-Release/libDocFormatLib.a
-
-    unix:!macx: LIBS += -L$$PWD/../../ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop-Release/ -lASCOfficeUtilsLib
-    unix:!macx: PRE_TARGETDEPS += $$PWD/../../ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop-Release/libASCOfficeUtilsLib.a
-
-    unix:!macx: LIBS += -L$$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop-Release/ -lDocxFormatLib
-    unix:!macx: PRE_TARGETDEPS += $$PWD/../../Common/DocxFormat/build-DocxFormatLib-Desktop-Release/libDocxFormatLib.a
-
-    unix:!macx: LIBS += -L$$PWD/../../DesktopEditor/Qt_build/graphics/build-graphics-Desktop-Release/ -lgraphics
-    unix:!macx: PRE_TARGETDEPS += $$PWD/../../DesktopEditor/Qt_build/graphics/build-graphics-Desktop-Release/libgraphics.a
-}
-}

ASCOfficeDocFile/Win32/ASCDocFile.cpp

@@ -1,119 +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 "stdafx.h"
-#include "ASCDocFile.h"
-
-//#include "ASCOfficeCriticalSection.h"
-
-#include "../DocFormatLib/DocFormatLib.h"
-#include "../Common/Callback.h"
-
-#ifdef _DEBUG
-#define _CRTDBG_MAP_ALLOC
-#include <crtdbg.h>
-#endif
-
-#if defined(_WIN64)
-	#pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib")
-#elif defined (_WIN32)
-	#pragma comment(lib, "../../build/bin/icu/win_32/icuuc.lib")
-#endif
-
-STDMETHODIMP CASCOfficeDocFile::LoadFromFile(BSTR bsDocFile, BSTR bsDocxFilePath, BSTR bsXMLOptions) 
-{
-
-#ifdef _DEBUG
-	//_CrtDumpMemoryLeaks();
-	//_CrtSetBreakAlloc(11001);
-#endif 	
-	
-	COfficeDocFile file;
-
-	ProgressCallback ffCallBack;
-
-	ffCallBack.OnProgress	= OnProgressFunc;
-	ffCallBack.OnProgressEx	= OnProgressExFunc;
-	ffCallBack.caller		= this;
-
-	HRESULT hr	=	file.LoadFromFile(bsDocFile, bsDocxFilePath, L"", &ffCallBack);
-
-#ifdef _DEBUG
-	//_CrtDumpMemoryLeaks();
-#endif
-
-	return hr;
-}
-
-STDMETHODIMP CASCOfficeDocFile::SaveToFile (BSTR sDstFileName, BSTR sSrcPath, BSTR sXMLOptions)
-{
-
-#ifdef _DEBUG
-	//_CrtDumpMemoryLeaks();
-#endif 
-
-	COfficeDocFile file;
-
-	ProgressCallback ffCallBack;
-
-	ffCallBack.OnProgress	=	OnProgressFunc;
-	ffCallBack.OnProgressEx	=	OnProgressExFunc;
-	ffCallBack.caller		=	this;
-
-	HRESULT hr = file.SaveToFile(sSrcPath,  sDstFileName, &ffCallBack);
-
-#ifdef _DEBUG
-	//_CrtDumpMemoryLeaks();
-#endif 
-
-	return hr;
-}
-
-void CASCOfficeDocFile::OnProgressFunc (LPVOID lpParam, long nID, long nPercent)
-{
-	CASCOfficeDocFile* pDocFile = reinterpret_cast<CASCOfficeDocFile*>(lpParam);
-	if (pDocFile != NULL)
-	{
-		pDocFile->OnProgress(nID, nPercent);
-	}
-
-}
-
-void CASCOfficeDocFile::OnProgressExFunc (LPVOID lpParam, long nID, long nPercent, short* pStop)
-{
-
-	CASCOfficeDocFile* pDocFile = reinterpret_cast<CASCOfficeDocFile*>(lpParam);
-	if (NULL != pDocFile)
-	{
-		pDocFile->OnProgressEx(nID, nPercent, pStop);
-	}
-
-}

ASCOfficeDocFile/Win32/ASCDocFile.h

@@ -1,95 +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"
-
-// IOfficeDocFile
-[
-	object,
-	uuid("C694C5ED-201C-46BA-B159-1D7C907FA023"),
-	dual,	helpstring("IOfficeDocFile Interface"),
-	pointer_default(unique)
-]
-__interface IOfficeDocFile : IAVSOfficeFileTemplate
-{
-};
-
-// CASCOfficeDocFile
-
-[
-	coclass,
-	default(IOfficeDocFile, _IAVSOfficeFileTemplateEvents),
-	threading(apartment),
-	event_source(com),
-	vi_progid("AVSOfficeDocFile.DocFile"),
-	progid("AVSOfficeDocFile.DocFile.1"),
-	version(1.0),
-	uuid("CFABE3C9-A61B-4C20-86F4-A19C8FA1546C"),
-	helpstring("OfficeDocFile Class")
-]
-
-class ATL_NO_VTABLE CASCOfficeDocFile: public IOfficeDocFile
-{
-public:
-
-	CASCOfficeDocFile()
-	{
-
-	}
-
-	__event __interface _IAVSOfficeFileTemplateEvents;
-	__event __interface _IAVSOfficeFileTemplateEvents2;
-
-	DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-	HRESULT FinalConstruct()
-	{
-		return S_OK;
-	}
-
-	void FinalRelease()
-	{
-	}
-
-	// OfficeFileTemplate Methods
-public:
-
-	STDMETHOD(LoadFromFile)(BSTR bsDocFile, BSTR bsDocxFilePath, BSTR bsXMLOptions);
-	STDMETHOD(SaveToFile)(BSTR sDstFileName, BSTR sSrcPath, BSTR sXMLOptions);
-
-protected:
-
-	static void OnProgressFunc (LPVOID lpParam, long nID, long nPercent);
-	static void OnProgressExFunc (LPVOID lpParam, long nID, long nPercent, short* pStop);
-};

ASCOfficeDocFile/Win32/ASCOfficeCriticalSection.h

@@ -1,92 +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
-
-#ifdef _DEBUG
-//	#define _DBG_CS
-#endif
-
-class ASCOfficeCriticalSection
-{
-public:
-	ASCOfficeCriticalSection()
-	{
-#ifdef _DBG_CS	
-		m_dbgCount	=	0L;
-#endif
-#if defined(_WIN32) || defined(_WIN64)
-		InitializeCriticalSection (&m_CS);
-#endif
-	}
-
-	~ASCOfficeCriticalSection()
-	{
-#if defined(_WIN32) || defined(_WIN64)
-	DeleteCriticalSection (&m_CS);
-#endif
-#ifdef _DBG_CS	
-		++m_dbgCount;
-		ATLTRACE (_T("delCS : %d\n"), m_dbgCount); 
-#endif
-	}
-
-	inline void Enter()
-	{
-#if defined(_WIN32) || defined(_WIN64)
-		EnterCriticalSection (&m_CS);
-#endif
-#ifdef _DBG_CS	
-		++m_dbgCount;
-		ATLTRACE (_T("dbgCS : %d\n"), m_dbgCount);
-#endif
-	}
-
-	inline void Leave()
-	{
-#ifdef _WIN32
-		LeaveCriticalSection (&m_CS);
-#endif
-#ifdef _DBG_CS	
-		--m_dbgCount;
-		ATLTRACE (_T("dbgCS : %d\n"), m_dbgCount);
-#endif
-	}
-
-private:
-
-#if defined(_WIN32) || defined(_WIN64)
-	CRITICAL_SECTION m_CS;
-#endif
-#ifdef _DBG_CS	
-	LONG	m_dbgCount;
-#endif
-};

ASCOfficeDocFile/Win32/ASCOfficeDocFile.cpp

@@ -1,49 +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
- *
- */
-// ASCDocFile.cpp : Implementation of DLL Exports.
-
-
-#include "stdafx.h"
-#include "resource.h"
-
-
-// The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
-[ module(dll, uuid = "{35C0955D-A67D-4517-B670-5826ED38343D}", 
-		 name = "ASCDocFile", 
-		 helpstring = "ASCOfficeDocFile 1.0 Type Library",
-		 resource_name = "IDR_ASCDOCFILE") ]
-class CAVSDocFileModule
-{
-public:
-// Override CAtlDllModuleT members
-};
-		 

ASCOfficeDocFile/Win32/ASCOfficeDocFile.rc

@@ -1,137 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-#define COMPONENT_NAME "OfficeDocFile"
-#include "../../Common/FileInfo.h"
-#include "../version.h"
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE 9, 1
-#pragma code_page(1251)
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Russian resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#if defined(_WIN32) || defined(_WIN64)
-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 "LegalCopyright", LEGAL_COPYRIGHT
-            VALUE "InternalName", COMPONENT_FILE_NAME_DLL
-            VALUE "OriginalFilename", COMPONENT_FILE_NAME_DLL
-            VALUE "ProductName", FILE_DESCRIPTION_ACTIVEX
-            VALUE "ProductVersion", STRVER
-            VALUE "OLESelfRegister", ""
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0409, 0x04B0
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// REGISTRY
-//
-
-IDR_ASCDOCFILE          REGISTRY                "ASCOfficeDocFile.rgs"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE 
-BEGIN
-    IDS_PROJNAME            "ASCOfficeDocFile"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

ASCOfficeDocFile/Win32/ASCOfficeDocFile.rgs

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

ASCOfficeDocFile/Win32/ASCOfficeDocFile2005.vcproj

@@ -1,779 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="ASCOfficeDocFile"
-	ProjectGUID="{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}"
-	RootNamespace="ASCOfficeDocFile"
-	Keyword="AtlProj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="2"
-			UseOfATL="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="1"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/ASCOfficeDocFile.tlb"
-				HeaderFileName="ASCOfficeDocFile.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="ASCOfficeDocFile_i.c"
-				ProxyFileName="ASCOfficeDocFile_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_DEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1049"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				OutputFile="$(OutDir)/ASCOfficeDocFile.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames=""
-				MergedIDLBaseFileName="_ASCOfficeDocFile.idl"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)/ASCOfficeDocFile.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfATL="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="3"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/ASCOfficeDocFile.tlb"
-				HeaderFileName="ASCOfficeDocFile.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="ASCOfficeDocFile_i.c"
-				ProxyFileName="ASCOfficeDocFile_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_DEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1049"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				OutputFile="$(OutDir)/ASCOfficeDocFile.dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames=""
-				MergedIDLBaseFileName="_ASCOfficeDocFile.idl"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)/ASCOfficeDocFile.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfATL="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(SolutionDir)..\..\Redist\VersionControl.exe $(SolutionDir)..\version.h"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="1"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/ASCOfficeDocFile.tlb"
-				HeaderFileName="ASCOfficeDocFile.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="ASCOfficeDocFile_i.c"
-				ProxyFileName="ASCOfficeDocFile_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="NDEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1049"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				RegisterOutput="false"
-				IgnoreImportLibrary="true"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames="LIBC.LIB"
-				MergedIDLBaseFileName="_ASCOfficeDocFile.idl"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="1"
-				ImportLibrary="$(OutDir)/ASCOfficeDocFile.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\..\Redist&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfATL="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(SolutionDir)..\..\Redist\VersionControl.exe $(SolutionDir)..\version.h"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="3"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/ASCOfficeDocFile.tlb"
-				HeaderFileName="ASCOfficeDocFile.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="ASCOfficeDocFile_i.c"
-				ProxyFileName="ASCOfficeDocFile_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="NDEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1049"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				RegisterOutput="true"
-				IgnoreImportLibrary="true"
-				OutputFile="$(OutDir)/ASCOfficeDocFile.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames="LIBC.LIB"
-				MergedIDLBaseFileName="_ASCOfficeDocFile.idl"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/ASCOfficeDocFile.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\..\Redist\x64&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseASC|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="2"
-			UseOfATL="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\Redist\VersionControl.exe $(ProjectDir)version.h"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="1"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/ASCOfficeDocFile.tlb"
-				HeaderFileName="ASCOfficeDocFile.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="ASCOfficeDocFile_i.c"
-				ProxyFileName="ASCOfficeDocFile_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;ASCBUILD"
-				Culture="1049"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				RegisterOutput="true"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="Msimg32.lib"
-				OutputFile="..\..\..\..\..\..\ASC\Redist\ASCOfficeStudio\ASCOfficeDocFile.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames="LIBC.LIB"
-				MergedIDLBaseFileName="_ASCOfficeDocFile.idl"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/ASCOfficeDocFile.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseASC|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfATL="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\..\Redist\VersionControl.exe $(ProjectDir)version.h"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="3"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/ASCOfficeDocFile.tlb"
-				HeaderFileName="ASCOfficeDocFile.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="ASCOfficeDocFile_i.c"
-				ProxyFileName="ASCOfficeDocFile_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\Common\ASCDocxFormat\Source\Utility;..\..\..\Common\ASCDocxFormat\Source\DocxFormat;..\..\Common\ASCDocxFormat\Source\Common;..\..\Common\ASCDocxFormat\Source\XML;&quot;..\..\ZLIB\zlib-1.2.3\contrib\minizip&quot;;&quot;..\..\ZLIB\zlib-1.2.3&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;ASCBUILD"
-				Culture="1049"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				RegisterOutput="true"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="Msimg32.lib"
-				OutputFile="..\..\..\..\..\..\ASC\Redist\ASCOfficeStudio\ASCOfficeDocFile.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\..\ASCOfficeUtils\ZLIB\zlib123dll\static32;..\..\..\Common\ASCDocxFormat\Lib\Release"
-				IgnoreDefaultLibraryNames="LIBC.LIB"
-				MergedIDLBaseFileName="_ASCOfficeDocFile.idl"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/ASCOfficeDocFile.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\ASCDocFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ASCOfficeDocFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Common\DocxFormat\Source\XML\libxml2\libxml2.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\stdafx.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseASC|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseASC|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\UnicodeConverter\UnicodeConverter.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\ASCDocFile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ASCOfficeCriticalSection.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Common\OfficeFileErrorDescription.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\Common\OfficeFileTemplate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\stdafx.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\ASCOfficeDocFile.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\ASCOfficeDocFile.rgs"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

ASCOfficeDocFile/Win32/ASCOfficeDocFile2012.vcxproj

@@ -1,681 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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="ReleaseASC|Win32">
-      <Configuration>ReleaseASC</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>ASCOfficeDocFile</ProjectName>
-    <ProjectGuid>{da13d6d4-39b5-49db-b5d7-d1afdbb7c320}</ProjectGuid>
-    <RootNamespace>ASCOfficeDocFile</RootNamespace>
-    <Keyword>AtlProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <UseOfAtl>Static</UseOfAtl>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <UseOfAtl>Static</UseOfAtl>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
-    <UseOfAtl>Static</UseOfAtl>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.60610.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>Debug\</OutDir>
-    <IntDir>Debug\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>.\Release\</OutDir>
-    <IntDir>Release\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|Win32'">
-    <OutDir>.\Release\</OutDir>
-    <IntDir>Release\</IntDir>
-    <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
-    <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)ASCOfficeDocFile.tlb</TypeLibraryName>
-      <HeaderFileName>ASCOfficeDocFile.h</HeaderFileName>
-      <DllDataFileName />
-      <InterfaceIdentifierFileName>ASCOfficeDocFile_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>ASCOfficeDocFile_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\Common\ASCDocxFormat\Source\Utility;..\..\Common\ASCDocxFormat\Source\DocxFormat;..\..\Common\ASCDocxFormat\Source\Common;..\..\Common\ASCDocxFormat\Source\XML;..\ZLIB\zlib-1.2.3\contrib\minizip;..\ZLIB\zlib-1.2.3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0419</Culture>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>Msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)ASCOfficeDocFile.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\ASCOfficeUtils\ZLIB\zlib123dll\static32;..\..\Common\ASCDocxFormat\Lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>LIBC.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <MergedIDLBaseFileName>_ASCOfficeDocFile.idl</MergedIDLBaseFileName>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(OutDir)ASCOfficeDocFile.lib</ImportLibrary>
-      <TargetMachine>MachineX86</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)ASCOfficeDocFile.tlb</TypeLibraryName>
-      <HeaderFileName>ASCOfficeDocFile.h</HeaderFileName>
-      <DllDataFileName />
-      <InterfaceIdentifierFileName>ASCOfficeDocFile_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>ASCOfficeDocFile_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Common\ASCDocxFormat\Source\Utility;..\..\Common\ASCDocxFormat\Source\DocxFormat;..\..\Common\ASCDocxFormat\Source\Common;..\..\Common\ASCDocxFormat\Source\XML;..\ZLIB\zlib-1.2.3\contrib\minizip;..\ZLIB\zlib-1.2.3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;%(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>
-      <RegisterOutput>true</RegisterOutput>
-      <AdditionalDependencies>Msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\Redist\$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\ASCOfficeUtils\ZLIB\zlib123dll\static32;..\..\Common\ASCDocxFormat\Lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>LIBC.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <MergedIDLBaseFileName>_ASCOfficeDocFile.idl</MergedIDLBaseFileName>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(OutDir)ASCOfficeDocFile.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Message>Performing registration</Message>
-      <Command>regsvr32 /s /c "$(TargetPath)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|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)ASCOfficeDocFile.tlb</TypeLibraryName>
-      <HeaderFileName>ASCOfficeDocFile.h</HeaderFileName>
-      <DllDataFileName />
-      <InterfaceIdentifierFileName>ASCOfficeDocFile_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>ASCOfficeDocFile_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Common\ASCDocxFormat\Source\Utility;..\..\Common\ASCDocxFormat\Source\DocxFormat;..\..\Common\ASCDocxFormat\Source\Common;..\..\Common\ASCDocxFormat\Source\XML;..\ZLIB\zlib-1.2.3\contrib\minizip;..\ZLIB\zlib-1.2.3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;%(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>
-      <RegisterOutput>true</RegisterOutput>
-      <AdditionalDependencies>Msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\..\..\ASC\Redist\ASCOfficeStudio\ASCOfficeDocFile.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\ASCOfficeUtils\ZLIB\zlib123dll\static32;..\..\Common\ASCDocxFormat\Lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>LIBC.LIB;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <MergedIDLBaseFileName>_ASCOfficeDocFile.idl</MergedIDLBaseFileName>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(OutDir)ASCOfficeDocFile.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Message>Performing registration</Message>
-      <Command>regsvr32 /s /c "$(TargetPath)"</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="ASCDocFile.cpp" />
-    <ClCompile Include="ASCOfficeDocFile.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseASC|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\DocDocxConverter\AnnotationReferenceDescriptor.cpp" />
-    <ClCompile Include="..\DocDocxConverter\CharacterPropertiesMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\Converter.cpp" />
-    <ClCompile Include="..\DocDocxConverter\DocumentMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\DocumentProperties.cpp" />
-    <ClCompile Include="..\DocDocxConverter\FontFamilyName.cpp" />
-    <ClCompile Include="..\DocDocxConverter\FontTableMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\FooterMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\FormattedDiskPageCHPX.cpp" />
-    <ClCompile Include="..\DocDocxConverter\FormattedDiskPagePAPX.cpp" />
-    <ClCompile Include="..\DocDocxConverter\HeaderAndFooterTable.cpp" />
-    <ClCompile Include="..\DocDocxConverter\HeaderMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\LanguageIdMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\ListData.cpp" />
-    <ClCompile Include="..\DocDocxConverter\ListLevel.cpp" />
-    <ClCompile Include="..\DocDocxConverter\ListTable.cpp" />
-    <ClCompile Include="..\DocDocxConverter\MainDocumentMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\NumberingMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\OpenXmlPackage.cpp" />
-    <ClCompile Include="..\DocDocxConverter\ParagraphHeight.cpp" />
-    <ClCompile Include="..\DocDocxConverter\ParagraphPropertiesMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\ParagraphPropertyExceptions.cpp" />
-    <ClCompile Include="..\DocDocxConverter\PictureDescriptor.cpp" />
-    <ClCompile Include="..\DocDocxConverter\PieceTable.cpp" />
-    <ClCompile Include="..\DocDocxConverter\PropertiesMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\PropertyExceptions.cpp" />
-    <ClCompile Include="..\DocDocxConverter\RevisionData.cpp" />
-    <ClCompile Include="..\DocDocxConverter\SectionPropertiesMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\SettingsMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\SinglePropertyModifier.cpp" />
-    <ClCompile Include="..\DocDocxConverter\StyleSheet.cpp" />
-    <ClCompile Include="..\DocDocxConverter\StyleSheetDescription.cpp" />
-    <ClCompile Include="..\DocDocxConverter\StyleSheetInformation.cpp" />
-    <ClCompile Include="..\DocDocxConverter\StyleSheetMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\TableCellPropertiesMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\TableMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\TablePropertiesMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\TableRowPropertiesMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\TextboxMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\VMLPictureMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\VMLShapeMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\VMLShapeTypeMapping.cpp" />
-    <ClCompile Include="..\DocDocxConverter\WordDocument.cpp" />
-    <ClCompile Include="..\DocDocxConverter\WordprocessingDocument.cpp" />
-    <ClCompile Include="..\DocDocxConverter\OfficeDrawing\Record.cpp" />
-    <ClCompile Include="..\DocDocxConverter\OfficeDrawing\RecordFactory.cpp" />
-    <ClCompile Include="..\DocDocxConverter\OfficeDrawing\ShapeTypeFactory.cpp" />
-    <ClCompile Include="..\Common\MD4\md4c.cpp" />
-    <ClCompile Include="..\DocxDocConverter\Endnote.cpp" />
-    <ClCompile Include="..\DocxDocConverter\Footer.cpp" />
-    <ClCompile Include="..\DocxDocConverter\Footnote.cpp" />
-    <ClCompile Include="..\DocxDocConverter\Header.cpp" />
-    <ClCompile Include="..\DocxDocConverter\Hyperlink.cpp" />
-    <ClCompile Include="..\DocxDocConverter\InlineShape.cpp" />
-    <ClCompile Include="..\DocxDocConverter\List.cpp" />
-    <ClCompile Include="..\DocxDocConverter\Paragraph.cpp" />
-    <ClCompile Include="..\DocxDocConverter\Run.cpp" />
-    <ClCompile Include="..\DocxDocConverter\Table.cpp" />
-    <ClCompile Include="..\DocxDocConverter\TableCell.cpp" />
-    <ClCompile Include="..\DocxDocConverter\TableRow.cpp" />
-    <ClCompile Include="..\DocxDocConverter\Text.cpp" />
-    <ClCompile Include="..\DocxDocConverter\OfficeArt\BlipFactory.cpp" />
-    <ClCompile Include="..\DocxDocConverter\ShapeBuilder.cpp" />
-    <ClCompile Include="..\DocxDocConverter\ShapePath.cpp" />
-    <ClCompile Include="..\DocxDocConverter\ShapeSettings.cpp" />
-    <ClCompile Include="..\DocxDocConverter\StyleBooleans.cpp" />
-    <ClCompile Include="..\DocxDocConverter\TextBox.cpp" />
-    <ClCompile Include="..\DocxDocConverter\DocFile.cpp" />
-    <ClCompile Include="..\DocxDocConverter\FileConverter.cpp" />
-    <ClCompile Include="..\DocxDocConverter\TableUtils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="ASCDocFile.h" />
-    <ClInclude Include="ASCOfficeCriticalSection.h" />
-    <ClInclude Include="..\..\Common\OfficeFileErrorDescription.h" />
-    <ClInclude Include="..\..\Common\OfficeFileTemplate.h" />
-    <ClInclude Include="Resource.h" />
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="version.h" />
-    <ClInclude Include="..\DocDocxConverter\AbstractOpenXmlMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\AnnotationOwnerList.h" />
-    <ClInclude Include="..\DocDocxConverter\AnnotationReferenceDescriptor.h" />
-    <ClInclude Include="..\DocDocxConverter\AutoSummaryInfo.h" />
-    <ClInclude Include="..\DocDocxConverter\BookmarkFirst.h" />
-    <ClInclude Include="..\DocDocxConverter\BorderCode.h" />
-    <ClInclude Include="..\DocDocxConverter\ByteStructure.h" />
-    <ClInclude Include="..\DocDocxConverter\CharacterPropertiesMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\CharacterPropertyExceptions.h" />
-    <ClInclude Include="..\DocDocxConverter\CharacterRange.h" />
-    <ClInclude Include="..\DocDocxConverter\CommentsMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\ContentTypes.h" />
-    <ClInclude Include="..\DocDocxConverter\ConversionContext.h" />
-    <ClInclude Include="..\DocDocxConverter\Converter.h" />
-    <ClInclude Include="..\DocDocxConverter\DateAndTime.h" />
-    <ClInclude Include="..\DocDocxConverter\DocumentMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\DocumentProperties.h" />
-    <ClInclude Include="..\DocDocxConverter\DocumentTypographyInfo.h" />
-    <ClInclude Include="..\DocDocxConverter\DrawingObjectGrid.h" />
-    <ClInclude Include="..\DocDocxConverter\EmuValue.h" />
-    <ClInclude Include="..\DocDocxConverter\EndnoteDescriptor.h" />
-    <ClInclude Include="..\DocDocxConverter\EndnotesMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\FieldCharacter.h" />
-    <ClInclude Include="..\DocDocxConverter\FileInformationBlock.h" />
-    <ClInclude Include="..\DocDocxConverter\FixedPointNumber.h" />
-    <ClInclude Include="..\DocDocxConverter\FontFamilyName.h" />
-    <ClInclude Include="..\DocDocxConverter\FontTableMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\FooterMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\FootnoteDescriptor.h" />
-    <ClInclude Include="..\DocDocxConverter\FootnotesMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\FormattedDiskPage.h" />
-    <ClInclude Include="..\DocDocxConverter\FormattedDiskPageCHPX.h" />
-    <ClInclude Include="..\DocDocxConverter\FormattedDiskPagePAPX.h" />
-    <ClInclude Include="..\DocDocxConverter\Global.h" />
-    <ClInclude Include="..\DocDocxConverter\HeaderAndFooterTable.h" />
-    <ClInclude Include="..\DocDocxConverter\HeaderMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\IBinaryReader.h" />
-    <ClInclude Include="..\DocDocxConverter\IMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\IVisitable.h" />
-    <ClInclude Include="..\DocDocxConverter\LanguageId.h" />
-    <ClInclude Include="..\DocDocxConverter\LanguageIdMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\LineSpacingDescriptor.h" />
-    <ClInclude Include="..\DocDocxConverter\ListData.h" />
-    <ClInclude Include="..\DocDocxConverter\ListFormatOverride.h" />
-    <ClInclude Include="..\DocDocxConverter\ListFormatOverrideLevel.h" />
-    <ClInclude Include="..\DocDocxConverter\ListFormatOverrideTable.h" />
-    <ClInclude Include="..\DocDocxConverter\ListLevel.h" />
-    <ClInclude Include="..\DocDocxConverter\ListTable.h" />
-    <ClInclude Include="..\DocDocxConverter\MainDocumentMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\MemoryStream.h" />
-    <ClInclude Include="..\DocDocxConverter\NumberingMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeArtContent.h" />
-    <ClInclude Include="..\DocDocxConverter\OleObject.h" />
-    <ClInclude Include="..\DocDocxConverter\OleObjectMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\OpenXmlPackage.h" />
-    <ClInclude Include="..\DocDocxConverter\ParagraphHeight.h" />
-    <ClInclude Include="..\DocDocxConverter\ParagraphPropertiesMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\ParagraphPropertyExceptions.h" />
-    <ClInclude Include="..\DocDocxConverter\PictureDescriptor.h" />
-    <ClInclude Include="..\DocDocxConverter\PieceDescriptor.h" />
-    <ClInclude Include="..\DocDocxConverter\PieceTable.h" />
-    <ClInclude Include="..\DocDocxConverter\Plex.h" />
-    <ClInclude Include="..\DocDocxConverter\PropertiesMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\PropertyExceptions.h" />
-    <ClInclude Include="..\DocDocxConverter\RevisionData.h" />
-    <ClInclude Include="..\DocDocxConverter\RGBColor.h" />
-    <ClInclude Include="..\DocDocxConverter\SectionDescriptor.h" />
-    <ClInclude Include="..\DocDocxConverter\SectionPropertiesMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\SectionPropertyExceptions.h" />
-    <ClInclude Include="..\DocDocxConverter\SettingsMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\ShadingDescriptor.h" />
-    <ClInclude Include="..\DocDocxConverter\SinglePropertyModifier.h" />
-    <ClInclude Include="..\DocDocxConverter\Spa.h" />
-    <ClInclude Include="..\DocDocxConverter\SprmTDefTable.h" />
-    <ClInclude Include="..\DocDocxConverter\StringTable.h" />
-    <ClInclude Include="..\DocDocxConverter\StructuredStorageReader.h" />
-    <ClInclude Include="..\DocDocxConverter\StyleSheet.h" />
-    <ClInclude Include="..\DocDocxConverter\StyleSheetDescription.h" />
-    <ClInclude Include="..\DocDocxConverter\StyleSheetInformation.h" />
-    <ClInclude Include="..\DocDocxConverter\StyleSheetMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\TabDescriptor.h" />
-    <ClInclude Include="..\DocDocxConverter\TableCellPropertiesMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\TableInfo.h" />
-    <ClInclude Include="..\DocDocxConverter\TableMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\TablePropertiesMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\TablePropertyExceptions.h" />
-    <ClInclude Include="..\DocDocxConverter\TableRowPropertiesMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\Tbkd.h" />
-    <ClInclude Include="..\DocDocxConverter\TextboxMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\TwipsValue.h" />
-    <ClInclude Include="..\DocDocxConverter\VirtualStreamReader.h" />
-    <ClInclude Include="..\DocDocxConverter\VMLPictureMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\VMLShapeMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\VMLShapeTypeMapping.h" />
-    <ClInclude Include="..\DocDocxConverter\WideString.h" />
-    <ClInclude Include="..\DocDocxConverter\WordDocument.h" />
-    <ClInclude Include="..\DocDocxConverter\WordprocessingDocument.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\BitmapBlip.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\BlipStoreContainer.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\BlipStoreEntry.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\ChildAnchor.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\ClientAnchor.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\ClientData.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\DiagramBooleanProperties.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\DrawingContainer.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\DrawingGroup.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\DrawingGroupRecord.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\DrawingRecord.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\FillStyleBooleanProperties.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\GeometryBooleanProperties.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\GeometryTextBooleanProperties.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\GroupContainer.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\GroupShapeBooleanProperties.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\GroupShapeRecord.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\LineStyleBooleanProperties.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\MetafilePictBlip.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\OfficeArtClientTextbox.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\PathParser.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\PathSegment.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\ProtectionBooleanProperties.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Record.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\RecordFactory.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\RegularContainer.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\ShadowStyleBooleanProperties.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shape.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\ShapeContainer.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\ShapeOptions.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\ShapeType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\ShapeTypeFactory.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\SplitMenuColorContainer.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\UnknownRecord.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\ArcType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\ArrowType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\BevelType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\BlockArcType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\BracketsType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\CalloutsType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\CanType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\Connector.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\CubeType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\DiamondType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\DonutType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\FlowChartType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\FoldedCornerlType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\HeartType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\HexagonType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\IsoscelesTriangleType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\LightningBoltType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\LineType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\MoonType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\NoSmokingType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\OctagonType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\OvalType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\ParallelogramType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\PentagonType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\PictureFrameType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\PlaqueType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\PlusType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\RectangleType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\RightTriangleType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\RoundedRectangleType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\SmileyFaceType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\StarType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\SunType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\TextboxType.h" />
-    <ClInclude Include="..\DocDocxConverter\OfficeDrawing\Shapetypes\TrapezoidType.h" />
-    <ClInclude Include="..\Common\Aggregat.h" />
-    <ClInclude Include="..\Common\FormatUtils.h" />
-    <ClInclude Include="..\Common\IOperand.h" />
-    <ClInclude Include="..\Common\IVirtualConstructor.h" />
-    <ClInclude Include="..\Common\LanguageCodes.h" />
-    <ClInclude Include="..\Common\Singleton.h" />
-    <ClInclude Include="..\Common\SPRMCodes.h" />
-    <ClInclude Include="..\Common\TargetOptions.h" />
-    <ClInclude Include="..\Common\TextMark.h" />
-    <ClInclude Include="..\Common\utf8.h" />
-    <ClInclude Include="..\Common\XmlTools.h" />
-    <ClInclude Include="..\Common\MD4\global.h" />
-    <ClInclude Include="..\Common\MD4\md4.h" />
-    <ClInclude Include="..\Common\MD4\md4c.h" />
-    <ClInclude Include="..\DocxDocConverter\BinaryStorage.h" />
-    <ClInclude Include="..\DocxDocConverter\BookmarkEnd.h" />
-    <ClInclude Include="..\DocxDocConverter\BookmarkStart.h" />
-    <ClInclude Include="..\DocxDocConverter\Brc.h" />
-    <ClInclude Include="..\DocxDocConverter\Brc80MayBeNil.h" />
-    <ClInclude Include="..\DocxDocConverter\BxPap.h" />
-    <ClInclude Include="..\DocxDocConverter\CellRangeVertAlign.h" />
-    <ClInclude Include="..\DocxDocConverter\Chpx.h" />
-    <ClInclude Include="..\DocxDocConverter\ChpxFkp.h" />
-    <ClInclude Include="..\DocxDocConverter\Clx.h" />
-    <ClInclude Include="..\DocxDocConverter\COLORREF.h" />
-    <ClInclude Include="..\DocxDocConverter\Constants.h" />
-    <ClInclude Include="..\DocxDocConverter\Copts60.h" />
-    <ClInclude Include="..\DocxDocConverter\CP.h" />
-    <ClInclude Include="..\DocxDocConverter\CSSAOperand.h" />
-    <ClInclude Include="..\DocxDocConverter\CSymbolOperand.h" />
-    <ClInclude Include="..\DocxDocConverter\Defines.h" />
-    <ClInclude Include="..\DocxDocConverter\DefTableShd80Operand.h" />
-    <ClInclude Include="..\DocxDocConverter\DefTableShdOperand.h" />
-    <ClInclude Include="..\DocxDocConverter\DopBase.h" />
-    <ClInclude Include="..\DocxDocConverter\DTTM.h" />
-    <ClInclude Include="..\DocxDocConverter\Endnote.h" />
-    <ClInclude Include="..\DocxDocConverter\EndnoteRef.h" />
-    <ClInclude Include="..\DocxDocConverter\EndnoteReference.h" />
-    <ClInclude Include="..\DocxDocConverter\FldChar.h" />
-    <ClInclude Include="..\DocxDocConverter\Footer.h" />
-    <ClInclude Include="..\DocxDocConverter\Footnote.h" />
-    <ClInclude Include="..\DocxDocConverter\FootnoteRef.h" />
-    <ClInclude Include="..\DocxDocConverter\FootnoteReference.h" />
-    <ClInclude Include="..\DocxDocConverter\FtsWWidth.h" />
-    <ClInclude Include="..\DocxDocConverter\grfhic.h" />
-    <ClInclude Include="..\DocxDocConverter\GRFSTD.h" />
-    <ClInclude Include="..\DocxDocConverter\GrLPUpxSw.h" />
-    <ClInclude Include="..\DocxDocConverter\GrpPrlAndIstd.h" />
-    <ClInclude Include="..\DocxDocConverter\Header.h" />
-    <ClInclude Include="..\DocxDocConverter\Hyperlink.h" />
-    <ClInclude Include="..\DocxDocConverter\InlineShape.h" />
-    <ClInclude Include="..\DocxDocConverter\IParagraphItem.h" />
-    <ClInclude Include="..\DocxDocConverter\IRunItem.h" />
-    <ClInclude Include="..\DocxDocConverter\IStreamWriter.h" />
-    <ClInclude Include="..\DocxDocConverter\ItcFirstLim.h" />
-    <ClInclude Include="..\DocxDocConverter\ITextItem.h" />
-    <ClInclude Include="..\DocxDocConverter\LFO.h" />
-    <ClInclude Include="..\DocxDocConverter\LFOData.h" />
-    <ClInclude Include="..\DocxDocConverter\LFOLVL.h" />
-    <ClInclude Include="..\DocxDocConverter\LID.h" />
-    <ClInclude Include="..\DocxDocConverter\List.h" />
-    <ClInclude Include="..\DocxDocConverter\ListFormattingInformation.h" />
-    <ClInclude Include="..\DocxDocConverter\LPStd.h" />
-    <ClInclude Include="..\DocxDocConverter\LPStshi.h" />
-    <ClInclude Include="..\DocxDocConverter\LPStshiGrpPrl.h" />
-    <ClInclude Include="..\DocxDocConverter\LPUpxChpx.h" />
-    <ClInclude Include="..\DocxDocConverter\LPUpxPapx.h" />
-    <ClInclude Include="..\DocxDocConverter\LPUpxTapx.h" />
-    <ClInclude Include="..\DocxDocConverter\LSD.h" />
-    <ClInclude Include="..\DocxDocConverter\LSPD.h" />
-    <ClInclude Include="..\DocxDocConverter\LSTF.h" />
-    <ClInclude Include="..\DocxDocConverter\LVL.h" />
-    <ClInclude Include="..\DocxDocConverter\LVLF.h" />
-    <ClInclude Include="..\DocxDocConverter\MFPF.h" />
-    <ClInclude Include="..\DocxDocConverter\PapxFkp.h" />
-    <ClInclude Include="..\DocxDocConverter\PapxInFkp.h" />
-    <ClInclude Include="..\DocxDocConverter\Paragraph.h" />
-    <ClInclude Include="..\DocxDocConverter\ParagraphItem.h" />
-    <ClInclude Include="..\DocxDocConverter\PChgTabs.h" />
-    <ClInclude Include="..\DocxDocConverter\PICF.h" />
-    <ClInclude Include="..\DocxDocConverter\PICF_Shape.h" />
-    <ClInclude Include="..\DocxDocConverter\PICFAndOfficeArtData.h" />
-    <ClInclude Include="..\DocxDocConverter\PICMID.h" />
-    <ClInclude Include="..\DocxDocConverter\Picture.h" />
-    <ClInclude Include="..\DocxDocConverter\PLC.h" />
-    <ClInclude Include="..\DocxDocConverter\PlcBteChpx.h" />
-    <ClInclude Include="..\DocxDocConverter\PlcBtePapx.h" />
-    <ClInclude Include="..\DocxDocConverter\Plcfbkf.h" />
-    <ClInclude Include="..\DocxDocConverter\Plcfld.h" />
-    <ClInclude Include="..\DocxDocConverter\PlcfSed.h" />
-    <ClInclude Include="..\DocxDocConverter\PlcfSpa.h" />
-    <ClInclude Include="..\DocxDocConverter\PlfLfo.h" />
-    <ClInclude Include="..\DocxDocConverter\PlfLst.h" />
-    <ClInclude Include="..\DocxDocConverter\PositionCodeOperand.h" />
-    <ClInclude Include="..\DocxDocConverter\Prl.h" />
-    <ClInclude Include="..\DocxDocConverter\Run.h" />
-    <ClInclude Include="..\DocxDocConverter\RunItem.h" />
-    <ClInclude Include="..\DocxDocConverter\SectionBreak.h" />
-    <ClInclude Include="..\DocxDocConverter\SectionProperties.h" />
-    <ClInclude Include="..\DocxDocConverter\Sepx.h" />
-    <ClInclude Include="..\DocxDocConverter\Shd80.h" />
-    <ClInclude Include="..\DocxDocConverter\SHDOperand.h" />
-    <ClInclude Include="..\DocxDocConverter\Spa.h" />
-    <ClInclude Include="..\DocxDocConverter\Stdf.h" />
-    <ClInclude Include="..\DocxDocConverter\StdfBase.h" />
-    <ClInclude Include="..\DocxDocConverter\StdfPost2000.h" />
-    <ClInclude Include="..\DocxDocConverter\STSH.h" />
-    <ClInclude Include="..\DocxDocConverter\STSHI.h" />
-    <ClInclude Include="..\DocxDocConverter\STSHIB.h" />
-    <ClInclude Include="..\DocxDocConverter\Stshif.h" />
-    <ClInclude Include="..\DocxDocConverter\StshiLsd.h" />
-    <ClInclude Include="..\DocxDocConverter\STTB.h" />
-    <ClInclude Include="..\DocxDocConverter\SttbfBkmk.h" />
-    <ClInclude Include="..\DocxDocConverter\SttbfFfn.h" />
-    <ClInclude Include="..\DocxDocConverter\Table.h" />
-    <ClInclude Include="..\DocxDocConverter\TableBordersOperand.h" />
-    <ClInclude Include="..\DocxDocConverter\TableBordersOperand80.h" />
-    <ClInclude Include="..\DocxDocConverter\TableBrc80Operand.h" />
-    <ClInclude Include="..\DocxDocConverter\TableBrcOperand.h" />
-    <ClInclude Include="..\DocxDocConverter\TableCell.h" />
-    <ClInclude Include="..\DocxDocConverter\TableCellWidthOperand.h" />
-    <ClInclude Include="..\DocxDocConverter\TableRow.h" />
-    <ClInclude Include="..\DocxDocConverter\TBD.h" />
-    <ClInclude Include="..\DocxDocConverter\TDefTableOperand.h" />
-    <ClInclude Include="..\DocxDocConverter\Text.h" />
-    <ClInclude Include="..\DocxDocConverter\TextItem.h" />
-    <ClInclude Include="..\DocxDocConverter\TLP.h" />
-    <ClInclude Include="..\DocxDocConverter\Tplc.h" />
-    <ClInclude Include="..\DocxDocConverter\XAS.h" />
-    <ClInclude Include="..\DocxDocConverter\Xstz.h" />
-    <ClInclude Include="..\DocxDocConverter\YAS.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\BlipFactory.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\Common.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\ComplexOfficeArtProperty.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\DrawingContainer.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\IOfficeArtAbstractContainer.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\IOfficeArtRecord.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtBlip.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtBlipEMF.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtBlipJPEG.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtBlipPNG.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtBlipTIFF.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtBlipWMF.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtBStoreContainer.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtBStoreContainerFileBlock.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtChildAnchor.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtClientAnchor.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtClientData.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtClientTextbox.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtCOLORREF.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtContent.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtDgContainer.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtDggContainer.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtFBSE.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtFDG.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtFDGGBlock.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtFOPT.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtFOPTE.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtFOPTEOPID.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtFSP.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtFSPGR.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtInlineSpContainer.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtMetafileHeader.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtRecordHeader.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtRGFOPTE.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtSpContainer.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtSpgrContainer.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtSplitMenuColorContainer.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\OfficeArtWordDrawing.h" />
-    <ClInclude Include="..\DocxDocConverter\ShapeBuilder.h" />
-    <ClInclude Include="..\DocxDocConverter\ShapePath.h" />
-    <ClInclude Include="..\DocxDocConverter\ShapeSettings.h" />
-    <ClInclude Include="..\DocxDocConverter\StyleBooleans.h" />
-    <ClInclude Include="..\DocxDocConverter\TextBox.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\Enumerations.h" />
-    <ClInclude Include="..\DocxDocConverter\OfficeArt\MSOArray.h" />
-    <ClInclude Include="..\DocxDocConverter\DocFile.h" />
-    <ClInclude Include="..\DocxDocConverter\DocxToDocUtils.h" />
-    <ClInclude Include="..\DocxDocConverter\FileConverter.h" />
-    <ClInclude Include="..\DocxDocConverter\InternalElements.h" />
-    <ClInclude Include="..\DocxDocConverter\PropertyReader.h" />
-    <ClInclude Include="..\DocxDocConverter\WordStreamWriter.h" />
-    <ClInclude Include="..\DocxDocConverter\TableUtils.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="ASCOfficeDocFile.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ASCOfficeDocFile.rgs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Common\ASCDocxFormat\Projects\Common2012.vcxproj">
-      <Project>{399893aa-3617-4cd8-a980-7f15cdafa3d2}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Common\ASCDocxFormat\Projects\DocxFormat2012.vcxproj">
-      <Project>{a100103a-353e-45e8-a9b8-90b87cc5c0b0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Common\ASCDocxFormat\Projects\Utility2012.vcxproj">
-      <Project>{7b9f3647-32d3-4f82-8ca5-a43e490e1457}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Common\ASCDocxFormat\Projects\XML2012.vcxproj">
-      <Project>{c1587c15-6268-4451-9263-937e63a945f6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

ASCOfficeDocFile/Win32/OfficeDocFile_VS2012.sln

@@ -1,156 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeDocFile", "ASCOfficeDocFile2005.vcxproj", "{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocFormatLib", "..\DocFormatLib\Win32\DocFormatLib.vcxproj", "{C5371405-338F-4B70-83BD-2A5CDF64F383}"
-	ProjectSection(ProjectDependencies) = postProject
-		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeUtilsLib", "..\..\ASCOfficeUtils\ASCOfficeUtilsLib\Win\ASCOfficeUtilsLib.vcxproj", "{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "..\..\DesktopEditor\graphics\graphics_vs2005.vcxproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agg2d", "..\..\DesktopEditor\agg-2.4\agg_vs2005.vcxproj", "{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocFormatTest", "..\..\Test\Applications\DocxFormatTests\DocFormatTest\win32\DocFormatTest.vcxproj", "{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}"
-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}") = "libxml2", "..\..\Common\DocxFormat\Source\XML\libxml2\win_build\libxml2.vcxproj", "{21663823-DE45-479B-91D0-B4FEF4916EF0}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Debug|Win32.Build.0 = Debug|Win32
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Debug|x64.ActiveCfg = Debug|x64
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Debug|x64.Build.0 = Debug|x64
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Release|Any CPU.ActiveCfg = Release|Win32
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Release|Win32.ActiveCfg = Release|Win32
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Release|Win32.Build.0 = Release|Win32
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Release|x64.ActiveCfg = Release|x64
-		{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}.Release|x64.Build.0 = Release|x64
-		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|Win32.Build.0 = Debug|Win32
-		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|x64.ActiveCfg = Debug|x64
-		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Debug|x64.Build.0 = Debug|x64
-		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|Any CPU.ActiveCfg = Release|Win32
-		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|Win32.ActiveCfg = Release|Win32
-		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|Win32.Build.0 = Release|Win32
-		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|x64.ActiveCfg = Release|x64
-		{C5371405-338F-4B70-83BD-2A5CDF64F383}.Release|x64.Build.0 = Release|x64
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Mixed Platforms.Build.0 = Debug|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|Any CPU.ActiveCfg = Release|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{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
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Win32.Build.0 = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|x64.ActiveCfg = Debug|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|x64.Build.0 = Debug|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Any CPU.ActiveCfg = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.ActiveCfg = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.Build.0 = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|x64.ActiveCfg = Release|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|x64.Build.0 = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Win32.Build.0 = Debug|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|x64.ActiveCfg = Debug|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|x64.Build.0 = Debug|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Any CPU.ActiveCfg = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Win32.ActiveCfg = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Win32.Build.0 = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|x64.ActiveCfg = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|x64.Build.0 = Release|x64
-		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Win32.Build.0 = Debug|Win32
-		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|x64.ActiveCfg = Debug|x64
-		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|x64.Build.0 = Debug|x64
-		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|Any CPU.ActiveCfg = Release|Win32
-		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|Win32.ActiveCfg = Release|Win32
-		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|Win32.Build.0 = Release|Win32
-		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|x64.ActiveCfg = Release|x64
-		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|x64.Build.0 = Release|x64
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{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|Any CPU.ActiveCfg = Release|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{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
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Mixed Platforms.Build.0 = Debug|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|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.Build.0 = Debug|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Any CPU.ActiveCfg = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Mixed Platforms.Build.0 = Release|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|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
-	EndGlobalSection
-EndGlobal

ASCOfficeDocFile/Win32/Resource.h

@@ -1,48 +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 AVSOfficeDocFile.rc
-//
-#define IDS_PROJNAME                    100
-#define IDR_ASCDOCFILE                  101
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        203
-#define _APS_NEXT_COMMAND_VALUE         32768
-#define _APS_NEXT_CONTROL_VALUE         201
-#define _APS_NEXT_SYMED_VALUE           102
-#endif
-#endif

ASCOfficeDocFile/Win32/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
-// AVSDocFile.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"

ASCOfficeDocFile/Win32/stdafx.h

@@ -1,77 +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
-
-#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 0x0400		// 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.
-	#if _MSC_VER >= 1700			
-		#define _WIN32_WINNT  0x0501 
-	#else
-		#define _WIN32_WINNT 0x0400	// Change this to the appropriate value to target Windows 2000 or later.
-	#endif
-#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 _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
-
-// ATL
-
-#include <atlbase.h>
-#include <atlcom.h>
-
-using namespace ATL;
-
-#include "..\..\Common\OfficeFileErrorDescription.h"
-
-#include "Resource.h"

ASCOfficeDocFile/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
-//1
-//0
-//1
-//239
-#define INTVER 1,0,1,239
-#define STRVER "1,0,1,239\0"

ASCOfficeDocxFile2/BinReader/ReaderClasses.h

@@ -1704,7 +1704,7 @@ public:
 		{
             std::wstring sText = pComment->Text;
 
-            boost::algorithm::replace_all(sText, L"\r", L"");
+            XmlUtils::replace_all(sText, L"\r", L"");
 
             bool bFirst = true;
 			int nPrevIndex = 0;

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -778,7 +778,7 @@ namespace BinDocxRW
 				{
                     std::wstring sTextOutline = rPr.m_sTextOutline.get2();
 					//делаем replace потому что читать имена node без namespace можем а атрибуты нет, потому что храним их в map
-                    boost::algorithm::replace_all(sTextOutline, L"w14:", L"");
+                    XmlUtils::replace_all(sTextOutline, L"w14:", L"");
 
                     m_oBcw.m_oStream.WriteBYTE(c_oSerProp_rPrType::TextOutline);
 					m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Variable);
@@ -790,7 +790,7 @@ namespace BinDocxRW
 				{
                     std::wstring sTextFill = rPr.m_sTextFill.get2();
 					//делаем replace потому что читать имена node без namespace можем а атрибуты нет, потому что храним их в map
-                    boost::algorithm::replace_all(sTextFill, L"w14:", L"");
+                    XmlUtils::replace_all(sTextFill, L"w14:", L"");
 
                     m_oBcw.m_oStream.WriteBYTE(c_oSerProp_rPrType::TextFill);
 					m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Variable);

ASCOfficeOdfFile/ASCOfficeOdfFile/ASCOfficeOdfFile.cpp

@@ -1,49 +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
- *
- */
-// ASCOfficeOdfFile.cpp : Implementation of DLL Exports.
-
-
-#include "stdafx.h"
-#include "resource.h"
-
-
-// The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
-[ module(dll, uuid = "{9AEF1F19-91CE-46C0-A380-06A7F56CE4AE}", 
-		 name = "ASCOfficeOdfFile", 
-		 helpstring = "ASCOfficeOdfFile 1.0 Type Library",
-		 resource_name = "IDR_ASCOFFICEODFFILE") ]
-class CASCOfficeOdfFileModule
-{
-public:
-// Override CAtlDllModuleT members
-};
-		 

ASCOfficeOdfFile/ASCOfficeOdfFile/ASCOfficeOdfFile.rc

@@ -1,100 +0,0 @@
-//Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-#define COMPONENT_NAME "OfficeOdfFile"
-#include "../../Common/FileInfo.h"
-#include "../version.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE  
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE  
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-
-#endif    // APSTUDIO_INVOKED
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// 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 "LegalTrademarks", 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
-
-#endif    // !_MAC
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE  
-BEGIN
-	IDS_PROJNAME					"ASCOfficeOdfFile"
-END
-
-IDR_ASCOFFICEODFFILE REGISTRY "ASCOfficeOdfFile.rgs"
-////////////////////////////////////////////////////////////////////////////
-
-
-#endif
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED

ASCOfficeOdfFile/ASCOfficeOdfFile/ASCOfficeOdfFile.rgs

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

ASCOfficeOdfFile/ASCOfficeOdfFile/ASCOfficeOdfFile.vcproj

@@ -1,786 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="ASCOfficeOdfFile"
-	ProjectGUID="{64B09C98-22DC-494E-A882-9E2D7D18557C}"
-	RootNamespace="ASCOfficeOdfFile"
-	Keyword="AtlProj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfATL="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="1"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/ASCOfficeOdfFile.tlb"
-				HeaderFileName="ASCOfficeOdfFile.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="ASCOfficeOdfFile_i.c"
-				ProxyFileName="ASCOfficeOdfFile_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../include"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=1;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1049"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="Msimg32.lib"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames=""
-				MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)/ASCOfficeOdfFile.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfATL="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="3"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/ASCOfficeOdfFile.tlb"
-				HeaderFileName="ASCOfficeOdfFile.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="ASCOfficeOdfFile_i.c"
-				ProxyFileName="ASCOfficeOdfFile_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../include"
-				PreprocessorDefinitions="_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=1"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1049"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="Msimg32.lib"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames=""
-				MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)/ASCOfficeOdfFile.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfATL="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="..\..\Redist\VersionControl.exe &quot;..\version.h&quot;"
-				ExcludedFromBuild="false"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="1"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/ASCOfficeOdfFile.tlb"
-				HeaderFileName="ASCOfficeOdfFile.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="ASCOfficeOdfFile_i.c"
-				ProxyFileName="ASCOfficeOdfFile_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				FavorSizeOrSpeed="1"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="../include"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=0"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1049"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="Msimg32.lib"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames=""
-				MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/ASCOfficeOdfFile.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)..\Redist&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfATL="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(SolutionDir)..\..\Redist\VersionControl.exe $(SolutionDir)..\version.h"
-				ExcludedFromBuild="false"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="3"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/ASCOfficeOdfFile.tlb"
-				HeaderFileName="ASCOfficeOdfFile.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="ASCOfficeOdfFile_i.c"
-				ProxyFileName="ASCOfficeOdfFile_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				FavorSizeOrSpeed="1"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="../include"
-				PreprocessorDefinitions="_WINDOWS;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=0"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1049"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="Msimg32.lib"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames=""
-				MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/ASCOfficeOdfFile.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)..\..\Redist\x64&quot;&#x0D;&#x0A;regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release ASC|Win32"
-			OutputDirectory="$(SolutionDir)bin"
-			IntermediateDirectory="$(SolutionDir)output/$(ConfigurationName)/$(ProjectName)"
-			ConfigurationType="2"
-			UseOfATL="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="../../Redist/VersionControl.exe $(ProjectDir)\version.h"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="1"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/ASCOfficeOdfFile.tlb"
-				HeaderFileName="ASCOfficeOdfFile.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="ASCOfficeOdfFile_i.c"
-				ProxyFileName="ASCOfficeOdfFile_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				FavorSizeOrSpeed="1"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="$(SolutionDir)include"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;ASCBUILD"
-				Culture="1049"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="XmlLite.lib"
-				OutputFile="$(OutDir)/ASCOfficeOdfFile.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(SolutionDir)bin"
-				MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/ASCOfficeOdfFile.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release ASC|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfATL="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="../../Redist/VersionControl.exe $(ProjectDir)\version.h"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="3"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/ASCOfficeOdfFile.tlb"
-				HeaderFileName="ASCOfficeOdfFile.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="ASCOfficeOdfFile_i.c"
-				ProxyFileName="ASCOfficeOdfFile_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				FavorSizeOrSpeed="1"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="$(SolutionDir)include"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;ASCBUILD"
-				Culture="1049"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				AdditionalDependencies="XmlLite.lib"
-				OutputFile="$(OutDir)/ASCOfficeOdfFile.dll"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(SolutionDir)bin"
-				MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/ASCOfficeOdfFile.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\ASCOfficeOdfFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeOdfFile.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\OfficeOdfFile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\stdafx.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\ASCOfficeOdfFile.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						Culture="1033"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						Culture="1033"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						Culture="1033"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						Culture="1033"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release ASC|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						Culture="1033"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release ASC|x64"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						Culture="1033"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\ASCOfficeOdfFile.rgs"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-		<File
-			RelativePath=".\stdafx.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release ASC|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release ASC|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

ASCOfficeOdfFile/ASCOfficeOdfFile/OfficeOdfFile.cpp

@@ -1,226 +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
- *
- */
-/// \file   OfficeOdfFile.cpp
-#include "stdafx.h"
-
-#include "OfficeOdfFile.h"
-#include "../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
-
-#include <boost/algorithm/string/case_conv.hpp>
-#include <boost/lexical_cast.hpp>
-
-#include "../../Common/DocxFormat/Source/Base/Base.h"
-#include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
-
-#include "../src/ConvertOO2OOX.h"
-
-#include "../../Common/XmlUtils.h"
-
-#include "../../Common/ASCATLError.h"
-
-#include <string>
-#include <Shlobj.h>
-
-
-// ВНИМАНИЕ:    значение 1 используется для тестирования, на выходе получаем заархивированный файл xlsx или docx
-//              значение 0 используется для релиза, так как на выходе по спецификации нам требуется распакованный package
-#ifndef STANDALONE_USE
-	#define STANDALONE_USE 0// что получаем на выходе: файл (1) или папку (0)
-#endif
-
-
-COfficeOdfFile::COfficeOdfFile()
-{
-	bOnlyPresentation = false;
-}
-
-namespace {
-
-
-std::wstring bstr2wstring(BSTR str)
-{
-    return str ? std::wstring(&str[0], &str[::SysStringLen(str)]) : L"";
-}
-
-
-}
-
-bool COfficeOdfFile::loadOptionFromXML(CString parametr,BSTR sXMLOptions)
-{
-	bool result = false;
-	XmlUtils::CXmlReader oXmlReader;
-	if( TRUE == oXmlReader.OpenFromXmlString( sXMLOptions ) )
-	{
-		if( TRUE == oXmlReader.ReadRootNode( _T("Options") ) )
-		{
-			if( TRUE == oXmlReader.ReadNode( parametr ) )
-			{
-				result = true;
-			}
-		}		
-	}
-
-	return result;
-
-}
-
-
-HRESULT COfficeOdfFile::LoadFromFile(BSTR sSrcFileName, BSTR sDstPath, BSTR sXMLOptions)
-{
-#if defined(STANDALONE_USE) && (STANDALONE_USE == 1)
-	std::wstring outputDir = FileSystem::Directory::GetFolderPath(std::wstring(sDstPath));
-#else
-	std::wstring outputDir = sDstPath;
-#endif
-
-    // временная директория, в которую распакуем исходный файл,
-    // создаем её в директории куда запишем результат
-
-	std::wstring srcTempPath = FileSystem::Directory::CreateDirectoryWithUniqueName(outputDir);
-    
-#if defined(STANDALONE_USE) && (STANDALONE_USE == 1)
-	std::wstring dstTempPath = FileSystem::Directory::CreateDirectoryWithUniqueName(outputDir);
-#else
-    std::wstring dstTempPath = outputDir;
-#endif
-
-	bOnlyPresentation = loadOptionFromXML(L"onlyPresentation", sXMLOptions);
-
-    HRESULT hr;
-	try
-    {
-        FileSystem::Directory::CreateDirectory(srcTempPath);
-#if defined(STANDALONE_USE) && (STANDALONE_USE == 1)
-        // создаем временную директорию для результирующих файлов
-		FileSystem::Directory::CreateDirectory(dstTempPath);
-#endif
-		std::wstring fontsPath = GetDefWinFontDirectory();
-///
-
-///
-        hr = LoadFromFileImpl(bstr2wstring(sSrcFileName), srcTempPath, dstTempPath, bstr2wstring(sDstPath), fontsPath);
-        
-    }
-    catch(...)
-    {
-        hr = E_FAIL;
-    }
-
-    // стираем временную директорию с распакованным исходником
-    try
-    {
-		FileSystem::Directory::DeleteDirectory(srcTempPath);
-    }
-    catch(...) 
-    {
-    }
-
-#if defined(STANDALONE_USE) && (STANDALONE_USE == 1)
-    // в случае если на выходе файл — стираем временную директорию (мы сами ее создали)
-    try 
-    {
-		FileSystem::Directory::DeleteDirectory(dstTempPath);
-    }
-    catch(...)
-    {
-    }
-#endif
-     
-    return hr;
-}
-
-HRESULT COfficeOdfFile::LoadFromFileImpl(const std::wstring & srcFileName,
-                                         const std::wstring & srcTempPath,
-                                         const std::wstring & dstTempPath,
-                                         const std::wstring & dstPath,
-										 const std::wstring & fontsPath)
-{
-    HRESULT hr = AVS_ERROR_UNEXPECTED;    
-        
-    // распаковываем исходник во временную директорию
-	COfficeUtils oCOfficeUtils(NULL);
-    if (S_OK != oCOfficeUtils.ExtractToDirectory(srcFileName.c_str(), srcTempPath.c_str(), NULL, 0))
-		return hr;
-
-	ProgressCallback ffCallBack;
-
-	ffCallBack.OnProgress	=	OnProgressFunc;
-	ffCallBack.OnProgressEx	=	OnProgressExFunc;
-	ffCallBack.caller		=	this;
-
-	hr = ConvertOO2OOX(srcTempPath, dstTempPath, fontsPath, bOnlyPresentation, &ffCallBack);
-
-	if (hr != S_OK)  return hr;
-   
-#if defined(STANDALONE_USE) && (STANDALONE_USE == 1)
-	if (S_OK != oCOfficeUtils.CompressFileOrDirectory(dstTempPath.c_str(), dstPath.c_str(), -1))
-        return hr;
-#endif
-
-    return S_OK;
-}
-
-
-HRESULT COfficeOdfFile::SaveToFile(BSTR sDstFileName, BSTR sSrcPath, BSTR sXMLOptions)
-{
-    return E_NOTIMPL;
-}
-
-void COfficeOdfFile::OnProgressFunc (LPVOID lpParam, long nID, long nPercent)
-{
-	COfficeOdfFile* pOdfFile = reinterpret_cast<COfficeOdfFile*>(lpParam);
-	if (pOdfFile != NULL)
-	{
-		pOdfFile->OnProgress(nID, nPercent);
-	}
-}
-
-void COfficeOdfFile::OnProgressExFunc (LPVOID lpParam, long nID, long nPercent, short* pStop)
-{
-	COfficeOdfFile* pOdfFile = reinterpret_cast<COfficeOdfFile*>(lpParam);
-	if (pOdfFile != NULL)
-	{
-		pOdfFile->OnProgressEx(nID, nPercent, pStop);
-	}
-}
-std::wstring COfficeOdfFile::GetDefWinFontDirectory()
-{
-	std::wstring strPath;
-
-	wchar_t wsWinFontDir[1024] ={};
-	if ( !SHGetSpecialFolderPathW( NULL, wsWinFontDir, CSIDL_FONTS, FALSE ) )
-		wsWinFontDir[0] = '\0';
-
-
-	strPath = std::wstring(wsWinFontDir);
-	return strPath;
-}

ASCOfficeOdfFile/ASCOfficeOdfFile/OfficeOdfFile.h

@@ -1,124 +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
- *
- */
-// OfficeOdfFile.h : Declaration of the COfficeOdfFile
-
-#pragma once
-#include "resource.h"       // main symbols
-#include <string>
-
-#include "../../Common/OfficeFileTemplate.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
-
-// IOfficeOdfFile
-[
-	object,
-	uuid("CD223963-DF33-44FD-9A6A-4753760164E7"),
-	dual,	helpstring("IOfficeOdfFile Interface"),
-	pointer_default(unique)
-]
-__interface IOfficeOdfFile : IAVSOfficeFileTemplate
-{
-};
-
-
-// _IOfficeOdfFileEvents
-[
-	dispinterface,
-	uuid("ACAD723A-D5F0-4738-AC7D-CA17AE701629"),
-	helpstring("_IOfficeOdfFileEvents Interface")
-]
-__interface _IOfficeOdfFileEvents
-{
-};
-
-
-// COfficeOdfFile
-
-[
-	coclass,
-	default(IOfficeOdfFile, _IAVSOfficeFileTemplateEvents),
-	threading(apartment),
-	support_error_info("IOfficeOdfFile"),
-	event_source(com),
-	vi_progid("ASCOfficeOdfFile.OfficeOdfFile"),
-	progid("ASCOfficeOdfFile.OfficeOdfFile.1"),
-	version(1.0),
-	uuid("99901ECB-3527-494D-A9EC-5A7CA98AD18B"),
-	helpstring("OfficeOdfFile Class")
-]
-class ATL_NO_VTABLE COfficeOdfFile :
-	public IOfficeOdfFile
-{
-public:
-	COfficeOdfFile();
-
-	__event __interface _IAVSOfficeFileTemplateEvents;
-	__event __interface _IAVSOfficeFileTemplateEvents2;
-
-
-
-	DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-	HRESULT FinalConstruct()
-	{
-		return S_OK;
-	}
-
-	void FinalRelease()
-	{
-	}
-
-public:
-    STDMETHOD(LoadFromFile)(BSTR sSrcFileName, BSTR sDstPath, BSTR sXMLOptions);
-	STDMETHOD(SaveToFile)(BSTR sDstFileName, BSTR sSrcPath, BSTR sXMLOptions);
-
-private:
-    
-	bool bOnlyPresentation;
-	bool loadOptionFromXML(CString parametr,BSTR sXMLOptions);
-
-	HRESULT LoadFromFileImpl(const std::wstring & srcFileName,
-        const std::wstring & srcTempPath,
-        const std::wstring & dstTempPath,
-        const std::wstring & dstPath,
-		const std::wstring & fontsPath);
-
-	std::wstring GetDefWinFontDirectory();
-
-protected:
-
-	static void OnProgressFunc (LPVOID lpParam, long nID, long nPercent);
-	static void OnProgressExFunc (LPVOID lpParam, long nID, long nPercent, short* pStop);
-};

ASCOfficeOdfFile/ASCOfficeOdfFile/ReadMe.txt

@@ -1,68 +0,0 @@
-========================================================================
-    ACTIVE TEMPLATE LIBRARY : ASCOfficeOdfFile Project Overview
-========================================================================
-
-AppWizard has created this ASCOfficeOdfFile project for you to use as the starting point for
-writing your Dynamic Link Library (DLL).
-
-This project is implemented with Visual C++ attributes.
-
-This file contains a summary of what you will find in each of the files that
-make up your project.
-
-ASCOfficeOdfFile.vcproj
-    This is the main project file for VC++ projects generated using an Application Wizard. 
-    It contains information about the version of Visual C++ that generated the file, and 
-    information about the platforms, configurations, and project features selected with the
-    Application Wizard.
-
-_ASCOfficeOdfFile.idl
-    This file will be generated by the compiler when the project is built. It will contain the IDL 
-    definitions of the type library, the interfaces and co-classes defined in your project.
-    This file will be processed by the MIDL compiler to generate:
-        C++ interface definitions and GUID declarations (_ASCOfficeOdfFile.h)
-        GUID definitions                                (_ASCOfficeOdfFile_i.c)
-        A type library                                  (_ASCOfficeOdfFile.tlb)
-        Marshaling code                                 (_ASCOfficeOdfFile_p.c and dlldata.c)
-
-ASCOfficeOdfFile.cpp
-    This file contains the object map and the implementation of your DLL's exports.
-
-ASCOfficeOdfFile.rc
-    This is a listing of all of the Microsoft Windows resources that the
-    program uses.
-
-ASCOfficeOdfFile.def
-    This module-definition file provides the linker with information about the exports
-    required by your DLL. It contains exports for:
-        DllGetClassObject  
-        DllCanUnloadNow    
-        GetProxyDllInfo    
-        DllRegisterServer	
-        DllUnregisterServer
-
-/////////////////////////////////////////////////////////////////////////////
-Other standard files:
-
-StdAfx.h, StdAfx.cpp
-    These files are used to build a precompiled header (PCH) file
-    named ASCOfficeOdfFile.pch and a precompiled types file named StdAfx.obj.
-
-Resource.h
-    This is the standard header file that defines resource IDs.
-
-/////////////////////////////////////////////////////////////////////////////
-Proxy/stub DLL project and module definition file:
-
-ASCOfficeOdfFileps.vcproj
-    This file is the project file for building a proxy/stub DLL if necessary.
-	The IDL file in the main project must contain at least one interface and you must 
-	first compile the IDL file before building the proxy/stub DLL.	This process generates
-	dlldata.c, ASCOfficeOdfFile_i.c and ASCOfficeOdfFile_p.c which are required
-	to build the proxy/stub DLL.
-
-ASCOfficeOdfFileps.def
-    This module definition file provides the linker with information about the exports
-    required by the proxy/stub.
-
-/////////////////////////////////////////////////////////////////////////////

ASCOfficeOdfFile/ASCOfficeOdfFile/Resource.h

@@ -1,49 +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 ASCOfficeOdfFile.rc
-//
-
-#define IDS_PROJNAME                    100
-#define IDR_ASCOFFICEODFFILE	101
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        201
-#define _APS_NEXT_COMMAND_VALUE         32768
-#define _APS_NEXT_CONTROL_VALUE         201
-#define _APS_NEXT_SYMED_VALUE           102
-#endif
-#endif

ASCOfficeOdfFile/ASCOfficeOdfFile/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
-// ASCOfficeOdfFile.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"

ASCOfficeOdfFile/ASCOfficeOdfFile/stdafx.h

@@ -1,87 +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 0x0501	// 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 0x0510 // 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 0x0500	// Change this to the appropriate value to target IE 5.0 or later.
-#endif
-
-#define _ATL_APARTMENT_THREADED
-#define _ATL_NO_AUTOMATIC_NAMESPACE
-
-#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 <atlbase.h>
-#include <atlcom.h>
-//#include <atlwin.h>
-//#include <atltypes.h>
-//#include <atlctl.h>
-//#include <atlhost.h>
-
-//#include <windef.h>
-//#include <wingdi.h>
-using namespace ATL;
-
-typedef void (*OdfOnProgressCallback)( LPVOID lpParam, long nID, long nPercent );
-typedef void (*OdfOnProgressExCallback)( LPVOID lpParam, long nID, long nPercent, short* Cancel );
-
-struct ProgressCallback
-{
-  OdfOnProgressCallback OnProgress;
-  OdfOnProgressExCallback OnProgressEx;
-  LPVOID caller;
-};

ASCOfficeOdfFile/OdfFileTest/OdfFile.sln

@@ -1,278 +1,278 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml_wrapper", "cpxml.vcproj", "{41BED424-4EAF-4053-8A5F-1E2A387D53D1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormatReaderLib", "cpodf.vcproj", "{50E20601-4A8D-4AFB-8870-63828D328429}"
-	ProjectSection(ProjectDependencies) = postProject
-		{94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A}
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
-		{609ED938-3CA8-4BED-B363-25096D4C4812} = {609ED938-3CA8-4BED-B363-25096D4C4812}
-		{41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1}
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfCommon", "cpcommon.vcproj", "{609ED938-3CA8-4BED-B363-25096D4C4812}"
-	ProjectSection(ProjectDependencies) = postProject
-		{41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormulasConvert", "formulasconvert.vcproj", "{94954A67-A853-43B1-A727-6EF2774C5A6A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFileTest", "..\Test\ASCOfficeOdfFileTest\ASCOfficeOdfFileTest.vcproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50E20601-4A8D-4AFB-8870-63828D328429} = {50E20601-4A8D-4AFB-8870-63828D328429}
-		{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}
-		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
-		{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}") = "libxml2", "..\..\Common\DocxFormat\Source\XML\libxml2\win_build\libxml2.vcproj", "{21663823-DE45-479B-91D0-B4FEF4916EF0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "..\..\DesktopEditor\graphics\graphics_vs2005.vcproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "font_engine", "..\..\DesktopEditor\fontengine\font_engine_vs2005.vcproj", "{C739151F-5384-41DF-A1A6-F089E2C1AD56}"
-	ProjectSection(ProjectDependencies) = postProject
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "..\..\DesktopEditor\freetype-2.5.2\builds\windows\vc2005\freetype.vcproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raster", "..\..\DesktopEditor\raster\raster_vs2005.vcproj", "{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1} = {EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "..\..\DesktopEditor\cximage\CxImage\cximage_vs2005.vcproj", "{BC52A07C-A797-423D-8C4F-8678805BBB36}"
-	ProjectSection(ProjectDependencies) = postProject
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
-		{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
-		{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
-		{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
-		{818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jasper", "..\..\DesktopEditor\cximage\jasper\jasper_vs2005.vcproj", "{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jbig", "..\..\DesktopEditor\cximage\jbig\jbig_vs2005.vcproj", "{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "..\..\DesktopEditor\cximage\jpeg\Jpeg_vs2005.vcproj", "{818753F2-DBB9-4D3B-898A-A604309BE470}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpsd", "..\..\DesktopEditor\cximage\libpsd\libpsd_vs2005.vcproj", "{9A037A69-D1DF-4505-AB2A-6CB3641C476E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mng", "..\..\DesktopEditor\cximage\mng\mng_vs2005.vcproj", "{40A69F40-063E-43FD-8543-455495D8733E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\..\DesktopEditor\cximage\png\png_vs2005.vcproj", "{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdcr", "..\..\DesktopEditor\cximage\raw\libdcr_vs2005.vcproj", "{DF861D33-9BC1-418C-82B1-581F590FE169}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tiff", "..\..\DesktopEditor\cximage\tiff\Tiff_vs2005.vcproj", "{0588563C-F05C-428C-B21A-DD74756628B3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jbig2", "..\..\DesktopEditor\raster\JBig2\win32\jbig2.vcproj", "{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agg2d", "..\..\DesktopEditor\agg-2.4\agg_vs2005.vcproj", "{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeUtilsLib", "..\..\OfficeUtils\win32\OfficeUtilsLib.vcproj", "{F8274B05-168E-4D6E-B843-AA7510725363}"
-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
-		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Debug|Win32.Build.0 = Debug|Win32
-		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Debug|x64.ActiveCfg = Debug|x64
-		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Debug|x64.Build.0 = Debug|x64
-		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release|Win32.ActiveCfg = Release|Win32
-		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release|Win32.Build.0 = Release|Win32
-		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release|x64.ActiveCfg = Release|x64
-		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release|x64.Build.0 = Release|x64
-		{50E20601-4A8D-4AFB-8870-63828D328429}.Debug|Win32.ActiveCfg = Debug|Win32
-		{50E20601-4A8D-4AFB-8870-63828D328429}.Debug|Win32.Build.0 = Debug|Win32
-		{50E20601-4A8D-4AFB-8870-63828D328429}.Debug|x64.ActiveCfg = Debug|x64
-		{50E20601-4A8D-4AFB-8870-63828D328429}.Debug|x64.Build.0 = Debug|x64
-		{50E20601-4A8D-4AFB-8870-63828D328429}.Release|Win32.ActiveCfg = Release|Win32
-		{50E20601-4A8D-4AFB-8870-63828D328429}.Release|Win32.Build.0 = Release|Win32
-		{50E20601-4A8D-4AFB-8870-63828D328429}.Release|x64.ActiveCfg = Release|x64
-		{50E20601-4A8D-4AFB-8870-63828D328429}.Release|x64.Build.0 = Release|x64
-		{609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|Win32.ActiveCfg = Debug|Win32
-		{609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|Win32.Build.0 = Debug|Win32
-		{609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|x64.ActiveCfg = Debug|x64
-		{609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|x64.Build.0 = Debug|x64
-		{609ED938-3CA8-4BED-B363-25096D4C4812}.Release|Win32.ActiveCfg = Release|Win32
-		{609ED938-3CA8-4BED-B363-25096D4C4812}.Release|Win32.Build.0 = Release|Win32
-		{609ED938-3CA8-4BED-B363-25096D4C4812}.Release|x64.ActiveCfg = Release|x64
-		{609ED938-3CA8-4BED-B363-25096D4C4812}.Release|x64.Build.0 = Release|x64
-		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|Win32.Build.0 = Debug|Win32
-		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|x64.ActiveCfg = Debug|x64
-		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|x64.Build.0 = Debug|x64
-		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|Win32.ActiveCfg = Release|Win32
-		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|Win32.Build.0 = Release|Win32
-		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|x64.ActiveCfg = Release|x64
-		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|x64.Build.0 = Release|x64
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|Win32.Build.0 = Debug|Win32
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|x64.ActiveCfg = Debug|x64
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|x64.Build.0 = Debug|x64
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.ActiveCfg = Release|Win32
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.Build.0 = Release|Win32
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|x64.ActiveCfg = Release|x64
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|x64.Build.0 = Release|x64
-		{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|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.Build.0 = Debug|x64
-		{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|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.Build.0 = Release|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Win32.Build.0 = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|x64.ActiveCfg = Debug|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|x64.Build.0 = Debug|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.ActiveCfg = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.Build.0 = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|x64.ActiveCfg = Release|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|x64.Build.0 = Release|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|Win32.Build.0 = Debug|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|x64.ActiveCfg = Debug|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|x64.Build.0 = Debug|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|Win32.ActiveCfg = Release|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|Win32.Build.0 = Release|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|x64.ActiveCfg = Release|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|x64.Build.0 = Release|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|Win32.Build.0 = Debug|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|x64.ActiveCfg = Debug|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|x64.Build.0 = Debug|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|Win32.ActiveCfg = Release|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|Win32.Build.0 = Release|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|x64.ActiveCfg = Release|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|x64.Build.0 = Release|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|Win32.Build.0 = Debug|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|x64.ActiveCfg = Debug|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|x64.Build.0 = Debug|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|Win32.ActiveCfg = Release|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|Win32.Build.0 = Release|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|x64.ActiveCfg = Release|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|x64.Build.0 = Release|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|Win32.Build.0 = Debug|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|x64.ActiveCfg = Debug|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|x64.Build.0 = Debug|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|Win32.ActiveCfg = Release|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|Win32.Build.0 = Release|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|x64.ActiveCfg = Release|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|x64.Build.0 = Release|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|Win32.ActiveCfg = Debug|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|Win32.Build.0 = Debug|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|x64.ActiveCfg = Debug|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|x64.Build.0 = Debug|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|Win32.ActiveCfg = Release|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|Win32.Build.0 = Release|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|x64.ActiveCfg = Release|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|x64.Build.0 = Release|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|Win32.ActiveCfg = Debug|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|Win32.Build.0 = Debug|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|x64.ActiveCfg = Debug|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|x64.Build.0 = Debug|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|Win32.ActiveCfg = Release|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|Win32.Build.0 = Release|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|x64.ActiveCfg = Release|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|x64.Build.0 = Release|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|Win32.Build.0 = Debug|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|x64.ActiveCfg = Debug|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|x64.Build.0 = Debug|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|Win32.ActiveCfg = Release|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|Win32.Build.0 = Release|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|x64.ActiveCfg = Release|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|x64.Build.0 = Release|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|Win32.Build.0 = Debug|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|x64.ActiveCfg = Debug|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|x64.Build.0 = Debug|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.Release|Win32.ActiveCfg = Release|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.Release|Win32.Build.0 = Release|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.Release|x64.ActiveCfg = Release|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.Release|x64.Build.0 = Release|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|Win32.Build.0 = Debug|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|x64.ActiveCfg = Debug|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|x64.Build.0 = Debug|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|Win32.ActiveCfg = Release|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|Win32.Build.0 = Release|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|x64.ActiveCfg = Release|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|x64.Build.0 = Release|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|Win32.Build.0 = Debug|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|x64.ActiveCfg = Debug|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|x64.Build.0 = Debug|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|Win32.ActiveCfg = Release|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|Win32.Build.0 = Release|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|x64.ActiveCfg = Release|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|x64.Build.0 = Release|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|Win32.Build.0 = Debug|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|x64.ActiveCfg = Debug|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|x64.Build.0 = Debug|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|Win32.ActiveCfg = Release|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|Win32.Build.0 = Release|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|x64.ActiveCfg = Release|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|x64.Build.0 = Release|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|Win32.Build.0 = Debug|Win32
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|x64.ActiveCfg = Debug|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|x64.Build.0 = Debug|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|Win32.ActiveCfg = Release|Win32
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|Win32.Build.0 = Release|Win32
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|x64.ActiveCfg = Release|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|x64.Build.0 = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Win32.Build.0 = Debug|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|x64.ActiveCfg = Debug|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|x64.Build.0 = Debug|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Win32.ActiveCfg = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Win32.Build.0 = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|x64.ActiveCfg = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|x64.Build.0 = Release|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|Win32.Build.0 = Debug|Win32
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|x64.ActiveCfg = Debug|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|x64.Build.0 = Debug|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Release|Win32.ActiveCfg = Release|Win32
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Release|Win32.Build.0 = Release|Win32
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Release|x64.ActiveCfg = Release|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+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}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormatReaderLib", "..\win32\cpodf.vcproj", "{50E20601-4A8D-4AFB-8870-63828D328429}"
+	ProjectSection(ProjectDependencies) = postProject
+		{94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A}
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
+		{609ED938-3CA8-4BED-B363-25096D4C4812} = {609ED938-3CA8-4BED-B363-25096D4C4812}
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1}
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfCommon", "..\win32\cpcommon.vcproj", "{609ED938-3CA8-4BED-B363-25096D4C4812}"
+	ProjectSection(ProjectDependencies) = postProject
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormulasConvert", "..\win32\formulasconvert.vcproj", "{94954A67-A853-43B1-A727-6EF2774C5A6A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFileReaderTest", "OdfFileTest.vcproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
+	ProjectSection(ProjectDependencies) = postProject
+		{50E20601-4A8D-4AFB-8870-63828D328429} = {50E20601-4A8D-4AFB-8870-63828D328429}
+		{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}
+		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
+		{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}"
+	ProjectSection(ProjectDependencies) = postProject
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "font_engine", "..\..\DesktopEditor\fontengine\font_engine_vs2005.vcproj", "{C739151F-5384-41DF-A1A6-F089E2C1AD56}"
+	ProjectSection(ProjectDependencies) = postProject
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "..\..\DesktopEditor\freetype-2.5.2\builds\windows\vc2005\freetype.vcproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raster", "..\..\DesktopEditor\raster\raster_vs2005.vcproj", "{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1} = {EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "..\..\DesktopEditor\cximage\CxImage\cximage_vs2005.vcproj", "{BC52A07C-A797-423D-8C4F-8678805BBB36}"
+	ProjectSection(ProjectDependencies) = postProject
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
+		{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
+		{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
+		{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
+		{818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jasper", "..\..\DesktopEditor\cximage\jasper\jasper_vs2005.vcproj", "{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jbig", "..\..\DesktopEditor\cximage\jbig\jbig_vs2005.vcproj", "{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "..\..\DesktopEditor\cximage\jpeg\Jpeg_vs2005.vcproj", "{818753F2-DBB9-4D3B-898A-A604309BE470}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpsd", "..\..\DesktopEditor\cximage\libpsd\libpsd_vs2005.vcproj", "{9A037A69-D1DF-4505-AB2A-6CB3641C476E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mng", "..\..\DesktopEditor\cximage\mng\mng_vs2005.vcproj", "{40A69F40-063E-43FD-8543-455495D8733E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\..\DesktopEditor\cximage\png\png_vs2005.vcproj", "{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdcr", "..\..\DesktopEditor\cximage\raw\libdcr_vs2005.vcproj", "{DF861D33-9BC1-418C-82B1-581F590FE169}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tiff", "..\..\DesktopEditor\cximage\tiff\Tiff_vs2005.vcproj", "{0588563C-F05C-428C-B21A-DD74756628B3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jbig2", "..\..\DesktopEditor\raster\JBig2\win32\jbig2.vcproj", "{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agg2d", "..\..\DesktopEditor\agg-2.4\agg_vs2005.vcproj", "{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeUtilsLib", "..\..\OfficeUtils\win32\OfficeUtilsLib.vcproj", "{F8274B05-168E-4D6E-B843-AA7510725363}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\DesktopEditor\xml\build\vs2005\libxml2.vcproj", "{21663823-DE45-479B-91D0-B4FEF4916EF0}"
+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
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Debug|Win32.Build.0 = Debug|Win32
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Debug|x64.ActiveCfg = Debug|x64
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Debug|x64.Build.0 = Debug|x64
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release|Win32.ActiveCfg = Release|Win32
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release|Win32.Build.0 = Release|Win32
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release|x64.ActiveCfg = Release|x64
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release|x64.Build.0 = Release|x64
+		{50E20601-4A8D-4AFB-8870-63828D328429}.Debug|Win32.ActiveCfg = Debug|Win32
+		{50E20601-4A8D-4AFB-8870-63828D328429}.Debug|Win32.Build.0 = Debug|Win32
+		{50E20601-4A8D-4AFB-8870-63828D328429}.Debug|x64.ActiveCfg = Debug|x64
+		{50E20601-4A8D-4AFB-8870-63828D328429}.Debug|x64.Build.0 = Debug|x64
+		{50E20601-4A8D-4AFB-8870-63828D328429}.Release|Win32.ActiveCfg = Release|Win32
+		{50E20601-4A8D-4AFB-8870-63828D328429}.Release|Win32.Build.0 = Release|Win32
+		{50E20601-4A8D-4AFB-8870-63828D328429}.Release|x64.ActiveCfg = Release|x64
+		{50E20601-4A8D-4AFB-8870-63828D328429}.Release|x64.Build.0 = Release|x64
+		{609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|Win32.ActiveCfg = Debug|Win32
+		{609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|Win32.Build.0 = Debug|Win32
+		{609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|x64.ActiveCfg = Debug|x64
+		{609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|x64.Build.0 = Debug|x64
+		{609ED938-3CA8-4BED-B363-25096D4C4812}.Release|Win32.ActiveCfg = Release|Win32
+		{609ED938-3CA8-4BED-B363-25096D4C4812}.Release|Win32.Build.0 = Release|Win32
+		{609ED938-3CA8-4BED-B363-25096D4C4812}.Release|x64.ActiveCfg = Release|x64
+		{609ED938-3CA8-4BED-B363-25096D4C4812}.Release|x64.Build.0 = Release|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|Win32.Build.0 = Debug|Win32
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|x64.ActiveCfg = Debug|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|x64.Build.0 = Debug|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|Win32.ActiveCfg = Release|Win32
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|Win32.Build.0 = Release|Win32
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|x64.ActiveCfg = Release|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|x64.Build.0 = Release|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|Win32.Build.0 = Debug|Win32
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|x64.ActiveCfg = Debug|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|x64.Build.0 = Debug|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.ActiveCfg = Release|Win32
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.Build.0 = Release|Win32
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|x64.ActiveCfg = Release|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|x64.Build.0 = Release|x64
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Win32.Build.0 = Debug|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|x64.ActiveCfg = Debug|x64
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|x64.Build.0 = Debug|x64
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.ActiveCfg = Release|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.Build.0 = Release|Win32
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|x64.ActiveCfg = Release|x64
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|x64.Build.0 = Release|x64
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|Win32.Build.0 = Debug|Win32
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|x64.ActiveCfg = Debug|x64
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|x64.Build.0 = Debug|x64
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|Win32.ActiveCfg = Release|Win32
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|Win32.Build.0 = Release|Win32
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|x64.ActiveCfg = Release|x64
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|x64.Build.0 = Release|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|Win32.Build.0 = Debug|Win32
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|x64.ActiveCfg = Debug|x64
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|x64.Build.0 = Debug|x64
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|Win32.ActiveCfg = Release|Win32
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|Win32.Build.0 = Release|Win32
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|x64.ActiveCfg = Release|x64
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|x64.Build.0 = Release|x64
+		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|Win32.Build.0 = Debug|Win32
+		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|x64.ActiveCfg = Debug|x64
+		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|x64.Build.0 = Debug|x64
+		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|Win32.ActiveCfg = Release|Win32
+		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|Win32.Build.0 = Release|Win32
+		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|x64.ActiveCfg = Release|x64
+		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|x64.Build.0 = Release|x64
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|Win32.Build.0 = Debug|Win32
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|x64.ActiveCfg = Debug|x64
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|x64.Build.0 = Debug|x64
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|Win32.ActiveCfg = Release|Win32
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|Win32.Build.0 = Release|Win32
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|x64.ActiveCfg = Release|x64
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|x64.Build.0 = Release|x64
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|Win32.ActiveCfg = Debug|Win32
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|Win32.Build.0 = Debug|Win32
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|x64.ActiveCfg = Debug|x64
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|x64.Build.0 = Debug|x64
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|Win32.ActiveCfg = Release|Win32
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|Win32.Build.0 = Release|Win32
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|x64.ActiveCfg = Release|x64
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|x64.Build.0 = Release|x64
+		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|Win32.ActiveCfg = Debug|Win32
+		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|Win32.Build.0 = Debug|Win32
+		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|x64.ActiveCfg = Debug|x64
+		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|x64.Build.0 = Debug|x64
+		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|Win32.ActiveCfg = Release|Win32
+		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|Win32.Build.0 = Release|Win32
+		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|x64.ActiveCfg = Release|x64
+		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|x64.Build.0 = Release|x64
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|Win32.Build.0 = Debug|Win32
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|x64.ActiveCfg = Debug|x64
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|x64.Build.0 = Debug|x64
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|Win32.ActiveCfg = Release|Win32
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|Win32.Build.0 = Release|Win32
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|x64.ActiveCfg = Release|x64
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|x64.Build.0 = Release|x64
+		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|Win32.Build.0 = Debug|Win32
+		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|x64.ActiveCfg = Debug|x64
+		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|x64.Build.0 = Debug|x64
+		{40A69F40-063E-43FD-8543-455495D8733E}.Release|Win32.ActiveCfg = Release|Win32
+		{40A69F40-063E-43FD-8543-455495D8733E}.Release|Win32.Build.0 = Release|Win32
+		{40A69F40-063E-43FD-8543-455495D8733E}.Release|x64.ActiveCfg = Release|x64
+		{40A69F40-063E-43FD-8543-455495D8733E}.Release|x64.Build.0 = Release|x64
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|Win32.Build.0 = Debug|Win32
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|x64.ActiveCfg = Debug|x64
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|x64.Build.0 = Debug|x64
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|Win32.ActiveCfg = Release|Win32
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|Win32.Build.0 = Release|Win32
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|x64.ActiveCfg = Release|x64
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|x64.Build.0 = Release|x64
+		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|Win32.Build.0 = Debug|Win32
+		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|x64.ActiveCfg = Debug|x64
+		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|x64.Build.0 = Debug|x64
+		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|Win32.ActiveCfg = Release|Win32
+		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|Win32.Build.0 = Release|Win32
+		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|x64.ActiveCfg = Release|x64
+		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|x64.Build.0 = Release|x64
+		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|Win32.Build.0 = Debug|Win32
+		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|x64.ActiveCfg = Debug|x64
+		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|x64.Build.0 = Debug|x64
+		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|Win32.ActiveCfg = Release|Win32
+		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|Win32.Build.0 = Release|Win32
+		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|x64.ActiveCfg = Release|x64
+		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|x64.Build.0 = Release|x64
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|Win32.Build.0 = Debug|Win32
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|x64.ActiveCfg = Debug|x64
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|x64.Build.0 = Debug|x64
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|Win32.ActiveCfg = Release|Win32
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|Win32.Build.0 = Release|Win32
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|x64.ActiveCfg = Release|x64
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|x64.Build.0 = Release|x64
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Win32.Build.0 = Debug|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|x64.ActiveCfg = Debug|x64
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|x64.Build.0 = Debug|x64
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Win32.ActiveCfg = Release|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Win32.Build.0 = Release|Win32
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|x64.ActiveCfg = Release|x64
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|x64.Build.0 = Release|x64
+		{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|Win32.Build.0 = Debug|Win32
+		{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|x64.ActiveCfg = Debug|x64
+		{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|x64.Build.0 = Debug|x64
+		{F8274B05-168E-4D6E-B843-AA7510725363}.Release|Win32.ActiveCfg = Release|Win32
+		{F8274B05-168E-4D6E-B843-AA7510725363}.Release|Win32.Build.0 = Release|Win32
+		{F8274B05-168E-4D6E-B843-AA7510725363}.Release|x64.ActiveCfg = Release|x64
+		{F8274B05-168E-4D6E-B843-AA7510725363}.Release|x64.Build.0 = Release|x64
+		{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|x64
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.Build.0 = Debug|x64
+		{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|x64
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.cpp

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

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.vcproj

@@ -1,376 +1,376 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="ASCOfficeOdfFileTest"
-	ProjectGUID="{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
-	RootNamespace="ASCOfficeOdfFileTest"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="gdi32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="kernel32.lib $(NoInherit)"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="kernel32.lib $(NoInherit)"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="kernel32.lib $(NoInherit)"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\ASCOfficeOdfFileTest.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\Common\3dParty\pole\pole.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\..\UnicodeConverter\UnicodeConverter.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="OdfFileReaderTest"
+	ProjectGUID="{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
+	RootNamespace="ASCOfficeOdfFileTest"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="gdi32.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="kernel32.lib $(NoInherit)"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="kernel32.lib $(NoInherit)"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="kernel32.lib $(NoInherit)"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="OdfFileTest.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\Common\3dParty\pole\pole.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\UnicodeConverter\UnicodeConverter.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

@@ -31,9 +31,11 @@
  */
 #include "formulasconvert.h"
 
-#include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
 #include <boost/foreach.hpp>
+#include <boost/algorithm/string.hpp>
+
+#include"../../Common/DocxFormat/Source/XML/Utils.h"
 
 namespace cpdoccore {
 namespace formulasconvert {
@@ -100,8 +102,8 @@ namespace formulasconvert {
 		else if (sz == 4 && result[1].matched)
 		{
 			table = result[1].str();
-			boost::algorithm::replace_all(table, L"$", L"");
-			boost::algorithm::replace_all(table, L"'", L"");
+			XmlUtils::replace_all( table, L"$", L"");
+			XmlUtils::replace_all( table, L"'", L"");
 			ref =  result[2].str();                
 			return true;
 		}
@@ -122,7 +124,7 @@ namespace formulasconvert {
 		else if (sz == 4 && what[1].matched)
 		{
 			std::wstring sheet1 = what[1].str();
-			boost::algorithm::replace_all(sheet1, L"$", L"");
+			XmlUtils::replace_all( sheet1, L"$", L"");
 
 			const std::wstring c1 = what[2].str(); 
 			std::wstring c2 = what[3].str(); 
@@ -147,7 +149,7 @@ namespace formulasconvert {
 		else if (sz == 4 && what[1].matched)
 		{
 			std::wstring sheet1 = what[1].str();
-			boost::algorithm::replace_all(sheet1, L"$", L"");
+			XmlUtils::replace_all( sheet1, L"$", L"");
 
 			const std::wstring c1 = what[2].str(); 
 			const std::wstring c2 = what[3].str(); 
@@ -164,7 +166,7 @@ namespace formulasconvert {
 		else if (sz == 5 && what[1].matched)
 		{
 			std::wstring sheet1 = what[1].str();
-			boost::algorithm::replace_all(sheet1, L"$", L"");
+			XmlUtils::replace_all( sheet1, L"$", L"");
 
 			const std::wstring c1 = what[2].str(); 
 			const std::wstring c2 = what[3].str(); //sheet name 2
@@ -286,13 +288,15 @@ namespace formulasconvert {
 		if (what[1].matched)
 		{
 			std::wstring inner = what[1].str();
-			boost::algorithm::replace_all(inner, L"|", L";");
+			XmlUtils::replace_all( inner, L"|", L";");
 			return L"{" + inner + L"}";
 		}    
 		else if (what[2].matched)
 			return what[2].str();
 		else if (what[3].matched)
 			return what[3].str();
+	
+		return L"";
 	}
 
 	std::wstring replace_point_space(boost::wsmatch const & what)
@@ -300,60 +304,66 @@ namespace formulasconvert {
 		if (what[1].matched)
 		{
 			std::wstring inner = what[1].str();
-			boost::algorithm::replace_all(inner, L" ", L"PROBEL");
+			XmlUtils::replace_all( inner, L" ", L"PROBEL");
 			return inner;
 		}    
 		else if (what[2].matched)
 			return what[2].str();
 		else if (what[3].matched)
 			return what[3].str();
+	
+		return L"";
 	}
 	std::wstring convert_scobci(boost::wsmatch const & what)
 	{
 		if (what[1].matched)
 		{
 			std::wstring inner = what[1].str();
-			boost::algorithm::replace_all(inner, L".", L"ТОСHKA");
-			boost::algorithm::replace_all(inner, L"(", L"SCOBCAIN");
-			boost::algorithm::replace_all(inner, L")", L"SCOBCAOUT");
+			XmlUtils::replace_all( inner, L".", L"ТОСHKA");
+			XmlUtils::replace_all( inner, L"(", L"SCOBCAIN");
+			XmlUtils::replace_all( inner, L")", L"SCOBCAOUT");
 
-			boost::algorithm::replace_all(inner, L"[", L"KVADRATIN");
-			boost::algorithm::replace_all(inner, L"]", L"KVADRATOUT");
+			XmlUtils::replace_all( inner, L"[", L"KVADRATIN");
+			XmlUtils::replace_all( inner, L"]", L"KVADRATOUT");
 			
-			boost::algorithm::replace_all(inner, L" ", L"PROBEL");
-			boost::algorithm::replace_all(inner, L"'", L"APOSTROF");
+			XmlUtils::replace_all( inner, L" ", L"PROBEL");
+			XmlUtils::replace_all( inner, L"'", L"APOSTROF");
 			return inner;
 		}
 		else if (what[2].matched)
 		{
 			std::wstring inner = what[2].str();
-			boost::algorithm::replace_all(inner, L".", L"ТОСHKA");
+			XmlUtils::replace_all( inner, L".", L"ТОСHKA");
 
-			boost::algorithm::replace_all(inner, L"(", L"SCOBCAIN");
-			boost::algorithm::replace_all(inner, L")", L"SCOBCAOUT");
+			XmlUtils::replace_all( inner, L"(", L"SCOBCAIN");
+			XmlUtils::replace_all( inner, L")", L"SCOBCAOUT");
 
- 			boost::algorithm::replace_all(inner, L"[", L"KVADRATIN");
-			boost::algorithm::replace_all(inner, L"]", L"KVADRATOUT");
+ 			XmlUtils::replace_all( inner, L"[", L"KVADRATIN");
+			XmlUtils::replace_all( inner, L"]", L"KVADRATOUT");
 			
-			boost::algorithm::replace_all(inner, L" ", L"PROBEL");
-			boost::algorithm::replace_all(inner, L"\"", L"KAVYCHKA");
+			XmlUtils::replace_all( inner, L" ", L"PROBEL");
+			XmlUtils::replace_all( inner, L"\"", L"KAVYCHKA");
 			return inner;
 		}
 		else if (what[3].matched)
 			return what[3].str();
+	
+		return L"";
 	}
 	std::wstring replace_space_formater(boost::wsmatch const & what)
 	{
 		if (what[1].matched)
 		{
 			std::wstring inner = what[1].str();
-			boost::algorithm::replace_all(inner, L" ", L",");
+			XmlUtils::replace_all( inner, L" ", L",");
 			return inner;
 		}    
 		else if (what[2].matched)
 			return what[2].str();
 		else if (what[3].matched)
 			return what[3].str();
+
+		return L"";
 	}
 
 
@@ -430,7 +440,7 @@ namespace formulasconvert {
 		
 		if (isFormula)
 		{
-			boost::algorithm::replace_all(workstr, L"FDIST(", L"_xlfn.F.DIST(");
+			XmlUtils::replace_all( workstr, L"FDIST(", L"_xlfn.F.DIST(");
 			// ROUNDUP( - тут в oox 2 параметра - разрядность нужно - ,0) - EV Requirements v2.2.3.ods
 			
 			int res_find=0;
@@ -444,18 +454,18 @@ namespace formulasconvert {
 
 
 	//-----------------------------------------------------------
- 		boost::algorithm::replace_all(workstr, L"PROBEL"	, L" ");
-		boost::algorithm::replace_all(workstr, L"APOSTROF"	, L"'");
-		boost::algorithm::replace_all(workstr, L"ТОСHKA"	, L".");
+ 		XmlUtils::replace_all( workstr, L"PROBEL"	, L" ");
+		XmlUtils::replace_all( workstr, L"APOSTROF"	, L"'");
+		XmlUtils::replace_all( workstr, L"ТОСHKA"	, L".");
 
-		boost::algorithm::replace_all(workstr, L"SCOBCAIN"	, L"(");
-		boost::algorithm::replace_all(workstr, L"SCOBCAOUT"	, L")");
+		XmlUtils::replace_all( workstr, L"SCOBCAIN"	, L"(");
+		XmlUtils::replace_all( workstr, L"SCOBCAOUT"	, L")");
 
-		boost::algorithm::replace_all(workstr, L"KVADRATIN"	, L"[");
-		boost::algorithm::replace_all(workstr, L"KVADRATOUT", L"]");
+		XmlUtils::replace_all( workstr, L"KVADRATIN"	, L"[");
+		XmlUtils::replace_all( workstr, L"KVADRATOUT", L"]");
 
-		boost::algorithm::replace_all(workstr, L"PROBEL"	, L" ");
-		boost::algorithm::replace_all(workstr, L"KAVYCHKA"	, L"\"");
+		XmlUtils::replace_all( workstr, L"PROBEL"	, L" ");
+		XmlUtils::replace_all( workstr, L"KAVYCHKA"	, L"\"");
 
 		return workstr;
 	}
@@ -523,8 +533,8 @@ namespace formulasconvert {
 			result.append(d);
 			result.append(L",");
 		}
- 		boost::algorithm::replace_all(result, L"PROBEL" , L" ");
-		boost::algorithm::replace_all(result, L"TOCHKA"	, L".");
+ 		XmlUtils::replace_all( result, L"PROBEL" , L" ");
+		XmlUtils::replace_all( result, L"TOCHKA"	, L".");
 		
 		return result.substr(0, result.size()-1);// минус последняя лишняя запятая
 	}
@@ -554,19 +564,19 @@ namespace formulasconvert {
 			&replace_point_space,
 			boost::match_default | boost::format_all);	
 		
-		boost::algorithm::replace_all(workstr, L"'", L"APOSTROF");
-		//boost::algorithm::replace_all(workstr, L"", L"APOSTROF");
+		XmlUtils::replace_all( workstr, L"'", L"APOSTROF");
+		//XmlUtils::replace_all( workstr, L"", L"APOSTROF");
 
 		impl_->replace_named_ref(workstr, withTableName);
 
 		if (separator != L" ")
 		{
-			boost::algorithm::replace_all(workstr, L" "	, separator);
+			XmlUtils::replace_all( workstr, L" "	, separator);
 		}
 
-		boost::algorithm::replace_all(workstr, L"PROBEL"	, L" ");
-		boost::algorithm::replace_all(workstr, L"APOSTROF"	, L"'");
-		boost::algorithm::replace_all(workstr, L"TOCHKA"	, L".");
+		XmlUtils::replace_all( workstr, L"PROBEL"	, L" ");
+		XmlUtils::replace_all( workstr, L"APOSTROF"	, L"'");
+		XmlUtils::replace_all( workstr, L"TOCHKA"	, L".");
 		return workstr;
 	}
 	std::wstring odf2oox_converter::convert_named_expr(const std::wstring& expr, bool withTableName)
@@ -579,7 +589,7 @@ namespace formulasconvert {
 			&replace_point_space,
 			boost::match_default | boost::format_all);	
 
-		boost::algorithm::replace_all(workstr, L"'", L"APOSTROF");
+		XmlUtils::replace_all( workstr, L"'", L"APOSTROF");
 	   
 		impl_->replace_cells_range(workstr, withTableName);
 		impl_->replace_semicolons(workstr);
@@ -592,9 +602,9 @@ namespace formulasconvert {
 			//todooo
 
 		}
- 		boost::algorithm::replace_all(workstr, L"PROBEL"	, L" ");
-		boost::algorithm::replace_all(workstr, L"APOSTROF"	, L"'");
-		boost::algorithm::replace_all(workstr, L"TOCHKA"	, L".");
+ 		XmlUtils::replace_all( workstr, L"PROBEL"	, L" ");
+		XmlUtils::replace_all( workstr, L"APOSTROF"	, L"'");
+		XmlUtils::replace_all( workstr, L"TOCHKA"	, L".");
 		return workstr;
 	}
 

ASCOfficeOdfFile/formulasconvert/formulasconvert_oox.cpp

@@ -31,10 +31,11 @@
  */
 #include "formulasconvert.h"
 
-#include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
 #include <boost/foreach.hpp>
-#include <boost/lexical_cast.hpp>
+#include <boost/algorithm/string.hpp>
+
+#include"../../Common/DocxFormat/Source/XML/Utils.h"
 
 namespace cpdoccore {
 namespace formulasconvert {
@@ -102,8 +103,8 @@ public:
 //    else if (sz == 4 && result[1].matched)
 //    {
 //        table = result[1].str();
-//        boost::algorithm::replace_all(table, L"$", L"");
-//        boost::algorithm::replace_all(table, L"'", L"");
+//        XmlUtils::replace_all( table, L"$", L"");
+//        XmlUtils::replace_all( table, L"'", L"");
 //        ref =  result[2].str();                
 //        return true;
 //    }
@@ -126,7 +127,7 @@ public:
 //    else if (sz == 4 && what[1].matched)
 //    {
 //        std::wstring sheet1 = what[1].str();
-//        boost::algorithm::replace_all(sheet1, L"$", L"");
+//        XmlUtils::replace_all( sheet1, L"$", L"");
 //
 //        const std::wstring c1 = what[2].str(); 
 //        const std::wstring c2 = what[3].str(); 
@@ -180,7 +181,7 @@ std::wstring oox2odf_converter::Impl::replace_cells_range_formater1(boost::wsmat
 	if (sz>3)
     {
 		std::wstring sheet1 = what[1].matched ? what[1].str() : L"";
-        boost::algorithm::replace_all(sheet1, L"!", L"");
+        XmlUtils::replace_all( sheet1, L"!", L"");
 
         std::wstring c1 = what[2].str(); 
         std::wstring c2 = what[3].str(); 
@@ -238,7 +239,7 @@ std::wstring oox2odf_converter::Impl::replace_cells_range_formater2(boost::wsmat
 //    else if (sz == 4 && what[1].matched)
 //    {
 //        std::wstring sheet1 = what[1].str();
-//        boost::algorithm::replace_all(sheet1, L"$", L"");
+//        XmlUtils::replace_all( sheet1, L"$", L"");
 //
 //        const std::wstring c1 = what[2].str(); 
 //        const std::wstring c2 = what[3].str(); 
@@ -265,20 +266,19 @@ void oox2odf_converter::Impl::replace_named_ref(std::wstring & expr)
 
 	BOOST_FOREACH(std::wstring &d, distance)
 	{		
-	
-		boost::algorithm::replace_all(d, L"(", L"SCOBCAIN");
-		boost::algorithm::replace_all(d, L")", L"SCOBCAOUT");
-		boost::algorithm::replace_all(d, L" ", L"PROBEL");
-		boost::algorithm::replace_all(d, L"'", L"APOSTROF");
-		boost::algorithm::replace_all(d, L"\"", L"KAVYCHKA");
+		XmlUtils::replace_all( d, L"(", L"SCOBCAIN");
+		XmlUtils::replace_all( d, L")", L"SCOBCAOUT");
+		XmlUtils::replace_all( d, L" ", L"PROBEL");
+		XmlUtils::replace_all( d, L"'", L"APOSTROF");
+		XmlUtils::replace_all( d, L"\"", L"KAVYCHKA");
 		
 		replace_cells_range(d);
 
-		boost::algorithm::replace_all(d, L"SCOBCAIN", L"(");
-		boost::algorithm::replace_all(d, L"SCOBCAOUT", L")");
-		boost::algorithm::replace_all(d, L"PROBEL", L" ");
-		boost::algorithm::replace_all(d, L"APOSTROF", L"'");
-		boost::algorithm::replace_all(d, L"KAVYCHKA", L"\"");
+		XmlUtils::replace_all( d, L"SCOBCAIN", L"(");
+		XmlUtils::replace_all( d, L"SCOBCAOUT", L")");
+		XmlUtils::replace_all( d, L"PROBEL", L" ");
+		XmlUtils::replace_all( d, L"APOSTROF", L"'");
+		XmlUtils::replace_all( d, L"KAVYCHKA", L"\"");
 			
 		out = out + d + std::wstring(L";");
 	}
@@ -342,26 +342,30 @@ std::wstring replace_vertical_formater(boost::wsmatch const & what)
     if (what[1].matched)
     {
         std::wstring inner = what[1].str();
-        boost::algorithm::replace_all(inner, L";", L"|");
+        XmlUtils::replace_all( inner, L";", L"|");
         return L"{" + inner + L"}";
     }    
     else if (what[2].matched)
         return what[2].str();
     else if (what[3].matched)
         return what[3].str();
+	
+	return L"";
 }
 std::wstring replace_space_formater(boost::wsmatch const & what)
 {
     if (what[1].matched)
     {
         std::wstring inner = what[1].str();
-        boost::algorithm::replace_all(inner, L",", L" ");
+        XmlUtils::replace_all( inner, L",", L" ");
         return inner;
     }    
     else if (what[2].matched)
         return what[2].str();
     else if (what[3].matched)
         return what[3].str();
+
+	return L"";
 }
 
 }
@@ -426,13 +430,15 @@ std::wstring replace_(boost::wsmatch const & what)
     if (what[1].matched)
     {
         std::wstring inner = what[1].str();
-        boost::algorithm::replace_all(inner, L",", L" ");
+        XmlUtils::replace_all( inner, L",", L" ");
         return inner;
     }    
     else if (what[2].matched)
         return what[2].str();
     else if (what[3].matched)
         return what[3].str();
+
+	return L"";
 }
 std::wstring  oox2odf_converter::Impl::replace_arguments1(std::wstring & workstr1)
 {
@@ -465,31 +471,33 @@ std::wstring oox2odf_converter::Impl::convert_scobci(boost::wsmatch const & what
     if (what[1].matched)
     {
         std::wstring inner = what[1].str();
-        boost::algorithm::replace_all(inner, L"(", L"SCOBCAIN");
-        boost::algorithm::replace_all(inner, L")", L"SCOBCAOUT");
+        XmlUtils::replace_all( inner, L"(", L"SCOBCAIN");
+        XmlUtils::replace_all( inner, L")", L"SCOBCAOUT");
 
-		boost::algorithm::replace_all(inner, L"[", L"KVADRATIN");
-		boost::algorithm::replace_all(inner, L"]", L"KVADRATOUT");
+		XmlUtils::replace_all( inner, L"[", L"KVADRATIN");
+		XmlUtils::replace_all( inner, L"]", L"KVADRATOUT");
 		
-		boost::algorithm::replace_all(inner, L" ", L"PROBEL");
-        boost::algorithm::replace_all(inner, L"'", L"APOSTROF");
+		XmlUtils::replace_all( inner, L" ", L"PROBEL");
+        XmlUtils::replace_all( inner, L"'", L"APOSTROF");
 		return inner;
 	}
     else if (what[2].matched)
     {
         std::wstring inner = what[2].str();
-        boost::algorithm::replace_all(inner, L"(", L"SCOBCAIN");
-        boost::algorithm::replace_all(inner, L")", L"SCOBCAOUT");
+        XmlUtils::replace_all( inner, L"(", L"SCOBCAIN");
+        XmlUtils::replace_all( inner, L")", L"SCOBCAOUT");
 
- 		boost::algorithm::replace_all(inner, L"[", L"KVADRATIN");
-		boost::algorithm::replace_all(inner, L"]", L"KVADRATOUT");
+ 		XmlUtils::replace_all( inner, L"[", L"KVADRATIN");
+		XmlUtils::replace_all( inner, L"]", L"KVADRATOUT");
 		
-		boost::algorithm::replace_all(inner, L" ", L"PROBEL");
-        boost::algorithm::replace_all(inner, L"\"", L"KAVYCHKA");
+		XmlUtils::replace_all( inner, L" ", L"PROBEL");
+        XmlUtils::replace_all( inner, L"\"", L"KAVYCHKA");
 		return inner;
 	}
     else if (what[3].matched)
         return what[3].str();
+
+	return L"";
 }
 
 std::wstring  oox2odf_converter::Impl::replace_arguments(boost::wsmatch const & what)
@@ -557,7 +565,7 @@ std::wstring oox2odf_converter::Impl::convert_formula(const std::wstring & expr)
 
 	if (res1 == res)
 	{
-		boost::algorithm::replace_all(res1, L"KAVYCHKA", L"\""); //IMCONJUGATE_emb.xlsx
+		XmlUtils::replace_all( res1, L"KAVYCHKA", L"\""); //IMCONJUGATE_emb.xlsx
 	
 		res = boost::regex_replace(
 			res1,	
@@ -570,17 +578,17 @@ std::wstring oox2odf_converter::Impl::convert_formula(const std::wstring & expr)
 		replace_semicolons(res);
 	}
 
-    boost::algorithm::replace_all(res, L"SCOBCAIN", L"(");
-    boost::algorithm::replace_all(res, L"SCOBCAOUT", L")");
+    XmlUtils::replace_all( res, L"SCOBCAIN", L"(");
+    XmlUtils::replace_all( res, L"SCOBCAOUT", L")");
 
-	boost::algorithm::replace_all(res, L"KVADRATIN", L"[");
-	boost::algorithm::replace_all(res, L"KVADRATOUT", L"]");
+	XmlUtils::replace_all( res, L"KVADRATIN", L"[");
+	XmlUtils::replace_all( res, L"KVADRATOUT", L"]");
     
-	boost::algorithm::replace_all(res, L"PROBEL", L" ");
+	XmlUtils::replace_all( res, L"PROBEL", L" ");
 
-    boost::algorithm::replace_all(res, L"APOSTROF", L"'");
+    XmlUtils::replace_all( res, L"APOSTROF", L"'");
 
-    boost::algorithm::replace_all(res, L"KAVYCHKA", L"\"");
+    XmlUtils::replace_all( res, L"KAVYCHKA", L"\"");
 
     return std::wstring(L"of:=") + res;
 
@@ -610,14 +618,14 @@ std::wstring oox2odf_converter::Impl::convert_conditional_formula(const std::wst
 		replace_semicolons(res);
 	}
 
-    boost::algorithm::replace_all(res, L"SCOBCAIN", L"(");
-    boost::algorithm::replace_all(res, L"SCOBCAOUT", L")");
+    XmlUtils::replace_all( res, L"SCOBCAIN", L"(");
+    XmlUtils::replace_all( res, L"SCOBCAOUT", L")");
 
-    boost::algorithm::replace_all(res, L"PROBEL", L" ");
+    XmlUtils::replace_all( res, L"PROBEL", L" ");
 
-    boost::algorithm::replace_all(res, L"APOSTROF", L"'");
+    XmlUtils::replace_all( res, L"APOSTROF", L"'");
 
-    boost::algorithm::replace_all(res, L"KAVYCHKA", L"\"");
+    XmlUtils::replace_all( res, L"KAVYCHKA", L"\"");
 
     return res;
 
@@ -777,8 +785,8 @@ void splitCellAddress(const std::wstring & a_, std::wstring & col, std::wstring
 	std::wstring a = a_;
 
 	std::reverse(a.begin(), a.end());
-    ::boost::algorithm::replace_all(a, L"$", L"");
-    //::boost::algorithm::replace_all(a, L"'", L"");
+    ::XmlUtils::replace_all( a, L"$", L"");
+    //::XmlUtils::replace_all( a, L"'", L"");
 	::boost::algorithm::to_upper(a);
 	
 
@@ -807,8 +815,8 @@ int oox2odf_converter::get_count_value_points(std::wstring expr)
 	int count =0;
 	std::vector< std::wstring > splitted;
     
-	boost::algorithm::replace_all(expr, L"(", L"");
-	boost::algorithm::replace_all(expr, L")", L"");
+	XmlUtils::replace_all( expr, L"(", L"");
+	XmlUtils::replace_all( expr, L")", L"");
 	boost::algorithm::split(splitted, expr, boost::algorithm::is_any_of(L","), boost::algorithm::token_compress_on);
 
 	for (long i=0; i < splitted.size(); i++)
@@ -824,7 +832,7 @@ int oox2odf_converter::get_count_value_points(std::wstring expr)
 			getCellAddressInv(cells[0],col_1,row_1);
 			getCellAddressInv(cells[1],col_2,row_2);
 
-			count += std::max(col_2-col_1+1, row_2-row_1+1);
+			count += (std::max)(col_2 - col_1 + 1, row_2 - row_1 + 1);
 
 		}
 		else count ++; 

ASCOfficeOdfFile/include/cpdoccore/xml/attributes.h

@@ -41,9 +41,9 @@
 #include "../../logging.h"
 
 #include <boost/variant.hpp>
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp>
+
+#include "../../../../Common/DocxFormat/Source/XML/Utils.h"
 
 namespace cpdoccore 
 {
@@ -66,7 +66,7 @@ namespace cpdoccore
             typedef typename T::value_type T_value_type;
 
 			Val.reset();
-			for (int i = 0 ; i < Heap.size(); i++)
+			for (size_t i = 0 ; i < Heap.size(); i++)
 			{
 				if (Heap[i].name_ == Name )
 				{
@@ -128,7 +128,7 @@ namespace cpdoccore
 			{
 				try 
 				{
-                      return optional_V_type (::boost::lexical_cast<V>( *val ) );
+                      return optional_V_type (boost::lexical_cast<V>( *val ) );
 					//return common::read_string<V>( *val );
 				}
 				catch(...)
@@ -154,7 +154,7 @@ namespace cpdoccore
 			if (val)
 			{
                 std::wstring tmp = *val;
-                ::boost::algorithm::to_lower(tmp);
+				XmlUtils::GetLower(tmp);
                 return  optional<bool>::Type((tmp == xml_char_value_type::trueVal));
 			}
 			else

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -52,7 +52,8 @@
 #include "oox_rels.h"
 #include "logging.h"
 
-#include "../../DesktopEditor/fontengine/ApplicationFonts.h"
+#include "../../../DesktopEditor/fontengine/ApplicationFonts.h"
+#include "../../../Common/DocxFormat/Source/XML/Utils.h"
 
 static int current_id_changes = 0;
 
@@ -323,7 +324,7 @@ std::wstring docx_conversion_context::add_hyperlink(const std::wstring & href, b
 	else if	(process_note_ == endNote	|| process_note_ == endNoteRefSet )	type = hyperlinks::endnote_place;
 	
 	std::wstring href_correct = xml::utils::replace_text_to_xml(href);
-    boost::algorithm::replace_all(href_correct, L" .", L".");//1 (130).odt
+    XmlUtils::replace_all( href_correct, L" .", L".");//1 (130).odt
 	
 	return hyperlinks_.add(href_correct, type, draw);
 }
@@ -1290,14 +1291,14 @@ void docx_conversion_context::start_text_changes (std::wstring id)
 		if (state.type	== 1)
 		{
 
-			output_stream() << L"<w:ins" << format_change << L" w:id=\"" << std::to_wstring(current_id_changes++) <<  L"\">";
+			output_stream() << L"<w:ins" << format_change << L" w:id=\"" << boost::lexical_cast<std::wstring>(current_id_changes++) <<  L"\">";
 		}
 		
 		if (state.type	== 2)
 		{
 			for (int i = 0 ; i < state.content.size(); i++)
 			{
-				output_stream() << L"<w:del" << format_change << L" w:id=\"" << std::to_wstring(current_id_changes++) <<  L"\">";
+				output_stream() << L"<w:del" << format_change << L" w:id=\"" << boost::lexical_cast<std::wstring>(current_id_changes++) <<  L"\">";
 
 				output_stream() << state.content[i];
 
@@ -1329,7 +1330,7 @@ void docx_conversion_context::start_changes()
 		std::wstring change_attr;
 		change_attr += L" w:date=\""	+ state.date	+ L"\"";
 		change_attr += L" w:author=\""	+ state.author	+ L"\"";
-		change_attr += L" w:id=\""		+ std::to_wstring(current_id_changes++) + L"\"";
+		change_attr += L" w:id=\""		+ boost::lexical_cast<std::wstring>(current_id_changes++) + L"\"";
 
 		if (state.type	== 1)
 		{

ASCOfficeOdfFile/src/docx/docx_drawing.cpp

@@ -429,7 +429,7 @@ void docx_serialize_wps(std::wostream & strm, _docx_drawing & val)
 							val.styleHorizontalPos->get_type() != odf_types::horizontal_pos::FromLeft &&
 							val.styleHorizontalPos->get_type() != odf_types::horizontal_pos::Outside)
 						{
-							CP_XML_NODE(L"wp:align") {CP_XML_STREAM() << boost::lexical_cast<std::wstring>(*val.styleHorizontalPos);}
+							CP_XML_NODE(L"wp:align") {CP_XML_STREAM() << (*val.styleHorizontalPos);}
 
 						}
 						else
@@ -573,8 +573,8 @@ void docx_serialize_object(std::wostream & strm, _docx_drawing & val)
 				CP_XML_ATTR(L"o:ole", "");
 				std::wstring style_str;	// = L"width:730.6pt; height:261.8pt";
 
-				style_str += L"width:"	+ std::to_wstring(val.cx / 12700.) + L"pt;";
-				style_str += L"height:" + std::to_wstring(val.cy / 12700.) + L"pt;";
+				style_str += L"width:"	+ boost::lexical_cast<std::wstring>(val.cx / 12700.) + L"pt;";
+				style_str += L"height:" + boost::lexical_cast<std::wstring>(val.cy / 12700.) + L"pt;";
 
 				CP_XML_ATTR(L"style", style_str);
 

ASCOfficeOdfFile/src/docx/mediaitems.cpp

@@ -140,7 +140,7 @@ std::wstring mediaitems::create_file_name(const std::wstring & uri, RelsType typ
 	if (type == typeOleObject && sExt.empty())
 		sExt = L".bin";
    
-	return get_default_file_name(type) + std::to_wstring(Num) + sExt;
+	return get_default_file_name(type) + boost::lexical_cast<std::wstring>(Num) + sExt;
 }
 
 std::wstring mediaitems::detectImageFileExtension(std::wstring &fileName)
@@ -217,7 +217,7 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 	{
 		if ( type == typeChart)
 		{
-			id = std::wstring(L"chId") + std::to_wstring(count_charts + 1);
+			id = std::wstring(L"chId") + boost::lexical_cast<std::wstring>(count_charts + 1);
 			count_charts++;
 		}
 		else if ( type == typeImage)
@@ -230,17 +230,17 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
 //------------------------------------------------
 			if (inputFileName.empty()) return L"";
 
-			id = std::wstring(L"picId") + std::to_wstring(count_image + 1);
+			id = std::wstring(L"picId") + boost::lexical_cast<std::wstring>(count_image + 1);
 			count_image++;
 		}
 		else if ( type == typeMsObject || type == typeOleObject)
 		{
-			id = std::wstring(L"objId") + std::to_wstring(count_object + 1);
+			id = std::wstring(L"objId") + boost::lexical_cast<std::wstring>(count_object + 1);
 			count_object++;
 		}
 		else
 		{
-			id = std::wstring(L"rId") + std::to_wstring(count_shape + 1);	
+			id = std::wstring(L"rId") + boost::lexical_cast<std::wstring>(count_shape + 1);	
 			count_shape++;
 		}
 		

ASCOfficeOdfFile/src/docx/oox_chart_context.h

@@ -73,7 +73,7 @@ public:
 	}
 	void set_3D_chart(bool val)
 	{
-		for (int i = 0 ; i < plot_area_.charts_.size(); i++)
+		for (size_t i = 0 ; i < plot_area_.charts_.size(); i++)
 		{
 			plot_area_.charts_[i]->is3D_ = val;
 		}

ASCOfficeOdfFile/src/docx/oox_chart_series.cpp

@@ -31,7 +31,9 @@
  */
 
 
-#include <boost/foreach.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/ref.hpp>
+
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include "../odf/style_text_properties.h"
 
@@ -137,17 +139,17 @@ 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;
 
-	BOOST_FOREACH(std::wstring & v, values)
+	for (int i = 0; i < values.size(); i++)
 	{
-		boost::algorithm::trim(v);
+		boost::algorithm::trim(values[i]);
 		if (ind == 0)
 		{
-			values_[ind].strRef_.str_cache.push_back(v);
+			values_[ind].strRef_.str_cache.push_back(values[i]);
 			values_[ind].strRef_.str_cache_count++;
 		}
 		else
 		{
-			values_[ind].numRef_.num_cache.push_back(v);
+			values_[ind].numRef_.num_cache.push_back(values[i]);
 			values_[ind].numRef_.num_cache_count++;
 		}
 	}
@@ -238,13 +240,14 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 									{
 										CP_XML_ATTR(L"val", values_[i].numRef_.num_cache_count);
 									}
-									int j=0;
-									BOOST_FOREACH(std::wstring & v, values_[i].numRef_.num_cache)
-									{								
+									for (int j = 0; j < values_[i].numRef_.num_cache.size(); j++)
+									{				
+										std::wstring & v = values_[i].numRef_.num_cache[j];
+
 										if (v == L"NaN") continue; 
 										CP_XML_NODE(L"c:pt")
 										{
-											CP_XML_ATTR(L"idx", j++);
+											CP_XML_ATTR(L"idx", j);
 											double val = 0;
 
 											try { val = boost::lexical_cast<double>(v);}
@@ -271,13 +274,15 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 							{
 								CP_XML_ATTR(L"val", values_[i].numRef_.num_cache_count);
 							}
-							int j=0;
-							BOOST_FOREACH(std::wstring & v, values_[i].numRef_.num_cache)
+
+							for (int j = 0; j < values_[i].numRef_.num_cache.size(); j++)
 							{				
+								std::wstring & v = values_[i].numRef_.num_cache[j];
+								
 								if (v == L"NaN") continue; 
 								CP_XML_NODE(L"c:pt")
 								{
-									CP_XML_ATTR(L"idx", j++);
+									CP_XML_ATTR(L"idx", j);
 									double val = 0;
 
 									try { val = boost::lexical_cast<double>(v);}
@@ -307,12 +312,13 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 								{
 									CP_XML_ATTR(L"val", values_[i].strRef_.str_cache_count);
 								}
-								int j=0;
-								BOOST_FOREACH(std::wstring & v, values_[i].strRef_.str_cache)
+								for (int 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")
 									{
-										CP_XML_ATTR(L"idx", j++);
+										CP_XML_ATTR(L"idx", j);
 										CP_XML_NODE(L"c:v")
 										{
 											CP_XML_CONTENT(v);
@@ -330,12 +336,12 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 							{
 								CP_XML_ATTR(L"val", values_[i].strRef_.str_cache_count);
 							}
-							int j=0;
-							BOOST_FOREACH(std::wstring & v, values_[i].strRef_.str_cache)
+							for (int 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")
 								{
-									CP_XML_ATTR(L"idx", j++);
+									CP_XML_ATTR(L"idx", j);
 									CP_XML_NODE(L"c:v")
 									{
 										CP_XML_CONTENT(v);
@@ -347,7 +353,7 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 				}
 			}
 		}		
-		if (content_.regression_curve_.line_properties_.size()>0)
+		if (content_.regression_curve_.line_properties_.size() > 0)
 		{
 			std::wstring typeTrendline= L"log"; //"exp" | "linear" | "log" | "movingAvg" | "poly" | "power"
             _oox_fill oox_fill;

ASCOfficeOdfFile/src/docx/oox_drawing.cpp

@@ -30,8 +30,11 @@
  *
  */
 
+#include <boost/algorithm/string.hpp>
+
 #include "oox_drawing.h"
 #include <cpdoccore/xml/simple_xml_writer.h>
+
 #include "../odf/svg_parser.h"
 #include "../odf/datatypes/custom_shape_types_convert.h"
 

ASCOfficeOdfFile/src/docx/oox_drawing_fills.cpp

@@ -71,7 +71,7 @@ void oox_serialize_srgb(std::wostream & strm,std::wstring color,_CP_OPT(double)
 			{
 				CP_XML_NODE(L"a:alpha")
 				{
-					CP_XML_ATTR(L"val",boost::lexical_cast<std::wstring>((int)(*opacity)*1000));// + L"%");
+					CP_XML_ATTR(L"val", boost::lexical_cast<std::wstring>((int)(*opacity)*1000));// + L"%");
 				}
 			}
 		}
@@ -88,7 +88,7 @@ void oox_serialize_srgb(std::wostream & strm,std::wstring color,_CP_OPT(odf_type
 			{
 				CP_XML_NODE(L"a:alpha")
 				{
-					CP_XML_ATTR(L"val",boost::lexical_cast<std::wstring>((int)opacity->get_value()*1000));// + L"%");
+					CP_XML_ATTR(L"val", boost::lexical_cast<std::wstring>((int)opacity->get_value()*1000));// + L"%");
 				}
 			}
 		}
@@ -187,8 +187,9 @@ void oox_serialize_gradient_fill(std::wostream & strm, const _oox_fill & val)
 			{
 				CP_XML_NODE(L"a:gsLst")
 				{
-					BOOST_FOREACH(oox_gradient_fill::_color_position & col, val.gradient->colors)
+					for (int i = 0; i < val.gradient->colors.size(); i++)
 					{
+						oox_gradient_fill::_color_position & col = val.gradient->colors[i];
 						CP_XML_NODE(L"a:gs")
 						{
 							CP_XML_ATTR(L"pos", (int)(col.pos * 1000));//%

ASCOfficeOdfFile/src/docx/pptx_conversion_context.cpp

@@ -116,8 +116,9 @@ void pptx_conversion_context::process_layouts()
 
 		if (master)
 		{
-			BOOST_FOREACH(odf_reader::office_element_ptr elm, master->content_)
+			for (int i = 0; i < master->content_.size(); i++)			
 			{
+				odf_reader::office_element_ptr elm = master->content_[i];
 				if (elm->get_type() == odf_reader::typeDrawFrame)
 				{
 					odf_reader::draw_frame* frame = dynamic_cast<odf_reader::draw_frame *>(elm.get());
@@ -209,8 +210,10 @@ void pptx_conversion_context::end_document()
 {
     unsigned int count = 1;
    
-	BOOST_FOREACH(const pptx_xml_slideMaster_ptr& slideM, slideMasters_)
+	for (int i = 0; i < slideMasters_.size(); i++)
     {
+		pptx_xml_slideMaster_ptr& slideM = slideMasters_[i];
+
         package::slide_content_ptr content = package::slide_content::create();
 
 		slideM->write_to(content->content());
@@ -230,8 +233,10 @@ void pptx_conversion_context::end_document()
 	}
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 	count=0;
-	BOOST_FOREACH(const pptx_xml_slide_ptr& slide, slides_)
+	for (int i = 0; i < slides_.size(); i++)
     {
+		pptx_xml_slide_ptr& slide = slides_[i];
+
         package::slide_content_ptr content = package::slide_content::create();
 
 		slide->write_to(content->content());
@@ -250,8 +255,10 @@ void pptx_conversion_context::end_document()
 		count++;
     }
 ///////////////////////////////////////////////////////////////////////////////////////////
-	BOOST_FOREACH(const pptx_xml_slideLayout_ptr& slideL, slideLayouts_)
+	for (int i = 0; i < slideLayouts_.size(); i++)
     {
+		pptx_xml_slideLayout_ptr& slideL = slideLayouts_[i];
+
         package::slide_content_ptr content = package::slide_content::create();
 
 		slideL->write_to(content->content());
@@ -263,6 +270,7 @@ void pptx_conversion_context::end_document()
 	//размеры страниц в презентации
     odf_reader::odf_read_context & context =  root()->odf_context();
     odf_reader::page_layout_container & pageLayouts = context.pageLayoutContainer();
+	
 	if ((pageLayouts.master_pages().size()>0) && (pageLayouts.master_pages()[0]->style_master_page_attlist_.style_name_))//default
 	{
 		const std::wstring masterStyleName = pageLayouts.master_pages()[0]->style_master_page_attlist_.style_name_->style_name();
@@ -279,13 +287,13 @@ void pptx_conversion_context::end_document()
 	//добавляем диаграммы
 
 	count = 0;
-    BOOST_FOREACH(const oox_chart_context_ptr& chart, charts_)
+	for (int i = 0; i < charts_.size(); i++)
     {
 		count++;
 		package::chart_content_ptr content = package::chart_content::create();
 
-		chart->serialize(content->content());
-		chart->dump_rels(content->get_rel_file()->get_rels());
+		charts_[i]->serialize(content->content());
+		charts_[i]->dump_rels(content->get_rel_file()->get_rels());
 
 		output_document_->get_ppt_files().add_charts(content);
 	

ASCOfficeOdfFile/src/docx/pptx_package.cpp

@@ -29,6 +29,7 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
+#include <boost/ref.hpp>
 
 #include "pptx_package.h"
 #include "pptx_output_xml.h"
@@ -126,13 +127,13 @@ void slides_files::write(const std::wstring & RootPath)
     {
         if (!slides_[i]) continue;
 
-        const std::wstring fileName = std::wstring(L"slide") + std::to_wstring( i + 1 ) + L".xml";
+        const std::wstring fileName = std::wstring(L"slide") + boost::lexical_cast<std::wstring>( i + 1 ) + L".xml";
        
 		contentTypes->add_override(std::wstring(L"/ppt/slides/") + fileName, kWSConType);
 
         if (rels_)
         {
-            const std::wstring id = std::wstring(L"sId") + std::to_wstring( i + 1);
+            const std::wstring id = std::wstring(L"sId") + boost::lexical_cast<std::wstring>( i + 1);
             static const std::wstring kWSRel = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide";
             const std::wstring fileRef = std::wstring(L"slides/") + fileName;
             rels_->add(id, kWSRel, fileRef);
@@ -169,12 +170,12 @@ void slideMasters_files::write(const std::wstring & RootPath)
     {
         if (!slides_[i]) continue;
 
-        const std::wstring fileName = std::wstring(L"slideMaster") + std::to_wstring( i + 1 ) + L".xml";
+        const std::wstring fileName = std::wstring(L"slideMaster") + boost::lexical_cast<std::wstring>( i + 1 ) + L".xml";
         contentTypes->add_override(std::wstring(L"/ppt/slideMasters/") + fileName, kWSConType);
 
         if (rels_)
         {
-            const std::wstring id = std::wstring(L"smId") + std::to_wstring( i + 1);
+            const std::wstring id = std::wstring(L"smId") + boost::lexical_cast<std::wstring>( i + 1);
             static const std::wstring kWSRel = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster";
             const std::wstring fileRef = std::wstring(L"slideMasters/") + fileName;
             rels_->add(id, kWSRel, fileRef);
@@ -208,7 +209,7 @@ void slideLayouts_files::write(const std::wstring & RootPath)
     {
         if (!slides_[i]) continue;
 
-        const std::wstring fileName		= std::wstring(L"slideLayout") + std::to_wstring( i + 1 ) + L".xml";
+        const std::wstring fileName		= std::wstring(L"slideLayout") + boost::lexical_cast<std::wstring>( i + 1 ) + L".xml";
         const std::wstring kWSConType	= L"application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml";
        
 		content_type_content * contentTypes = get_main_document()->get_content_types_file().content();
@@ -260,7 +261,7 @@ void ppt_charts_files::write(const std::wstring & RootPath)
     {
         if (!charts_[i]) continue;
 		
-		const std::wstring fileName = std::wstring(L"chart") + std::to_wstring( i + 1 ) + L".xml";
+		const std::wstring fileName = std::wstring(L"chart") + boost::lexical_cast<std::wstring>( i + 1 ) + L".xml";
         content_type_content * contentTypes = get_main_document()->get_content_types_file().content();
        
 		static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
@@ -290,7 +291,7 @@ void ppt_themes_files::write(const std::wstring & RootPath)
     {
         if (!themes_[i]) continue;
             
-		const std::wstring fileName		= std::wstring(L"theme") + std::to_wstring( i + 1) + L".xml";
+		const std::wstring fileName		= std::wstring(L"theme") + boost::lexical_cast<std::wstring>( i + 1) + L".xml";
 		const std::wstring kWSConType	= L"application/vnd.openxmlformats-officedocument.theme+xml";
        
 		content_type_content * contentTypes = get_main_document()->get_content_types_file().content();

ASCOfficeOdfFile/src/docx/pptx_slide_context.cpp

@@ -334,7 +334,7 @@ std::wstring pptx_slide_context::add_hyperlink(std::wstring const & href,bool ob
 	std::wstring hId=std::wstring(L"hId") + boost::lexical_cast<std::wstring>(hlinks_size_);
 	
 	std::wstring href_correct = xml::utils::replace_text_to_xml(href);
-	boost::algorithm::replace_all(href_correct, L" .", L".");//1 (130).odt
+	XmlUtils::replace_all( href_correct, L" .", L".");//1 (130).odt
 
 	_hlink_desc desc={hId, href_correct, object};
 	impl_->object_description_.hlinks_.push_back(desc);

ASCOfficeOdfFile/src/docx/xlsx_color.cpp

@@ -33,7 +33,6 @@
 #include <sstream>
 
 #include <boost/foreach.hpp>
-#include <boost/algorithm/string.hpp>
 #include <boost/functional/hash/hash.hpp>
 
 #include "xlsx_font.h"
@@ -60,7 +59,6 @@ void xlsx_serialize(std::wostream & _Wostream, const xlsx_color & color, const s
     if (color.rgb)
     {
         std::wstring rgb = *color.rgb;
-        boost::algorithm::to_upper(rgb);
         strm << L"rgb=\"" << rgb << L"\" ";
     }
 

ASCOfficeOdfFile/src/docx/xlsx_comments.cpp

@@ -106,11 +106,11 @@ public:
 			CP_XML_ATTR(L"xmlns:v", L"urn:schemas-microsoft-com:vml");
 			CP_XML_ATTR(L"xmlns:o", L"urn:schemas-microsoft-com:office:office");
 			CP_XML_ATTR(L"xmlns:x", L"urn:schemas-microsoft-com:office:excel");
-		
-
  
-			BOOST_FOREACH(_xlsx_comment const & c, xlsx_comment_)
+			for (int i = 0; i < xlsx_comment_.size(); i++)
 			{
+				const _xlsx_comment & c = xlsx_comment_[i];
+
 				std::wstring str_fill_color_ = L"00003f";
 				if (odf_reader::GetProperty(c.graphicProperties_,L"fill-color",strVal))
 					str_fill_color_ = strVal.get();
@@ -143,10 +143,10 @@ public:
 					
 					std::wstring style = std::wstring(L"position:absolute;");
 					
-					style += std::wstring(L"margin-left:")	+boost::lexical_cast<std::wstring>(c.left_)		+std::wstring(L"pt;");
-					style += std::wstring(L"margin-top:")	+boost::lexical_cast<std::wstring>(c.top_)		+std::wstring(L"pt;");
-					style += std::wstring(L"width:")		+boost::lexical_cast<std::wstring>(c.width_)	+std::wstring(L"pt;");
-					style += std::wstring(L"height:")		+boost::lexical_cast<std::wstring>(c.height_)	+std::wstring(L"pt;");
+					style += std::wstring(L"margin-left:")	+ boost::lexical_cast<std::wstring>(c.left_)		+ std::wstring(L"pt;");
+					style += std::wstring(L"margin-top:")	+ boost::lexical_cast<std::wstring>(c.top_)		+ std::wstring(L"pt;");
+					style += std::wstring(L"width:")		+ boost::lexical_cast<std::wstring>(c.width_)		+ std::wstring(L"pt;");
+					style += std::wstring(L"height:")		+ boost::lexical_cast<std::wstring>(c.height_)	+ std::wstring(L"pt;");
 
 					if (c.visibly_ == false)style += std::wstring(L"visibility:hidden;");
 
@@ -154,7 +154,7 @@ public:
 					CP_XML_ATTR(L"type", L"shapetype_202");
 					//if (odf_reader::GetProperty(c.graphicProperties_,L"opacity",dVal))
 					//{
-					//	CP_XML_ATTR(L"opacity",boost::lexical_cast<std::wstring>((int)(100.-dVal.get())) + L"%");
+					//	CP_XML_ATTR(L"opacity", boost::lexical_cast<std::wstring>((int)(100.-dVal.get())) + L"%");
 					//}
 					//CP_XML_NODE(L"v:shadow")
 					//{
@@ -222,12 +222,12 @@ public:
     void add(_xlsx_comment & c)
     {
 		bool find = false;
-		for (long i=0;i<author_list_.size();i++)
+		for (long i = 0; i < author_list_.size(); i++)
 		{		
 			if (c.author_ == author_list_[i])
 			{
 				find=true;
-				c.author_ = boost::lexical_cast<std::wstring>(i);
+				c.author_ =  boost::lexical_cast<std::wstring>(i);
 				break;
 			}
 		}

ASCOfficeOdfFile/src/docx/xlsx_complex_number_format.cpp

@@ -31,6 +31,7 @@
  */
 
 #include "xlsx_complex_number_format.h"
+#include "../../../Common/DocxFormat/Source/XML/Utils.h"
 
 namespace cpdoccore {
 namespace oox {
@@ -55,9 +56,9 @@ public:
     void add_format(std::wstring const & condition, std::wstring const & format)
     {
         std::wstring c = condition;
-        boost::algorithm::to_lower(c);
-        boost::algorithm::replace_all(c, L" ", L"");
-        boost::algorithm::replace_all(c, L"\t", L"");
+		XmlUtils::GetLower(c);
+        XmlUtils::replace_all( c, L" ", L"");
+        XmlUtils::replace_all( c, L"\t", L"");
 
         if (L"" == c)
         {

ASCOfficeOdfFile/src/docx/xlsx_complex_number_format.h

@@ -33,7 +33,6 @@
 #define CPDOCCORE_COMPLEX_NUMBER_FORMAT
 
 #include <string>
-#include <boost/algorithm/string.hpp>  
 #include <cpdoccore/CPScopedPtr.h>
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.cpp

@@ -29,8 +29,9 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-
 #include <boost/foreach.hpp>
+#include <boost/algorithm/string.hpp>
+
 #include <iostream>
 #include <cpdoccore/xml/utils.h>
 
@@ -45,6 +46,8 @@
 
 #include "drawing_object_description.h"
 
+#include "../../../Common/DocxFormat/Source/XML/Utils.h"
+
 namespace cpdoccore {
 namespace oox {
 
@@ -402,7 +405,7 @@ std::wstring xlsx_drawing_context::add_hyperlink(std::wstring const & href,bool
 	std::wstring hId=std::wstring(L"hId") + boost::lexical_cast<std::wstring>(hlinks_size_);
 	
 	std::wstring href_correct = xml::utils::replace_text_to_xml(href);
-    boost::algorithm::replace_all(href_correct, L" .", L".");//1 (130).odt
+    XmlUtils::replace_all( href_correct, L" .", L".");//1 (130).odt
 
 	_hlink_desc desc = {hId, href_correct, object}; //корректность написания ссылки важна для ms office и не важна для open office ->
 	//todooo 

ASCOfficeOdfFile/src/docx/xlsx_hyperlinks.cpp

@@ -31,7 +31,6 @@
  */
 
 #include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 
 #include <cpdoccore/xml/simple_xml_writer.h>
@@ -85,11 +84,12 @@ public:
 		r.display = display;
 		r.id = std::wstring(L"hId") + boost::lexical_cast<std::wstring>(records_.size()+1);
 
-        if (boost::algorithm::starts_with(target, "#"))//ссыль на страницу или метку в текущем документе
+		int pos_target = target.find(L"#");
+        if (pos_target == 0)//ссыль на страницу или метку в текущем документе
         {
 			//адресация всегда на ячейку ...
 			int pos =target.find(L".");
-			if (pos <0)
+			if (pos < 0)
 			{
 				target = target + std::wstring(L".A1");
 			}

ASCOfficeOdfFile/src/docx/xlsx_tablecontext.cpp

@@ -46,6 +46,7 @@
 #include <cpdoccore/odf/odf_document.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 
+#include "../../../Common/DocxFormat/Source/XML/Utils.h"
 
 namespace cpdoccore {
 namespace oox {
@@ -101,7 +102,7 @@ void xlsx_table_context::start_database_range(std::wstring tableName, std::wstri
 
 	if (!xlsx_table_name.empty())
 	{
-		boost::algorithm::replace_all(xlsx_table_name, L"'", L"");
+		XmlUtils::replace_all( xlsx_table_name, L"'", L"");
 		xlsx_data_ranges_map_.insert(std::pair<std::wstring, int> (xlsx_table_name, xlsx_data_ranges_.size() - 1));
 	}
 

ASCOfficeOdfFile/src/docx/xlsx_utils.cpp

@@ -34,13 +34,14 @@
 #include "xlsx_utils.h"
 
 #include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 #include <boost/regex.hpp>
 
 #include <boost/date_time/gregorian/gregorian.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
+#include "../../Common/DocxFormat/Source/XML/Utils.h"
+
 namespace cpdoccore {
 
 namespace oox {
@@ -118,9 +119,10 @@ void splitCellAddress(const std::wstring & a_, std::wstring & col, std::wstring
 	std::wstring a = a_;
 
 	std::reverse(a.begin(), a.end());
-    ::boost::algorithm::replace_all(a, L"$", L"");
-    //::boost::algorithm::replace_all(a, L"'", L"");
-	::boost::algorithm::to_upper(a);
+    XmlUtils::replace_all( a, L"$", L"");
+    //XmlUtils::replace_all( a, L"'", L"");
+	
+	boost::algorithm::to_upper(a);
 	
 
 	BOOST_FOREACH(wchar_t c, a)

ASCOfficeOdfFile/src/docx/xlsxconversioncontext.cpp

@@ -138,7 +138,7 @@ void xlsx_conversion_context::end_document()
     {
 		xlsx_xml_worksheet_ptr& sheet = sheets_[i];
 		
-		const std::wstring id = std::wstring(L"sId") + std::to_wstring(i + 1);
+		const std::wstring id = std::wstring(L"sId") + boost::lexical_cast<std::wstring>(i + 1);
 
         package::sheet_content_ptr content = package::sheet_content::create();
  ////////////////////////////////////////////////////////////////////////////////////////////       

ASCOfficeOdfFile/src/odf/abstract_xml.cpp

@@ -30,10 +30,8 @@
  *
  */
 #include "abstract_xml.h"
-
 #include "paragraph_elements.h"
 
-#include <boost/foreach.hpp>
 
 namespace cpdoccore { 
 namespace odf_reader {
@@ -46,18 +44,18 @@ const wchar_t * abstract_xml::name = L"abstract-xml";
 
 std::wostream & abstract_xml::text_to_stream(std::wostream & _Wostream) const
 {
-    BOOST_FOREACH(const office_element_ptr & element, xml_content_)
+	for (int i = 0; i < xml_content_.size(); i++)
     {
-        element->text_to_stream(_Wostream);
+        xml_content_[i]->text_to_stream(_Wostream);
     }
     return _Wostream;
 }
 
 std::wostream & abstract_xml::xml_to_stream(std::wostream & _Wostream) const
 {
-    BOOST_FOREACH(const office_element_ptr & element, xml_content_)
+	for (int i = 0; i < xml_content_.size(); i++)
     {
-        element->xml_to_stream(_Wostream);
+		xml_content_[i]->xml_to_stream(_Wostream);
     }
     return _Wostream;
 }

ASCOfficeOdfFile/src/odf/calcext_elements.cpp

@@ -36,7 +36,6 @@
 #include <string>
 
 #include <boost/foreach.hpp>
-#include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
 
 #include <cpdoccore/xml/xmlchar.h>

ASCOfficeOdfFile/src/odf/chart_build_oox.h

@@ -37,7 +37,6 @@
 #include <vector>
 
 #include <boost/regex.hpp>
-#include <boost/algorithm/string.hpp>
 //
 #include <cpdoccore/CPString.h>
 #include <cpdoccore/xml/xmlchar.h>

ASCOfficeOdfFile/src/odf/datatypes/bool.cpp

@@ -31,11 +31,12 @@
  */
 
 #include "bool.h"
-#include <boost/algorithm/string.hpp>
 
 #include <ostream>
 #include <sstream>
 
+#include "../../../../Common/DocxFormat/Source/XML/Utils.h"
+
 namespace cpdoccore { namespace odf_types { 
 
 std::wostream & operator << (std::wostream & _Wostream, const Bool & _Val)
@@ -46,7 +47,7 @@ std::wostream & operator << (std::wostream & _Wostream, const Bool & _Val)
 Bool Bool::parse(const std::wstring & Str)
 {
     std::wstring tmp = Str;
-    boost::algorithm::to_lower(tmp);
+	XmlUtils::GetLower(tmp);
 
 	if (tmp == L"0" || tmp == L"false") return Bool(false);
 	else return Bool(true);

ASCOfficeOdfFile/src/odf/datatypes/color.cpp

@@ -104,8 +104,6 @@ const std::wstring color::get_hex_value() const
         }
         
     }
-
-    //_CP_LOG << "[warning] convert color error (" << color_ << L")\n";
     return L"000000";
 }
 

ASCOfficeOdfFile/src/odf/draw_common.cpp

@@ -33,7 +33,6 @@
 #include <sstream>
 #include <string>
 
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
 
@@ -53,6 +52,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 #include "../../../DesktopEditor/raster/BgraFrame.h"
 #include "../../../DesktopEditor/raster/Metafile/MetaFile.h"
+#include "../../../Common/DocxFormat/Source/XML/Utils.h"
 
 namespace _image_file_
 {
@@ -660,11 +660,10 @@ 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);
 	
-	BOOST_FOREACH(std::wstring const & t, transforms)
+	for (int i = 0; i < transforms.size(); i++)
 	{			
-        //_CP_LOG << "[info] : transform = " << t << L"\n";
 		std::vector<std::wstring> transform;
-		boost::algorithm::split(transform,t, boost::algorithm::is_any_of(L"("), boost::algorithm::token_compress_on);
+		boost::algorithm::split(transform, transforms[i], boost::algorithm::is_any_of(L"("), boost::algorithm::token_compress_on);
 
 		if (transform.size()>1)//тока с аргументами
 		{

ASCOfficeOdfFile/src/odf/draw_frame.cpp

@@ -36,7 +36,6 @@
 #include <sstream>
 #include <string>
 
-#include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
 
 #include <cpdoccore/xml/xmlchar.h>

ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp

@@ -37,7 +37,6 @@
 #include <string>
 
 #include <boost/foreach.hpp>
-#include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
 
 #include <cpdoccore/odf/odf_document.h>
@@ -56,6 +55,8 @@
 #include "datatypes/length.h"
 #include "datatypes/borderstyle.h"
 
+#include "../../../Common/DocxFormat/Source/XML/Utils.h"
+
 namespace cpdoccore { 
 
 	using namespace odf_types;
@@ -1430,7 +1431,7 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
 		std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
 
 		//normalize path ??? todooo
-		boost::algorithm::replace_all(objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
+		XmlUtils::replace_all( objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
 
         cpdoccore::odf_reader::odf_document objectSubDoc(objectPath ,NULL);    
 //---------------------------------------------------------------------------------------------------------------------

ASCOfficeOdfFile/src/odf/draw_frame_pptx.cpp

@@ -38,7 +38,6 @@
 
 #include <boost/foreach.hpp>
 #include <boost/regex.h>
-#include <boost/algorithm/string.hpp>
 
 #include <cpdoccore/xml/xmlchar.h>
 
@@ -62,6 +61,7 @@
 #include "datatypes/borderstyle.h"
 
 #include "../../../OfficeUtils/src/OfficeUtils.h"
+#include "../../../Common/DocxFormat/Source/XML/Utils.h"
 
 namespace cpdoccore { 
 
@@ -270,7 +270,7 @@ void draw_object::pptx_convert(oox::pptx_conversion_context & Context)
         std::wstring objectPath = folderPath + FILE_SEPARATOR_STR +  href;
 
 		//normalize path ??? todooo
-		boost::algorithm::replace_all(objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
+		XmlUtils::replace_all( objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
 
         cpdoccore::odf_reader::odf_document objectSubDoc(objectPath, NULL);    
 //---------------------------------------------------------------------------------------------------------------------

ASCOfficeOdfFile/src/odf/draw_frame_xlsx.cpp

@@ -36,9 +36,8 @@
 #include <sstream>
 #include <string>
 
-#include <boost/foreach.hpp>
-#include <boost/regex.h>
 #include <boost/algorithm/string.hpp>
+#include <boost/regex.h>
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
@@ -59,6 +58,8 @@
 #include "datatypes/length.h"
 #include "datatypes/borderstyle.h"
 
+#include "../../../Common/DocxFormat/Source/XML/Utils.h"
+
 namespace cpdoccore { 
 
 	using namespace odf_types;
@@ -263,7 +264,7 @@ void draw_object::xlsx_convert(oox::xlsx_conversion_context & Context)
         std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
 
 		// normalize path ???? todooo
-		boost::algorithm::replace_all(objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
+		XmlUtils::replace_all( objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
 
         cpdoccore::odf_reader::odf_document objectSubDoc(objectPath,NULL);    
 //---------------------------------------------------------------------------------------------------------------------

ASCOfficeOdfFile/src/odf/draw_shapes.cpp

@@ -39,7 +39,6 @@
 
 #include <boost/foreach.hpp>
 #include <boost/regex.h>
-#include <boost/algorithm/string.hpp>
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>

ASCOfficeOdfFile/src/odf/draw_shapes_docx.cpp

@@ -37,9 +37,8 @@
 #include <sstream>
 #include <string>
 
-#include <boost/foreach.hpp>
-#include <boost/regex.h>
 #include <boost/algorithm/string.hpp>
+#include <boost/regex.h>
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>

ASCOfficeOdfFile/src/odf/draw_shapes_pptx.cpp

@@ -37,9 +37,8 @@
 #include <sstream>
 #include <string>
 
-#include <boost/foreach.hpp>
-#include <boost/regex.h>
 #include <boost/algorithm/string.hpp>
+#include <boost/regex.h>
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>

ASCOfficeOdfFile/src/odf/draw_shapes_xlsx.cpp

@@ -37,9 +37,8 @@
 #include <sstream>
 #include <string>
 
-#include <boost/foreach.hpp>
-#include <boost/regex.h>
 #include <boost/algorithm/string.hpp>
+#include <boost/regex.h>
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>

ASCOfficeOdfFile/src/odf/odf_document_impl.cpp

@@ -39,7 +39,6 @@
 #include <cpdoccore/xml/sax.h>
 #include <cpdoccore/common/readdocelement.h>
 
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 
 #include "abstract_xml.h"

ASCOfficeOdfFile/src/odf/odfcontext.cpp

@@ -32,7 +32,6 @@
 
 #include "odfcontext.h"
 #include <boost/foreach.hpp>
-#include <boost/algorithm/string.hpp>
 
 namespace cpdoccore { 
 
@@ -107,7 +106,7 @@ void styles_container::add_style(	const std::wstring & Name,
 
         // TODO: как правильно??
         std::wstring lName = Name;
-        boost::algorithm::to_lower(lName);
+		XmlUtils::GetLower(lName);
         //if ( boost::algorithm::contains(lName, L"internet_20_link") )
         if (lName == L"internet_20_link")///???????????????
             hyperlink_style_pos_ = pos;

ASCOfficeOdfFile/src/odf/office_elements.h

@@ -40,9 +40,6 @@
 
 #include "office_elements_type.h"
 
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/replace.hpp>
-
 #include "../docx/docx_conversion_context.h"
 #include "../docx/xlsxconversioncontext.h"
 #include "../docx/pptx_conversion_context.h"
@@ -50,6 +47,8 @@
 #include "visitor.h"
 #include "../conversionelement.h"
 
+#include "../../../Common/DocxFormat/Source/XML/Utils.h"
+
 namespace cpdoccore {
 namespace odf_reader {
 
@@ -137,13 +136,7 @@ public:
 private:
     virtual void add_text(const std::wstring & Text)
     {
-        std::wstring text = Text;
-        boost::algorithm::erase_all(text, L" ");
-        boost::algorithm::erase_all(text, L"\t");
-        boost::algorithm::erase_all(text, L"\n");
-        boost::algorithm::erase_all(text, L"\r");
-        //CP_ASSERT(false);
-    }
+	}
 
 // office_element impl
 public:

ASCOfficeOdfFile/src/odf/paragraph_elements.cpp

@@ -35,7 +35,6 @@
 #include <ostream>
 #include <string>
 
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 
 #include <cpdoccore/xml/xmlchar.h>

ASCOfficeOdfFile/src/odf/style_paragraph_properties_docx.cpp

@@ -72,8 +72,9 @@ std::wstring process_border(const border_style & borderStyle,
         int szInt = (int)(0.5 + 8.0 * width);
         if (szInt <= 0)
             szInt = 1;
-        w_sz = boost::lexical_cast<std::wstring>( szInt );
-        w_color = boost::lexical_cast<std::wstring>( borderStyle.get_color().get_hex_value() );
+
+        w_sz	= boost::lexical_cast<std::wstring>( szInt );
+        w_color = borderStyle.get_color().get_hex_value();
 
         if (borderPadding)
             w_space = boost::lexical_cast<std::wstring>((int)(borderPadding->get_value_unit(length::pt) + 0.5) );

ASCOfficeOdfFile/src/odf/style_paragraph_properties_pptx.cpp

@@ -71,7 +71,7 @@ std::wstring process_border(border_style	& borderStyle,
 		if (szInt <= 0) szInt = 1;
 
         w_sz	= boost::lexical_cast<std::wstring>( szInt );
-        w_color = boost::lexical_cast<std::wstring>( borderStyle.get_color().get_hex_value() );
+        w_color = borderStyle.get_color().get_hex_value();
 
         if (borderPadding)
             w_space = boost::lexical_cast<std::wstring>((int)(borderPadding->get_value_unit(length::pt)) );

ASCOfficeOdfFile/src/odf/styles.cpp

@@ -93,7 +93,7 @@ std::wstring process_border(const border_style	& borderStyle,
         if (szInt <= 0)      szInt = 1;
 
 		w_sz = boost::lexical_cast<std::wstring>( szInt );
-		w_color = boost::lexical_cast<std::wstring>( borderStyle.get_color().get_hex_value() );
+		w_color = borderStyle.get_color().get_hex_value() ;
 
         if (borderPadding)
             w_space = boost::lexical_cast<std::wstring>((int)(borderPadding->get_value_unit(length::pt) + 0.5) );
@@ -1186,14 +1186,14 @@ void style_page_layout_properties_attlist::pptx_convert(oox::pptx_conversion_con
 			w =  fo_page_width_->get_value_unit(length::emu);
 			if (w < 914400) w = 914400;
 
-			w_w = std::to_wstring(w);
+			w_w = boost::lexical_cast<std::wstring>(w);
 		}
         if (fo_page_height_)
 		{
 			h = fo_page_height_->get_value_unit(length::emu);
 			if (h < 914400) h = 914400;
 
-			w_h = std::to_wstring(h);
+			w_h = boost::lexical_cast<std::wstring>(h);
 		}
                 
         std::wstring w_orient = L"custom";

ASCOfficeOdfFile/src/odf/svg_parser.cpp

@@ -32,13 +32,14 @@
 #pragma once   
 
 #include "svg_parser.h"
+#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)
+    void skipSpaces(int& io_rPos, const std::wstring& rStr, const int nLen)
     {
         while( io_rPos < nLen && L' ' == rStr[io_rPos] )
         {
@@ -46,7 +47,7 @@ namespace svg_path
         }
     }
 
-    void skipSpacesAndCommas(int&         io_rPos,const std::wstring&    rStr,const int    nLen)
+    void skipSpacesAndCommas(int& io_rPos,const std::wstring& rStr,const int nLen)
     {
         while(io_rPos < nLen && (wchar_t(' ') == rStr[io_rPos] || wchar_t(',') == rStr[io_rPos]))
         {
@@ -152,14 +153,13 @@ namespace svg_path
 		return true;
 	}
 
-	void putNumberChar( std::wstring & rStr, double          fValue )
+	void putNumberChar( std::wstring & rStr, double fValue )
 	{
 		const std::wstring sValue = boost::lexical_cast<std::wstring>(fValue) ;
 		rStr.append(sValue);
 	}
 
-	void putNumberCharWithSpace( std::wstring &    rStr,  double             fValue,
-									 double                 fOldValue,  bool                   bUseRelativeCoordinates )
+	void putNumberCharWithSpace( std::wstring & rStr, double fValue, double fOldValue, bool bUseRelativeCoordinates )
 	{
 		if( bUseRelativeCoordinates )
 			fValue -= fOldValue;

ASCOfficeOdfFile/src/odf/svg_parser.h

@@ -38,7 +38,6 @@
 
 #include <boost/foreach.hpp>
 #include <boost/regex.hpp>
-#include <boost/algorithm/string.hpp>
 
 #include <cpdoccore/CPOptional.h>
 

ASCOfficeOdfFile/src/odf/text_content.cpp

@@ -32,11 +32,7 @@
 
 #include "text_content.h"
 
-#include <string>
 #include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
-
-#include <cpdoccore/xml/attributes.h>
 
 namespace cpdoccore { 
 
@@ -56,9 +52,9 @@ void paragraph_attrs::add_attributes( const xml::attributes_wc_ptr & Attributes
         std::vector< std::wstring > classNamesArray;
         boost::algorithm::split(classNamesArray, classNames, boost::algorithm::is_any_of(L" "));
 
-        BOOST_FOREACH(const std::wstring & name, classNamesArray)
+		for (int i = 0; i < classNamesArray.size(); i++)
         {
-            text_class_names_.push_back( style_ref(name) );        
+            text_class_names_.push_back( style_ref(classNamesArray[i]) );        
         }
     }
 

ASCOfficeOdfFile/src/xml/utils.cpp

@@ -32,7 +32,7 @@
 #include "../../include/cpdoccore/xml/utils.h"
 
 #include <boost/regex.hpp>
-#include <boost/algorithm/string.hpp>
+#include "../../../Common/DocxFormat/Source/XML/Utils.h"
 
 namespace cpdoccore {
 namespace xml {
@@ -98,74 +98,58 @@ std::string replace_xml_to_text_ImplRegEx(const std::string & Text)
 
 std::wstring replace_text_to_xml_ImplReplace(const std::wstring & Text)
 {
-    std::wstring newStr;
-    newStr.resize(Text.size());
-    newStr = ::boost::algorithm::replace_all_copy(Text, L"&", L"&amp;");
-    ::boost::algorithm::replace_all(newStr, L"'", L"&apos;");
-    ::boost::algorithm::replace_all(newStr, L"<", L"&lt;");
-    ::boost::algorithm::replace_all(newStr, L">", L"&gt;");
-    ::boost::algorithm::replace_all(newStr, L"\"", L"&quot;");
-    return newStr;
+    return XmlUtils::EncodeXmlString(Text);
 }
 
 std::string replace_text_to_xml_ImplReplace(const std::string & Text)
 {
-    std::string newStr;
-    newStr.resize(Text.size());
-    newStr = ::boost::algorithm::replace_all_copy(Text, "&", "&amp;");
-    ::boost::algorithm::replace_all(newStr, "'", "&apos;");
-    ::boost::algorithm::replace_all(newStr, "<", "&lt;");
-    ::boost::algorithm::replace_all(newStr, ">", "&gt;");
-    ::boost::algorithm::replace_all(newStr, "\"", "&quot;");
-    return newStr;
+	return XmlUtils::EncodeXmlString(Text);
 }
 std::string replace_amp_text_to_xml_ImplReplace(const std::string & Text)
 {
-    std::string newStr;
-    newStr.resize(Text.size());
-    newStr = ::boost::algorithm::replace_all_copy(Text, "&", "&amp;");
-    ::boost::algorithm::replace_all(newStr, L"&lt;", L"<");
-    ::boost::algorithm::replace_all(newStr, L"&gt;", L">");
+    std::string newStr = Text;
+    XmlUtils::replace_all( newStr, "&", "&amp;");
+    XmlUtils::replace_all( newStr, "&lt;", "<");
+    XmlUtils::replace_all( newStr, "&gt;", ">");
 	
 	return newStr;
 }
 std::wstring replace_amp_text_to_xml_ImplReplace(const std::wstring & Text)
 {
-    std::wstring newStr;
-    newStr.resize(Text.size());
-    newStr = ::boost::algorithm::replace_all_copy(Text, "&", "&amp;");
-    ::boost::algorithm::replace_all(newStr, L"&lt;", L"<");
-    ::boost::algorithm::replace_all(newStr, L"&gt;", L">");
+    std::wstring newStr = Text;
+    XmlUtils::replace_all( newStr, L"&", L"&amp;");
+    XmlUtils::replace_all( newStr, L"&lt;", L"<");
+    XmlUtils::replace_all( newStr, L"&gt;", L">");
 	
 	return newStr;
 }
 std::wstring replace_xml_to_text_ImplReplace(const std::wstring & Text)
 {
-    std::wstring newStr;
-    newStr = ::boost::algorithm::replace_all_copy(Text, L"&amp;", L"&");
-    ::boost::algorithm::replace_all(newStr, L"&apos;", L"'");
-    ::boost::algorithm::replace_all(newStr, L"&lt;", L"<");
-    ::boost::algorithm::replace_all(newStr, L"&gt;", L">");
-    ::boost::algorithm::replace_all(newStr, L"&quot;", L"\"");
+    std::wstring newStr = Text;
+    XmlUtils::replace_all( newStr, L"&amp;", L"&");
+    XmlUtils::replace_all( newStr, L"&apos;", L"'");
+    XmlUtils::replace_all( newStr, L"&lt;", L"<");
+    XmlUtils::replace_all( newStr, L"&gt;", L">");
+    XmlUtils::replace_all( newStr, L"&quot;", L"\"");
     return newStr;
 }
 
 std::string replace_xml_to_text_ImplReplace(const std::string & Text)
 {
-    std::string newStr;
-    newStr = ::boost::algorithm::replace_all_copy(Text, "&amp;", "&");
-    ::boost::algorithm::replace_all(newStr, "&apos;", "'");
-    ::boost::algorithm::replace_all(newStr, "&lt;", "<");
-    ::boost::algorithm::replace_all(newStr, "&gt;", ">");
-    ::boost::algorithm::replace_all(newStr, "&quot;", "\"");
+    std::string newStr = Text;
+    XmlUtils::replace_all( newStr, "&amp;", "&");
+    XmlUtils::replace_all( newStr, "&apos;", "'");
+    XmlUtils::replace_all( newStr, "&lt;", "<");
+    XmlUtils::replace_all( newStr, "&gt;", ">");
+    XmlUtils::replace_all( newStr, "&quot;", "\"");
     return newStr;
 }
 
 std::wstring replace_lt_gt_ImplReplace(const std::wstring & Text)
 {
-    std::wstring newStr;
-    newStr = ::boost::algorithm::replace_all_copy(Text, L"<", L"&lt;");
-    ::boost::algorithm::replace_all(newStr, L">", L"&gt;");
+    std::wstring newStr = Text;
+    XmlUtils::replace_all( newStr, L"<", L"&lt;");
+    XmlUtils::replace_all( newStr, L">", L"&gt;");
     return newStr;
 }
 

ASCOfficeOdfFile/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
-//1
-//0
-//1
-//213
-#define INTVER 1,0,1,213
-#define STRVER "1,0,1,213\0"

ASCOfficeOdfFileW/OdfFileWTest/OdfFileWTest.cpp

@@ -1,160 +1,160 @@
-/*
- * (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
- *
- */
-// ASCOfficeOdfFileWTest.cpp : Defines the entry point for the console application.
-//
-
-#include "../../OfficeUtils/src/OfficeUtils.h"
-
-#include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp> 
-#include <boost/timer.hpp>
-
-#include <iostream>
-#include <string>
-
-#include "../../Common/DocxFormat/Source/Base/Base.h"
-#include "../../DesktopEditor/common/Directory.h"
-#include "../../DesktopEditor/common/File.h"
-
-#include "../source/Oox2OdfConverter/Oox2OdfConverter.h"
-
-#if defined(_WIN64)
-	#pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib")
-#elif defined (_WIN32)
-	#pragma comment(lib, "../../build/bin/icu/win_32/icuuc.lib")
-#endif
-
-std::wstring DetectTypeDocument(const std::wstring & pathOOX)
-{
-	std::wstring sRes;
-
-	NSFile::CFileBinary file;
-
-	std::wstring fileContentType = pathOOX + FILE_SEPARATOR_STR + L"[Content_Types].xml";
-
-	if (file.OpenFile(fileContentType) ==false) return sRes;
-
-	DWORD nBufferSize = min (file.GetFileSize(), 10000);
-	BYTE *pBuffer = new BYTE[nBufferSize];
-
-	file.ReadFile(pBuffer, nBufferSize, nBufferSize);
-	file.CloseFile();
-
-	if (pBuffer != NULL)
-	{
-
-		const char *docxFormatLine = "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml";
-		const char *dotxFormatLine = "application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml";
-		const char *docmFormatLine = "application/vnd.ms-word.document.macroEnabled.main+xml";
-		const char *dotmFormatLine = "application/vnd.ms-word.template.macroEnabledTemplate.main+xml";
-
-		const char *xlsxFormatLine = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml";
-		const char *xltxFormatLine = "application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml";
-		const char *xlsmFormatLine = "application/vnd.ms-excel.sheet.macroEnabled.main+xml";
-		const char *xltmFormatLine = "application/vnd.ms-excel.template.macroEnabled.main+xml";
-
-		const char *pptxFormatLine = "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml";
-		const char *ppsxFormatLine = "application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml";
-		const char *potxFormatLine = "application/vnd.openxmlformats-officedocument.presentationml.template.main+xml";
-		const char *pptmFormatLine = "application/vnd.ms-powerpoint.presentation.macroEnabled.main+xml";
-		const char *ppsmFormatLine = "application/vnd.ms-powerpoint.slideshow.macroEnabled.main+xml";
-		const char *potmFormatLine = "application/vnd.ms-powerpoint.template.macroEnabled.main+xml";
-
-        std::string strContentTypes((char*)pBuffer, nBufferSize);
-
-        int res = 0;
-        if ( (res = strContentTypes.find(docxFormatLine))>0 || (res = strContentTypes.find(dotxFormatLine))>0 ||
-            (res = strContentTypes.find(docmFormatLine))>0 || (res = strContentTypes.find(dotmFormatLine))>0)
-		{
-			sRes = L"text";
-		}
-
-        else if ((res = strContentTypes.find(xlsxFormatLine))>0 || (res = strContentTypes.find(xltxFormatLine))>0 ||
-            (res = strContentTypes.find(xlsmFormatLine))>0 || (res = strContentTypes.find(xltmFormatLine))>0)
-		{
-			sRes = L"spreadsheet";
-		}
-
-        else if ((res = strContentTypes.find(pptxFormatLine) > 0) || /*(res = strContentTypes.find(ppsxFormatLine))>0 ||*/
-            (res = strContentTypes.find(potxFormatLine))>0 || (res = strContentTypes.find(pptmFormatLine))>0 ||
-            (res = strContentTypes.find(ppsmFormatLine))>0 || (res = strContentTypes.find(potmFormatLine))>0 ||
-			(res = strContentTypes.find(ppsxFormatLine)) >0 )
-		{
-		}
-
-		delete []pBuffer;
-		pBuffer = NULL;
-
-	}
-	return sRes;
-}
-
-
-int _tmain(int argc, _TCHAR* argv[])
-{
-	if (argc < 3) return 0;
-
-	HRESULT hr = S_OK;
-    boost::timer t1;
-//////////////////////////////////////////////////////////////////////////
-	std::wstring srcFileName	= argv[1];
-	std::wstring dstPath		= argv[2];
-	std::wstring outputDir		= NSDirectory::GetFolderPath(dstPath);
-	
-	std::wstring srcTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
-	std::wstring dstTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
-
-    // распаковываем исходник во временную директорию
-	COfficeUtils oCOfficeUtils(NULL);
-    if (S_OK != oCOfficeUtils.ExtractToDirectory(srcFileName.c_str(), srcTempPath.c_str(), NULL, 0))
-		return S_FALSE;
-
-	std::wstring type = DetectTypeDocument(srcTempPath);
-	
-	Oox2Odf::Converter converter(srcTempPath, type, L"C:\\Windows\\Fonts", NULL);
-
-	converter.convert();
-	converter.write(dstTempPath);
-
-	NSDirectory::DeleteDirectory(srcTempPath);
-
-	if (hr != S_OK)  return hr;
-   
-	if (S_OK != oCOfficeUtils.CompressFileOrDirectory(dstTempPath.c_str(), dstPath.c_str(), -1))
-        return hr;
-	
-	NSDirectory::DeleteDirectory(dstTempPath);
-
-////////////////////////////////////////////////////////////////////////
-    std::cout << "\n\nTime : " << t1.elapsed() << "\n";   
-	return 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
+ *
+ */
+// ASCOfficeOdfFileWTest.cpp : Defines the entry point for the console application.
+//
+
+#include "../../OfficeUtils/src/OfficeUtils.h"
+
+#include <boost/lexical_cast.hpp>
+#include <boost/algorithm/string.hpp> 
+#include <boost/timer.hpp>
+
+#include <iostream>
+#include <string>
+
+#include "../../Common/DocxFormat/Source/Base/Base.h"
+#include "../../DesktopEditor/common/Directory.h"
+#include "../../DesktopEditor/common/File.h"
+
+#include "../source/Oox2OdfConverter/Oox2OdfConverter.h"
+
+#if defined(_WIN64)
+	#pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib")
+#elif defined (_WIN32)
+	#pragma comment(lib, "../../build/bin/icu/win_32/icuuc.lib")
+#endif
+
+std::wstring DetectTypeDocument(const std::wstring & pathOOX)
+{
+	std::wstring sRes;
+
+	NSFile::CFileBinary file;
+
+	std::wstring fileContentType = pathOOX + FILE_SEPARATOR_STR + L"[Content_Types].xml";
+
+	if (file.OpenFile(fileContentType) ==false) return sRes;
+
+	DWORD nBufferSize = min (file.GetFileSize(), 10000);
+	BYTE *pBuffer = new BYTE[nBufferSize];
+
+	file.ReadFile(pBuffer, nBufferSize, nBufferSize);
+	file.CloseFile();
+
+	if (pBuffer != NULL)
+	{
+
+		const char *docxFormatLine = "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml";
+		const char *dotxFormatLine = "application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml";
+		const char *docmFormatLine = "application/vnd.ms-word.document.macroEnabled.main+xml";
+		const char *dotmFormatLine = "application/vnd.ms-word.template.macroEnabledTemplate.main+xml";
+
+		const char *xlsxFormatLine = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml";
+		const char *xltxFormatLine = "application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml";
+		const char *xlsmFormatLine = "application/vnd.ms-excel.sheet.macroEnabled.main+xml";
+		const char *xltmFormatLine = "application/vnd.ms-excel.template.macroEnabled.main+xml";
+
+		const char *pptxFormatLine = "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml";
+		const char *ppsxFormatLine = "application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml";
+		const char *potxFormatLine = "application/vnd.openxmlformats-officedocument.presentationml.template.main+xml";
+		const char *pptmFormatLine = "application/vnd.ms-powerpoint.presentation.macroEnabled.main+xml";
+		const char *ppsmFormatLine = "application/vnd.ms-powerpoint.slideshow.macroEnabled.main+xml";
+		const char *potmFormatLine = "application/vnd.ms-powerpoint.template.macroEnabled.main+xml";
+
+        std::string strContentTypes((char*)pBuffer, nBufferSize);
+
+        int res = 0;
+        if ( (res = strContentTypes.find(docxFormatLine))>0 || (res = strContentTypes.find(dotxFormatLine))>0 ||
+            (res = strContentTypes.find(docmFormatLine))>0 || (res = strContentTypes.find(dotmFormatLine))>0)
+		{
+			sRes = L"text";
+		}
+
+        else if ((res = strContentTypes.find(xlsxFormatLine))>0 || (res = strContentTypes.find(xltxFormatLine))>0 ||
+            (res = strContentTypes.find(xlsmFormatLine))>0 || (res = strContentTypes.find(xltmFormatLine))>0)
+		{
+			sRes = L"spreadsheet";
+		}
+
+        else if ((res = strContentTypes.find(pptxFormatLine) > 0) || /*(res = strContentTypes.find(ppsxFormatLine))>0 ||*/
+            (res = strContentTypes.find(potxFormatLine))>0 || (res = strContentTypes.find(pptmFormatLine))>0 ||
+            (res = strContentTypes.find(ppsmFormatLine))>0 || (res = strContentTypes.find(potmFormatLine))>0 ||
+			(res = strContentTypes.find(ppsxFormatLine)) >0 )
+		{
+		}
+
+		delete []pBuffer;
+		pBuffer = NULL;
+
+	}
+	return sRes;
+}
+
+
+int _tmain(int argc, _TCHAR* argv[])
+{
+	if (argc < 3) return 0;
+
+	HRESULT hr = S_OK;
+    boost::timer t1;
+//////////////////////////////////////////////////////////////////////////
+	std::wstring srcFileName	= argv[1];
+	std::wstring dstPath		= argv[2];
+	std::wstring outputDir		= NSDirectory::GetFolderPath(dstPath);
+	
+	std::wstring srcTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
+	std::wstring dstTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
+
+    // распаковываем исходник во временную директорию
+	COfficeUtils oCOfficeUtils(NULL);
+    if (S_OK != oCOfficeUtils.ExtractToDirectory(srcFileName.c_str(), srcTempPath.c_str(), NULL, 0))
+		return S_FALSE;
+
+	std::wstring type = DetectTypeDocument(srcTempPath);
+	
+	Oox2Odf::Converter converter(srcTempPath, type, L"C:\\Windows\\Fonts", NULL);
+
+	converter.convert();
+	converter.write(dstTempPath);
+
+	NSDirectory::DeleteDirectory(srcTempPath);
+
+	if (hr != S_OK)  return hr;
+   
+	if (S_OK != oCOfficeUtils.CompressFileOrDirectory(dstTempPath.c_str(), dstPath.c_str(), -1))
+        return hr;
+	
+	NSDirectory::DeleteDirectory(dstTempPath);
+
+////////////////////////////////////////////////////////////////////////
+    std::cout << "\n\nTime : " << t1.elapsed() << "\n";   
+	return 0;
+}

ASCOfficeOdfFileW/OdfFileWTest/OdfFileWTest.vcproj

@@ -1,417 +1,409 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="ASCOfficeOdfFileWTest"
-	ProjectGUID="{FBA8446A-150F-4A10-B4DA-1022048D6473}"
-	RootNamespace="ASCOfficeOdfFileWTest"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_MSC_VER=1800"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&#x0D;&#x0A;Rpcrt4.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\ASCOfficeOdfFileWTest.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\Common\FileDownloader\FileDownloader_win.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\Common\3dParty\pole\pole.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\UnicodeConverter\UnicodeConverter.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</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>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="OdfFileWriterTest"
+	ProjectGUID="{FBA8446A-150F-4A10-B4DA-1022048D6473}"
+	RootNamespace="ASCOfficeOdfFileWTest"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_MSC_VER=1800"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="&#x0D;&#x0A;Rpcrt4.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\Common\FileDownloader\FileDownloader_win.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\OdfFileWTest.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\Common\3dParty\pole\pole.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\UnicodeConverter\UnicodeConverter.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</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>
+	</Globals>
+</VisualStudioProject>

ASCOfficeOdfFileW/source/OdfFormat/odf_chart_context.cpp

@@ -33,6 +33,7 @@
 #include "logging.h"
 
 #include <boost/foreach.hpp>
+#include <boost/algorithm/string.hpp>
 
 #include "../../../ASCOfficeOdfFile/formulasconvert/formulasconvert.h"
 
@@ -241,7 +242,7 @@ std::wstring odf_chart_context::Impl::convert_formula(std::wstring oox_formula)
 	}
 	std::wstring odf_formula = formulas_converter_chart.convert_chart_distance(oox_formula);
 	
-	//boost::algorithm::replace_all(odf_formula, L"$", L"");
+	//XmlUtils::replace_all( odf_formula, L"$", L"");
 	return odf_formula;
 }
 

ASCOfficeOdfFileW/source/OdfFormat/odf_number_styles_context.cpp

@@ -29,7 +29,7 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-#include <boost/algorithm/string.hpp>
+#include"../../../Common/DocxFormat/Source/XML/Utils.h"
 
 #include "logging.h"
 
@@ -38,6 +38,7 @@
 
 #include "number_style.h"
 
+#include <boost/algorithm/string.hpp>
 
 namespace cpdoccore {
 
@@ -596,7 +597,7 @@ void odf_number_styles_context::create_date_style(number_format_state & state, o
 			if(sz>1) 
 			{
 				//выкинем "лишние" слэши
-				boost::algorithm::replace_all(s, L"\\", L"");
+				XmlUtils::replace_all( s, L"\\", L"");
 			}
 			create_element(L"number", L"text", elm, odf_context_);
 			number_text* number_text_ = dynamic_cast<number_text*>(elm.get());
@@ -617,7 +618,7 @@ void odf_number_styles_context::create_time_style(number_format_state & state, o
 	
 	// state.language_code == L"F400")//System time format
 	std::wstring s = state.format_code[0];
-	boost::algorithm::to_lower(s);
+	XmlUtils::GetLower(s);
 	
 	boost::wregex re(L"([a-zA-Z]+)(\\W+)");//(L"(\\w+)");
 	std::list<std::wstring> result;
@@ -672,7 +673,7 @@ void odf_number_styles_context::create_time_style(number_format_state & state, o
 			if(sz>1) 
 			{
 				//выкинем "лишние" слэши
-				boost::algorithm::replace_all(s, L"\\", L"");
+				XmlUtils::replace_all( s, L"\\", L"");
 			}
 			create_element(L"number", L"text", elm, odf_context_);
 			number_text* number_text_ = dynamic_cast<number_text*>(elm.get());
@@ -725,7 +726,7 @@ void odf_number_styles_context::detect_format(number_format_state & state)
 		return;
 	}
 	std::wstring tmp = state.format_code[0]; 
-	boost::algorithm::to_lower(tmp);
+	XmlUtils::GetLower(tmp);
 	if (state.format_code.size() == 1)//any
 	{
 		int res=0;

ASCOfficeOdfFileW/source/OdfFormat/odf_style_context.cpp

@@ -397,7 +397,7 @@ std::wstring odf_style_context::find_free_name(style_family::type  family)
 	//		count++;
 	//	}
 	//}
-	name = name + boost::lexical_cast<std::wstring>(count+1);
+	name = name + boost::lexical_cast<std::wstring>(count + 1);
 	return name;
 }
 office_element_ptr & odf_style_context::add_or_find(std::wstring name, style_family::type family, bool automatic , bool root, int oox_id)

ASCOfficeOdfFileW/source/OdfFormat/ods_table_context.cpp

@@ -70,8 +70,8 @@ void ods_table_context::start_table_part(std::wstring name, std::wstring ref)
 	formulasconvert::oox2odf_converter formulas_converter;
 
 	std::wstring odf_range = formulas_converter.convert_named_ref(ref);
-	boost::algorithm::replace_all(odf_range, L"[", L"");
-	boost::algorithm::replace_all(odf_range, L"]", L"");
+	XmlUtils::replace_all( odf_range, L"[", L"");
+	XmlUtils::replace_all( odf_range, L"]", L"");
 
 	d_range->table_target_range_address_	= odf_range;
 	d_range->table_name_					= name;
@@ -110,8 +110,8 @@ void ods_table_context::add_autofilter(std::wstring ref)
 	formulasconvert::oox2odf_converter formulas_converter;
 
 	std::wstring odf_range = formulas_converter.convert_named_ref(ref);
-	boost::algorithm::replace_all(odf_range, L"[", L"");
-	boost::algorithm::replace_all(odf_range, L"]", L"");
+	XmlUtils::replace_all( odf_range, L"[", L"");
+	XmlUtils::replace_all( odf_range, L"]", L"");
 
 	d_range->table_target_range_address_ = odf_range;
 	d_range->table_display_filter_buttons_= true;
@@ -136,8 +136,8 @@ void ods_table_context::add_defined_range(const std::wstring & name, const std::
 	formulasconvert::oox2odf_converter formulas_converter;
 
 	std::wstring odf_range = formulas_converter.convert_named_ref(cell_range);//todo - разделить конвертацию диапазонов/рэнжей на c [] и без
-	boost::algorithm::replace_all(odf_range, L"[", L"");
-	boost::algorithm::replace_all(odf_range, L"]", L"");
+	XmlUtils::replace_all( odf_range, L"[", L"");
+	XmlUtils::replace_all( odf_range, L"]", L"");
 	std::wstring odf_base_cell = formulas_converter.find_base_cell(cell_range);
 
 	named_range->table_name_ = name;
@@ -198,9 +198,9 @@ void ods_table_context::add_defined_expression(const std::wstring & name, const
 				iter->add_definded_expression(elm);
 				if ( printable)
 				{
-					boost::algorithm::replace_all(odf_value, L"[", L"");
-					boost::algorithm::replace_all(odf_value, L"]", L"");
-					boost::algorithm::replace_all(odf_value, L";", L" ");
+					XmlUtils::replace_all( odf_value, L"[", L"");
+					XmlUtils::replace_all( odf_value, L"]", L"");
+					XmlUtils::replace_all( odf_value, L";", L" ");
 
 					iter->set_print_range(odf_value);
 				}

ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.cpp

@@ -32,6 +32,9 @@
 
 #include "logging.h"
 
+#include <boost/algorithm/string.hpp>
+#include <boost/date_time.hpp>
+
 #include "../../../ASCOfficeOdfFile/formulasconvert/formulasconvert.h"
 
 #include "ods_table_state.h"
@@ -48,8 +51,6 @@
 #include "style_paragraph_properties.h"
 #include "style_graphic_properties.h"
 
-#include <boost/date_time.hpp>
-
 namespace cpdoccore {
 
 	using namespace odf_types;
@@ -1084,8 +1085,8 @@ void ods_table_state::start_conditional_format(std::wstring ref)
 	{
 		formulasconvert::oox2odf_converter converter;
 		std::wstring out = converter.convert_ref(ref);
-		boost::algorithm::replace_all(out,L"[",L"");
-		boost::algorithm::replace_all(out,L"]",L"");
+		XmlUtils::replace_all( out,L"[",L"");
+		XmlUtils::replace_all( out,L"]",L"");
 		cond_format->calcext_target_range_address_ = out;
 		//проверить конвертацию на диапазонах с именами листов в кавычках и с пробелами
 	}

ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.h

@@ -36,7 +36,8 @@
 
 #include <boost/regex.hpp>
 #include <boost/lexical_cast.hpp>
-#include <boost/algorithm/string.hpp>
+
+#include"../../../Common/DocxFormat/Source/XML/Utils.h"
 
 #include "odf_drawing_context.h"
 
@@ -87,14 +88,15 @@ namespace utils {
     static int getColAddressInv(const std::wstring & a_)
 	{
 		std::wstring a = a_;
-		::boost::algorithm::to_upper(a);
+        XmlUtils::GetUpper(a);
 		static const size_t r = (L'Z' - L'A' + 1);
 		size_t mul = 1;
 		bool f = true;
         int res = 0;
-		BOOST_REVERSE_FOREACH(const wchar_t c, a)
+
+        for (int i = a.length() - 1; i >= 0; i--)
 		{
-			size_t v = c - L'A';
+            size_t v = a[i] - L'A';
 			if (f)
 				f = false;
 			else
@@ -119,17 +121,15 @@ namespace utils {
 		std::wstring a = a_;
 
 		std::reverse(a.begin(), a.end());
-		::boost::algorithm::replace_all(a, L"$", L"");
-		//::boost::algorithm::replace_all(a, L"'", L"");
-		::boost::algorithm::to_upper(a);
+		XmlUtils::replace_all( a, L"$", L"");
+        XmlUtils::GetUpper(a);
 		
-
-		BOOST_FOREACH(wchar_t c, a)
+        for (int i = 0; i < a.length(); i++)
 		{
-			if (c >= L'0' && c <= L'9')
-				row +=c;
+            if (a[i] >= L'0' && a[i] <= L'9')
+                row += a[i];
 			else
-				col += c;
+                col += a[i];
 		}
 		std::reverse(col.begin(), col.end());
 		std::reverse(row.begin(), row.end());

ASCOfficeOdfFileW/source/OdfFormat/odt_conversion_context.cpp

@@ -808,7 +808,7 @@ bool odt_conversion_context::start_change (int id, int type, std::wstring &autho
 	
 	text_changes_state_.current_types.push_back(type);
 
-	std::wstring strId = L"ct" + std::to_wstring(id);
+	std::wstring strId = L"ct" + boost::lexical_cast<std::wstring>(id);
 //---------------------------------------------------------------------------------
 	office_element_ptr start_elm;
 
@@ -886,7 +886,7 @@ void odt_conversion_context::end_change (int id, int type)
 {
 	//if (!text_changes_state_.main_text_context) return;
 	
-	std::wstring strId = L"ct" + std::to_wstring(id);
+	std::wstring strId = L"ct" + boost::lexical_cast<std::wstring>(id);
 
 	if (type == 2)//delete
 	{

ASCOfficeOdfFileW/source/OdfFormat/styles_list.cpp

@@ -106,9 +106,10 @@ void text_list_style::serialize(std::wostream & strm)
         {
 			text_list_style_attr_.serialize(CP_GET_XML_NODE());
 
-			BOOST_FOREACH(office_element_ptr & elm, text_list_style_content_)
+			for (int i = 0; i < text_list_style_content_.size(); i++)
 			{
-				if (elm) elm->serialize(CP_XML_STREAM());
+				if (text_list_style_content_[i])
+					text_list_style_content_[i]->serialize(CP_XML_STREAM());
 			}	
 		}
 	}

ASCOfficeOdfFileW/source/OdfFormat/svg_creator.h

@@ -36,9 +36,6 @@
 #include <string>
 #include <vector>
 
-#include <boost/foreach.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/regex.h>
 
 #include <cpdoccore/CPOptional.h>
 

ASCOfficeOdfFileW/source/OdfFormat/table_database_ranges.cpp

@@ -80,9 +80,9 @@ void table_database_ranges::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         {
-			BOOST_FOREACH(const office_element_ptr & elm, database_ranges_)
+			for (int i = 0; i < database_ranges_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				database_ranges_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}

ASCOfficeOdfFileW/source/OdfFormat/table_named_expressions.cpp

@@ -88,13 +88,13 @@ void table_named_expressions::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         {
-			BOOST_FOREACH(const office_element_ptr & elm, named_expression_)
+			for (int i = 0; i < named_expression_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				named_expression_[i]->serialize(CP_XML_STREAM());
 			}
-			BOOST_FOREACH(const office_element_ptr & elm, named_range_)
+			for (int i = 0; i < named_range_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				named_range_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}