diff --git a/.gitattributes b/.gitattributes
index 049874a7b2..2a1fb97e82 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
+/ svn_global_002dignores=SDK%0A
ASCHTMLRenderer/Mac svnc_tsvn_003alogminsize=5
ASCHTMLRenderer/Mac/ASCHTMLRendererLib svnc_tsvn_003alogminsize=5
ASCHTMLRenderer/Mac/ASCHTMLRendererLib.xcodeproj svnc_tsvn_003alogminsize=5
diff --git a/ASCOfficeDocFile/DocDocxConverter/Converter.cpp b/ASCOfficeDocFile/DocDocxConverter/Converter.cpp
index 58b7224148..906d230fe4 100644
--- a/ASCOfficeDocFile/DocDocxConverter/Converter.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/Converter.cpp
@@ -160,7 +160,6 @@ namespace DocFileFormat
long Converter::LoadAndConvert(const CString& strSrcFile, const CString& strDstDirectory, const ProgressCallback* progress)
{
- g_oCriticalSection.Enter();
long result = S_FALSE;
@@ -190,8 +189,6 @@ namespace DocFileFormat
}
}
- g_oCriticalSection.Leave();
-
return result;
}
}
diff --git a/ASCOfficeDocFile/DocDocxConverter/Converter.h b/ASCOfficeDocFile/DocDocxConverter/Converter.h
index e129bfb3b7..e25dd61724 100644
--- a/ASCOfficeDocFile/DocDocxConverter/Converter.h
+++ b/ASCOfficeDocFile/DocDocxConverter/Converter.h
@@ -15,8 +15,6 @@
#include "WordprocessingDocument.h"
#include "ConversionContext.h"
-extern ASCOfficeCriticalSection g_oCriticalSection;
-
namespace DocFileFormat
{
class Converter
diff --git a/ASCOfficeDocFile/DocFormatLib/DocFormatLib.cpp b/ASCOfficeDocFile/DocFormatLib/DocFormatLib.cpp
index 9c3b02f536..b54876a226 100644
--- a/ASCOfficeDocFile/DocFormatLib/DocFormatLib.cpp
+++ b/ASCOfficeDocFile/DocFormatLib/DocFormatLib.cpp
@@ -6,66 +6,17 @@
#include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
#include "../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
-HRESULT COfficeDocFile::LoadFromFile(CString bsDocFile, CString bsDocx, CString bsXMLOptions, ProgressCallback *ffCallBack )
+HRESULT COfficeDocFile::LoadFromFile(CString bsDocFile, CString bsDocxDirectory, CString bsXMLOptions, ProgressCallback *ffCallBack )
{
-#if defined(_DEBUG) && defined (_WIN32)
- //_CrtDumpMemoryLeaks();
- //_CrtSetBreakAlloc(11001);
-#endif
-
HRESULT hr = S_FALSE;
DocFileFormat::Converter docToDocx;
-
- if (m_strTempDirectory.GetLength() < 1)
- {
- m_strTempDirectory = FileSystem::Directory::GetTempPath();
- }
-
- CString sDocxDirectory;
-
-#if !defined(_WIN32) && !defined(_WIN64)
- sDocxDirectory = FileSystem::Directory::CreateDirectoryWithUniqueName(m_strTempDirectory);
-#else
- sDocxDirectory = bsDocx;
- FileSystem::Directory::CreateDirectory(sDocxDirectory);
-#endif
-
- hr= docToDocx.LoadAndConvert(bsDocFile,sDocxDirectory, ffCallBack);
-
-#ifndef _WIN32
- if (hr == S_OK)
- {
- //zipping
- COfficeUtils oCOfficeUtils(NULL);
- hr = oCOfficeUtils.CompressFileOrDirectory (string2std_string(sDocxDirectory), string2std_string(bsDocx), -1);
-
- FileSystem::Directory::DeleteDirectory(sDocxDirectory);
- }
-#endif
-
-#if defined(_DEBUG) && (defined(_WIN32) || defined(_WIN64))
- //_CrtDumpMemoryLeaks();
-#endif
+ hr= docToDocx.LoadAndConvert(bsDocFile, bsDocxDirectory, ffCallBack);
return hr;
}
HRESULT COfficeDocFile::SaveToFile (CString sDstFileName, CString sSrcFileName, CString sXMLOptions, ProgressCallback *ffCallBack )
{
- HRESULT hr = S_OK;
-
- //DOCXTODOC::CFileTransformer oTransformer;
-
-#if defined(_DEBUG) && (defined(_WIN32) || defined(_WIN64))
- //_CrtDumpMemoryLeaks();
-#endif
-
- //hr = oTransformer.Convert(sSrcPath, sDstFileName, ffCallBack);
-
-#if defined(_DEBUG) && (defined(_WIN32) || defined(_WIN64))
- //_CrtDumpMemoryLeaks();
-#endif
-
- return hr;
+ return S_OK;
}
diff --git a/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj b/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj
index bbf385bd91..52df98ac61 100644
--- a/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj
+++ b/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj
@@ -1228,14 +1228,6 @@
RelativePath="..\DocFormatLib.h"
>
-
-
-
-
diff --git a/ASCOfficeDocFile/Win32/ASCDocFile.cpp b/ASCOfficeDocFile/Win32/ASCDocFile.cpp
index 45b69d91fd..88e40c1407 100644
--- a/ASCOfficeDocFile/Win32/ASCDocFile.cpp
+++ b/ASCOfficeDocFile/Win32/ASCDocFile.cpp
@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "ASCDocFile.h"
-#include "ASCOfficeCriticalSection.h"
+//#include "ASCOfficeCriticalSection.h"
#include "../DocFormatLib/DocFormatLib.h"
#include "../Common/Callback.h"
@@ -11,11 +11,9 @@
#include
#endif
-ASCOfficeCriticalSection g_oCriticalSection;
STDMETHODIMP CASCOfficeDocFile::LoadFromFile(BSTR bsDocFile, BSTR bsDocxFilePath, BSTR bsXMLOptions)
{
- g_oCriticalSection.Enter();
#ifdef _DEBUG
//_CrtDumpMemoryLeaks();
@@ -36,13 +34,11 @@ STDMETHODIMP CASCOfficeDocFile::LoadFromFile(BSTR bsDocFile, BSTR bsDocxFilePath
//_CrtDumpMemoryLeaks();
#endif
- g_oCriticalSection.Leave();
return hr;
}
STDMETHODIMP CASCOfficeDocFile::SaveToFile (BSTR sDstFileName, BSTR sSrcPath, BSTR sXMLOptions)
{
- g_oCriticalSection.Enter();
#ifdef _DEBUG
//_CrtDumpMemoryLeaks();
@@ -62,27 +58,21 @@ STDMETHODIMP CASCOfficeDocFile::SaveToFile (BSTR sDstFileName, BSTR sSrcPath, BS
//_CrtDumpMemoryLeaks();
#endif
- g_oCriticalSection.Leave();
-
return hr;
}
void CASCOfficeDocFile::OnProgressFunc (LPVOID lpParam, long nID, long nPercent)
{
- g_oCriticalSection.Enter();
-
CASCOfficeDocFile* pDocFile = reinterpret_cast(lpParam);
if (pDocFile != NULL)
{
pDocFile->OnProgress(nID, nPercent);
}
- g_oCriticalSection.Leave();
}
void CASCOfficeDocFile::OnProgressExFunc (LPVOID lpParam, long nID, long nPercent, short* pStop)
{
- g_oCriticalSection.Enter();
CASCOfficeDocFile* pDocFile = reinterpret_cast(lpParam);
if (NULL != pDocFile)
@@ -90,5 +80,4 @@ void CASCOfficeDocFile::OnProgressExFunc (LPVOID lpParam, long nID, long nPercen
pDocFile->OnProgressEx(nID, nPercent, pStop);
}
- g_oCriticalSection.Leave();
}
\ No newline at end of file
diff --git a/ASCOfficeDocFile/version.h b/ASCOfficeDocFile/version.h
index 35b4e3a579..edd0587ead 100644
--- a/ASCOfficeDocFile/version.h
+++ b/ASCOfficeDocFile/version.h
@@ -2,6 +2,6 @@
//1
//0
//1
-//228
-#define INTVER 1,0,1,228
-#define STRVER "1,0,1,228\0"
+//231
+#define INTVER 1,0,1,231
+#define STRVER "1,0,1,231\0"
diff --git a/ASCOfficeDocxFile2/X2tConverter_win_test.sln b/ASCOfficeDocxFile2/X2tConverter_win_test.sln
index 8195af42b6..1b9915de31 100644
--- a/ASCOfficeDocxFile2/X2tConverter_win_test.sln
+++ b/ASCOfficeDocxFile2/X2tConverter_win_test.sln
@@ -17,38 +17,38 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "font_engine", "..\DesktopEd
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCHTMLRenderer", "..\ASCHTMLRenderer\ASCHTMLRendererLib.vcproj", "{DC24710E-8DF2-4A7A-B7C3-2313E294143C}"
ProjectSection(ProjectDependencies) = postProject
- {818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
- {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
- {FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
- {BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
- {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
- {9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
- {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
- {40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
- {0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
- {DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
- {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
- {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
- {C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
+ {C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
+ {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
+ {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}
+ {40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
+ {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
+ {9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
+ {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
+ {BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
+ {FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
+ {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
+ {818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
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}
{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
+ {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "..\DesktopEditor\cximage\CxImage\cximage_vs2005.vcproj", "{BC52A07C-A797-423D-8C4F-8678805BBB36}"
ProjectSection(ProjectDependencies) = postProject
- {818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
- {FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
- {9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
- {40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
- {0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
- {DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
- {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
+ {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}
+ {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}"
@@ -75,30 +75,35 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\Common\DocxFo
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeUtilsLib", "..\ASCOfficeUtils\ASCOfficeUtilsLib\Win\ASCOfficeUtilsLib.vcproj", "{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormatTestRead", "..\Test\Applications\DocxFormatTests\DocxFormatTestRead\win32\DocxFormatTestRead.vcproj", "{C774B3D6-5A46-4449-BC2E-9FFA4B21F233}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "X2tConverter_win", "..\Test\Applications\DocxFormatTests\DocxFormatTestRead\win32\DocxFormatTestRead.vcproj", "{C774B3D6-5A46-4449-BC2E-9FFA4B21F233}"
ProjectSection(ProjectDependencies) = postProject
{E8EC320B-F0BF-4728-912A-41FAFC89051B} = {E8EC320B-F0BF-4728-912A-41FAFC89051B}
{DC24710E-8DF2-4A7A-B7C3-2313E294143C} = {DC24710E-8DF2-4A7A-B7C3-2313E294143C}
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
- {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
- {BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
- {36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
- {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
+ {DACBE6CA-E089-47D1-8CE7-C7DB59C15417} = {DACBE6CA-E089-47D1-8CE7-C7DB59C15417}
+ {AF2D00A7-A351-4700-AE88-C1D9ADE29345} = {AF2D00A7-A351-4700-AE88-C1D9ADE29345}
+ {C5371405-338F-4B70-83BD-2A5CDF64F383} = {C5371405-338F-4B70-83BD-2A5CDF64F383}
{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
+ {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
+ {36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
+ {BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
+ {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PdfWriterLib", "..\ASCOfficePDFWriter\PdfWriterLib\Win32\PdfWriterLib.vcproj", "{E8EC320B-F0BF-4728-912A-41FAFC89051B}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RtfFormatLib", "..\ASCOfficeRtfFile\RtfFormatLib\Win32\RtfFormatLib.vcproj", "{AF2D00A7-A351-4700-AE88-C1D9ADE29345}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocFormatLib", "..\ASCOfficeDocFile\DocFormatLib\Win32\DocFormatLib.vcproj", "{C5371405-338F-4B70-83BD-2A5CDF64F383}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TxtFormatLib", "..\ASCOfficeTxtFile\TxtXmlFormatLib\Win32\TxtXmlFormatLib.vcproj", "{DACBE6CA-E089-47D1-8CE7-C7DB59C15417}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
- ReleaseOpenSource|Win32 = ReleaseOpenSource|Win32
- ReleaseOpenSource|x64 = ReleaseOpenSource|x64
- ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
- ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -108,12 +113,6 @@ Global
{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|Win32
- {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseOpenSource|Win32.ActiveCfg = ReleaseOpenSource|Win32
- {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseOpenSource|Win32.Build.0 = ReleaseOpenSource|Win32
- {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseOpenSource|x64.ActiveCfg = ReleaseOpenSource|Win32
- {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseOpenSource|Win32
- {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseOpenSource|Win32
- {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseOpenSource|Win32
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.ActiveCfg = Debug|Win32
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.Build.0 = Debug|Win32
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|x64.ActiveCfg = Debug|x64
@@ -121,12 +120,6 @@ Global
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.ActiveCfg = Release|Win32
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.Build.0 = Release|Win32
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|x64.ActiveCfg = Release|Win32
- {36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{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
@@ -134,12 +127,6 @@ Global
{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|Win32
- {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseOpenSource|Win32.ActiveCfg = Release Singlethreaded|Win32
- {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseOpenSource|Win32.Build.0 = Release Singlethreaded|Win32
- {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseOpenSource|x64.ActiveCfg = Release Singlethreaded|Win32
- {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release Singlethreaded|Win32
- {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseWithoutAsm|Win32.Build.0 = Release Singlethreaded|Win32
- {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseWithoutAsm|x64.ActiveCfg = Release Singlethreaded|Win32
{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
@@ -147,12 +134,6 @@ Global
{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|Win32
- {C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Debug|Win32.ActiveCfg = Debug|Win32
{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Debug|Win32.Build.0 = Debug|Win32
{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Debug|x64.ActiveCfg = Debug|x64
@@ -160,12 +141,6 @@ Global
{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Release|Win32.ActiveCfg = Release|Win32
{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Release|Win32.Build.0 = Release|Win32
{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Release|x64.ActiveCfg = Release|Win32
- {DC24710E-8DF2-4A7A-B7C3-2313E294143C}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {DC24710E-8DF2-4A7A-B7C3-2313E294143C}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {DC24710E-8DF2-4A7A-B7C3-2313E294143C}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {DC24710E-8DF2-4A7A-B7C3-2313E294143C}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {DC24710E-8DF2-4A7A-B7C3-2313E294143C}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {DC24710E-8DF2-4A7A-B7C3-2313E294143C}.ReleaseWithoutAsm|x64.ActiveCfg = Release|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
@@ -173,12 +148,6 @@ Global
{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|Win32
- {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{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
@@ -186,12 +155,6 @@ Global
{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|Win32
- {BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{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
@@ -199,12 +162,6 @@ Global
{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|Win32
- {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{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
@@ -212,12 +169,6 @@ Global
{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|Win32
- {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{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
@@ -225,12 +176,6 @@ Global
{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|Win32
- {40A69F40-063E-43FD-8543-455495D8733E}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {40A69F40-063E-43FD-8543-455495D8733E}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {40A69F40-063E-43FD-8543-455495D8733E}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {40A69F40-063E-43FD-8543-455495D8733E}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {40A69F40-063E-43FD-8543-455495D8733E}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {40A69F40-063E-43FD-8543-455495D8733E}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{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
@@ -238,12 +183,6 @@ Global
{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|Win32
- {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{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
@@ -251,12 +190,6 @@ Global
{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|Win32
- {0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{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
@@ -264,12 +197,6 @@ Global
{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|Win32
- {818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{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
@@ -277,12 +204,6 @@ Global
{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|Win32
- {9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{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
@@ -290,12 +211,6 @@ Global
{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|Win32
- {DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{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
@@ -303,12 +218,6 @@ Global
{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|Win32
- {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseWithoutAsm|x64.ActiveCfg = Release|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
@@ -316,12 +225,6 @@ Global
{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|Win32
- {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.ActiveCfg = Debug|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.Build.0 = Debug|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.ActiveCfg = Debug|x64
@@ -329,12 +232,6 @@ Global
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.ActiveCfg = Release|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.Build.0 = Release|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.ActiveCfg = Release|Win32
- {21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.ActiveCfg = Debug|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.Build.0 = Debug|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|x64.ActiveCfg = Debug|x64
@@ -342,12 +239,6 @@ Global
{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|Win32
- {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{C774B3D6-5A46-4449-BC2E-9FFA4B21F233}.Debug|Win32.ActiveCfg = Debug|Win32
{C774B3D6-5A46-4449-BC2E-9FFA4B21F233}.Debug|Win32.Build.0 = Debug|Win32
{C774B3D6-5A46-4449-BC2E-9FFA4B21F233}.Debug|x64.ActiveCfg = Debug|x64
@@ -355,12 +246,6 @@ Global
{C774B3D6-5A46-4449-BC2E-9FFA4B21F233}.Release|Win32.ActiveCfg = Release|Win32
{C774B3D6-5A46-4449-BC2E-9FFA4B21F233}.Release|Win32.Build.0 = Release|Win32
{C774B3D6-5A46-4449-BC2E-9FFA4B21F233}.Release|x64.ActiveCfg = Release|Win32
- {C774B3D6-5A46-4449-BC2E-9FFA4B21F233}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
- {C774B3D6-5A46-4449-BC2E-9FFA4B21F233}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
- {C774B3D6-5A46-4449-BC2E-9FFA4B21F233}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
- {C774B3D6-5A46-4449-BC2E-9FFA4B21F233}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
- {C774B3D6-5A46-4449-BC2E-9FFA4B21F233}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
- {C774B3D6-5A46-4449-BC2E-9FFA4B21F233}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
{E8EC320B-F0BF-4728-912A-41FAFC89051B}.Debug|Win32.ActiveCfg = Debug|Win32
{E8EC320B-F0BF-4728-912A-41FAFC89051B}.Debug|Win32.Build.0 = Debug|Win32
{E8EC320B-F0BF-4728-912A-41FAFC89051B}.Debug|x64.ActiveCfg = Debug|x64
@@ -369,12 +254,30 @@ Global
{E8EC320B-F0BF-4728-912A-41FAFC89051B}.Release|Win32.Build.0 = Release|Win32
{E8EC320B-F0BF-4728-912A-41FAFC89051B}.Release|x64.ActiveCfg = Release|x64
{E8EC320B-F0BF-4728-912A-41FAFC89051B}.Release|x64.Build.0 = Release|x64
- {E8EC320B-F0BF-4728-912A-41FAFC89051B}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
- {E8EC320B-F0BF-4728-912A-41FAFC89051B}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
- {E8EC320B-F0BF-4728-912A-41FAFC89051B}.ReleaseOpenSource|x64.Build.0 = Release|x64
- {E8EC320B-F0BF-4728-912A-41FAFC89051B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|x64
- {E8EC320B-F0BF-4728-912A-41FAFC89051B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
- {E8EC320B-F0BF-4728-912A-41FAFC89051B}.ReleaseWithoutAsm|x64.Build.0 = Release|x64
+ {AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Debug|Win32.Build.0 = Debug|Win32
+ {AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Debug|x64.ActiveCfg = Debug|x64
+ {AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Debug|x64.Build.0 = Debug|x64
+ {AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Release|Win32.ActiveCfg = Release|Win32
+ {AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Release|Win32.Build.0 = Release|Win32
+ {AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Release|x64.ActiveCfg = Release|x64
+ {AF2D00A7-A351-4700-AE88-C1D9ADE29345}.Release|x64.Build.0 = Release|x64
+ {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|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
+ {DACBE6CA-E089-47D1-8CE7-C7DB59C15417}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DACBE6CA-E089-47D1-8CE7-C7DB59C15417}.Debug|Win32.Build.0 = Debug|Win32
+ {DACBE6CA-E089-47D1-8CE7-C7DB59C15417}.Debug|x64.ActiveCfg = Debug|x64
+ {DACBE6CA-E089-47D1-8CE7-C7DB59C15417}.Debug|x64.Build.0 = Debug|x64
+ {DACBE6CA-E089-47D1-8CE7-C7DB59C15417}.Release|Win32.ActiveCfg = Release|Win32
+ {DACBE6CA-E089-47D1-8CE7-C7DB59C15417}.Release|Win32.Build.0 = Release|Win32
+ {DACBE6CA-E089-47D1-8CE7-C7DB59C15417}.Release|x64.ActiveCfg = Release|x64
+ {DACBE6CA-E089-47D1-8CE7-C7DB59C15417}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/ASCOfficeOdfFile/win32/ASCOfficeOdfFile.sln b/ASCOfficeOdfFile/win32/ASCOfficeOdfFile.sln
index 22a95dbda5..bf80b6ecea 100644
--- a/ASCOfficeOdfFile/win32/ASCOfficeOdfFile.sln
+++ b/ASCOfficeOdfFile/win32/ASCOfficeOdfFile.sln
@@ -5,8 +5,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml_wrapper", "cpxml.vcproj
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormat", "cpodf.vcproj", "{50E20601-4A8D-4AFB-8870-63828D328429}"
ProjectSection(ProjectDependencies) = postProject
- {609ED938-3CA8-4BED-B363-25096D4C4812} = {609ED938-3CA8-4BED-B363-25096D4C4812}
{41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1}
+ {609ED938-3CA8-4BED-B363-25096D4C4812} = {609ED938-3CA8-4BED-B363-25096D4C4812}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "cpcommon.vcproj", "{609ED938-3CA8-4BED-B363-25096D4C4812}"
@@ -17,15 +17,37 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FormulasConvert", "formulasconvert.vcproj", "{94954A67-A853-43B1-A727-6EF2774C5A6A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFile", "..\ASCOfficeOdfFile\ASCOfficeOdfFile.vcproj", "{64B09C98-22DC-494E-A882-9E2D7D18557C}"
+ ProjectSection(ProjectDependencies) = postProject
+ {50E20601-4A8D-4AFB-8870-63828D328429} = {50E20601-4A8D-4AFB-8870-63828D328429}
+ {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
+ {21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
+ {41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1}
+ {609ED938-3CA8-4BED-B363-25096D4C4812} = {609ED938-3CA8-4BED-B363-25096D4C4812}
+ {94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A}
+ {918D1327-C6ED-43E6-AE22-84A3736F0E87} = {918D1327-C6ED-43E6-AE22-84A3736F0E87}
+ {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFileTest", "..\Test\ASCOfficeOdfFileTest\ASCOfficeOdfFileTest.vcproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
+ ProjectSection(ProjectDependencies) = postProject
+ {64B09C98-22DC-494E-A882-9E2D7D18557C} = {64B09C98-22DC-494E-A882-9E2D7D18557C}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeSvmFile", "..\..\ASCImageStudio3\ASCGraphics\OfficeSvmFile\OfficeSvmFile2005.vcproj", "{918D1327-C6ED-43E6-AE22-84A3736F0E87}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
+ 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}") = "ASCOfficeUtilsLib", "..\..\ASCOfficeUtils\ASCOfficeUtilsLib\Win\ASCOfficeUtilsLib.vcproj", "{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "..\..\DesktopEditor\graphics\graphics_vs2005.vcproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
- Release ASC|Win32 = Release ASC|Win32
- Release ASC|x64 = Release ASC|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
@@ -34,42 +56,30 @@ Global
{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 ASC|Win32.ActiveCfg = Release|x64
- {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release ASC|x64.ActiveCfg = Release|x64
- {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release ASC|x64.Build.0 = Release|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|Win32
- {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release|x64.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 ASC|Win32.ActiveCfg = Release|x64
- {50E20601-4A8D-4AFB-8870-63828D328429}.Release ASC|x64.ActiveCfg = Release|x64
- {50E20601-4A8D-4AFB-8870-63828D328429}.Release ASC|x64.Build.0 = Release|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|Win32
- {50E20601-4A8D-4AFB-8870-63828D328429}.Release|x64.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 ASC|Win32.ActiveCfg = Release|x64
- {609ED938-3CA8-4BED-B363-25096D4C4812}.Release ASC|x64.ActiveCfg = Release|x64
- {609ED938-3CA8-4BED-B363-25096D4C4812}.Release ASC|x64.Build.0 = Release|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|Win32
- {609ED938-3CA8-4BED-B363-25096D4C4812}.Release|x64.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 ASC|Win32.ActiveCfg = Release|x64
- {94954A67-A853-43B1-A727-6EF2774C5A6A}.Release ASC|x64.ActiveCfg = Release|x64
- {94954A67-A853-43B1-A727-6EF2774C5A6A}.Release ASC|x64.Build.0 = Release|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
@@ -78,10 +88,6 @@ Global
{64B09C98-22DC-494E-A882-9E2D7D18557C}.Debug|Win32.Build.0 = Debug|Win32
{64B09C98-22DC-494E-A882-9E2D7D18557C}.Debug|x64.ActiveCfg = Debug|x64
{64B09C98-22DC-494E-A882-9E2D7D18557C}.Debug|x64.Build.0 = Debug|x64
- {64B09C98-22DC-494E-A882-9E2D7D18557C}.Release ASC|Win32.ActiveCfg = Release ASC|Win32
- {64B09C98-22DC-494E-A882-9E2D7D18557C}.Release ASC|Win32.Build.0 = Release ASC|Win32
- {64B09C98-22DC-494E-A882-9E2D7D18557C}.Release ASC|x64.ActiveCfg = Release ASC|x64
- {64B09C98-22DC-494E-A882-9E2D7D18557C}.Release ASC|x64.Build.0 = Release ASC|x64
{64B09C98-22DC-494E-A882-9E2D7D18557C}.Release|Win32.ActiveCfg = Release|Win32
{64B09C98-22DC-494E-A882-9E2D7D18557C}.Release|Win32.Build.0 = Release|Win32
{64B09C98-22DC-494E-A882-9E2D7D18557C}.Release|x64.ActiveCfg = Release|x64
@@ -90,13 +96,42 @@ Global
{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 ASC|Win32.ActiveCfg = Release|x64
- {C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release ASC|x64.ActiveCfg = Release|x64
- {C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release ASC|x64.Build.0 = Release|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
+ {918D1327-C6ED-43E6-AE22-84A3736F0E87}.Debug|Win32.ActiveCfg = Debug|Win32
+ {918D1327-C6ED-43E6-AE22-84A3736F0E87}.Debug|Win32.Build.0 = Debug|Win32
+ {918D1327-C6ED-43E6-AE22-84A3736F0E87}.Debug|x64.ActiveCfg = Debug|x64
+ {918D1327-C6ED-43E6-AE22-84A3736F0E87}.Debug|x64.Build.0 = Debug|x64
+ {918D1327-C6ED-43E6-AE22-84A3736F0E87}.Release|Win32.ActiveCfg = Release|Win32
+ {918D1327-C6ED-43E6-AE22-84A3736F0E87}.Release|Win32.Build.0 = Release|Win32
+ {918D1327-C6ED-43E6-AE22-84A3736F0E87}.Release|x64.ActiveCfg = Release|x64
+ {918D1327-C6ED-43E6-AE22-84A3736F0E87}.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
+ {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.Build.0 = Debug|Win32
+ {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|x64.ActiveCfg = Debug|x64
+ {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|x64.Build.0 = Debug|x64
+ {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Win32.ActiveCfg = Release|Win32
+ {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Win32.Build.0 = Release|Win32
+ {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|x64.ActiveCfg = Release|x64
+ {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|x64.Build.0 = Release|x64
+ {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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/ASCOfficeRtfFile/RtfFormatLib/Win32/RtfFormatLib.vcproj b/ASCOfficeRtfFile/RtfFormatLib/Win32/RtfFormatLib.vcproj
index a095ce748e..7519a3594b 100644
--- a/ASCOfficeRtfFile/RtfFormatLib/Win32/RtfFormatLib.vcproj
+++ b/ASCOfficeRtfFile/RtfFormatLib/Win32/RtfFormatLib.vcproj
@@ -800,18 +800,6 @@
RelativePath="..\source\ConvertationManager.h"
>
-
-
-
-
-
-
diff --git a/ASCOfficeRtfFile/RtfFormatLib/source/ConvertationManager.h b/ASCOfficeRtfFile/RtfFormatLib/source/ConvertationManager.h
index e4c6e5f324..541a21bc0e 100644
--- a/ASCOfficeRtfFile/RtfFormatLib/source/ConvertationManager.h
+++ b/ASCOfficeRtfFile/RtfFormatLib/source/ConvertationManager.h
@@ -23,7 +23,7 @@ public:
{
}
- HRESULT ConvertRtfToOOX( CString sSrcFileName, CString sDstPath, CString sXMLOptions )
+ HRESULT ConvertRtfToOOX( std::wstring sSrcFileName, std::wstring sDstPath, CString sXMLOptions )
{
m_bParseFirstItem = true;
@@ -64,7 +64,7 @@ public:
else
return S_FALSE;
}
- HRESULT ConvertOOXToRtf( CString sDstFileName, CString sSrcPath, CString sXMLOptions )
+ HRESULT ConvertOOXToRtf( std::wstring sDstFileName, std::wstring sSrcPath, CString sXMLOptions )
{
m_bParseFirstItem = true;
diff --git a/ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXReader.cpp b/ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXReader.cpp
index 131ae00c88..bfc0e79c52 100644
--- a/ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXReader.cpp
+++ b/ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXReader.cpp
@@ -9,9 +9,9 @@
#include "OOXFootnotesReader.h"
#include "OOXThemeReader.h"
-OOXReader::OOXReader( RtfDocument& oDocument,CString path ): m_oDocument(oDocument)
+OOXReader::OOXReader( RtfDocument& oDocument, std::wstring path ): m_oDocument(oDocument)
{
- m_sPath = path;
+ m_sPath = std_string2string(path);
m_nCurItap = 0;
m_convertationManager = NULL;
diff --git a/ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXReader.h b/ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXReader.h
index 837b8d9761..2f78cdc135 100644
--- a/ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXReader.h
+++ b/ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXReader.h
@@ -41,7 +41,7 @@ public:
//TempFolder
CString m_sTempFolder;
- OOXReader( RtfDocument& oDocument, CString path );
+ OOXReader( RtfDocument& oDocument, std::wstring path );
bool Parse();
private:
void ParseColorTable( RtfDocument& oDocument );
diff --git a/ASCOfficeRtfFile/RtfFormatLib/source/RtfLex.h b/ASCOfficeRtfFile/RtfFormatLib/source/RtfLex.h
index d3b7afbd8a..b8ab74945e 100644
--- a/ASCOfficeRtfFile/RtfFormatLib/source/RtfLex.h
+++ b/ASCOfficeRtfFile/RtfFormatLib/source/RtfLex.h
@@ -33,13 +33,13 @@ public:
m_nSizeAbs = 0;
m_nPosAbs = -1;
}
- void SetSource( CString sPath )
+ void SetSource( std::wstring sPath )
{
Clear();
CFile srcFile;
- if (srcFile.OpenFile(sPath) != S_OK) return;
+ if (srcFile.OpenFile(sPath.c_str()) != S_OK) return;
__int64 totalFileSize = srcFile.GetFileSize();
@@ -136,7 +136,7 @@ public:
{
return 1.0 * m_oStream.getCurPosition() / m_oStream.getSize();
}
- void SetSource( CString sPath )
+ void SetSource( std::wstring sPath )
{
m_oStream.SetSource( sPath);
}
diff --git a/ASCOfficeRtfFile/RtfFormatLib/source/RtfReader.cpp b/ASCOfficeRtfFile/RtfFormatLib/source/RtfReader.cpp
index 3deed26c71..98228945e6 100644
--- a/ASCOfficeRtfFile/RtfFormatLib/source/RtfReader.cpp
+++ b/ASCOfficeRtfFile/RtfFormatLib/source/RtfReader.cpp
@@ -3,7 +3,7 @@
#include "DestinationCommand.h"
-RtfReader::RtfReader(RtfDocument& oDocument, CString sFilename ):m_oDocument(oDocument),m_sFilename(sFilename)
+RtfReader::RtfReader(RtfDocument& oDocument, std::wstring sFilename ):m_oDocument(oDocument),m_sFilename(sFilename)
{
m_oState = ReaderStatePtr(new ReaderState());
m_nFootnote = PROP_DEF;
diff --git a/ASCOfficeRtfFile/RtfFormatLib/source/RtfReader.h b/ASCOfficeRtfFile/RtfFormatLib/source/RtfReader.h
index 79c4e8191d..d574a3eb57 100644
--- a/ASCOfficeRtfFile/RtfFormatLib/source/RtfReader.h
+++ b/ASCOfficeRtfFile/RtfFormatLib/source/RtfReader.h
@@ -46,7 +46,7 @@ public:
int m_nDefFont;
CString m_sTempFolder;
- RtfReader(RtfDocument& oDocument, CString sFilename );
+ RtfReader(RtfDocument& oDocument, std::wstring sFilename );
~RtfReader()
{
}
@@ -63,7 +63,7 @@ public:
}
private:
RtfDocument& m_oDocument;
- CString m_sFilename;
+ std::wstring m_sFilename;
};
class RtfAbstractReader
diff --git a/ASCOfficeRtfFile/RtfFormatLib/source/RtfWriter.cpp b/ASCOfficeRtfFile/RtfFormatLib/source/RtfWriter.cpp
index 619a360506..28a73e3e5f 100644
--- a/ASCOfficeRtfFile/RtfFormatLib/source/RtfWriter.cpp
+++ b/ASCOfficeRtfFile/RtfFormatLib/source/RtfWriter.cpp
@@ -166,7 +166,7 @@ bool RtfWriter::SaveByItemEnd()
//формируем выходной файл
try
{
- NFileWriter::CBufferedFileWriter oTargetFileWriter( m_sFilename );
+ NFileWriter::CBufferedFileWriter oTargetFileWriter(m_sFilename );
//пишем заголовок потом все содежимое
sRtf = CreateRtfStart();
diff --git a/ASCOfficeRtfFile/RtfFormatLib/source/RtfWriter.h b/ASCOfficeRtfFile/RtfFormatLib/source/RtfWriter.h
index b45f6c8a31..d3f3c0fbdf 100644
--- a/ASCOfficeRtfFile/RtfFormatLib/source/RtfWriter.h
+++ b/ASCOfficeRtfFile/RtfFormatLib/source/RtfWriter.h
@@ -15,10 +15,10 @@ public:
std::vector m_aTempFiles;
std::vector m_aTempFilesSectPr;
- RtfWriter( RtfDocument& oDocument , CString sFilename, CString sFolder ):m_oDocument(oDocument)
+ RtfWriter( RtfDocument& oDocument , std::wstring sFilename, std::wstring sFolder ):m_oDocument(oDocument)
{
- m_sFilename = sFilename;
- m_sTempFolder = sFolder;
+ m_sFilename = std_string2string(sFilename);
+ m_sTempFolder = std_string2string(sFolder);
m_bFirst = true;
m_oCurTempFileWriter = NULL;
m_oCurTempFileSectWriter = NULL;
diff --git a/ASCOfficeRtfFile/RtfFormatLib/source/Writer/OOXWriter.cpp b/ASCOfficeRtfFile/RtfFormatLib/source/Writer/OOXWriter.cpp
index fa59b8fa86..84834adee1 100644
--- a/ASCOfficeRtfFile/RtfFormatLib/source/Writer/OOXWriter.cpp
+++ b/ASCOfficeRtfFile/RtfFormatLib/source/Writer/OOXWriter.cpp
@@ -15,9 +15,9 @@
#include "../../../../ASCOfficeDocxFile2/BinReader/DefaultThemeWriter.h"
-OOXWriter::OOXWriter( RtfDocument& oDocument, CString sPath ) :
+OOXWriter::OOXWriter( RtfDocument& oDocument, std::wstring sPath ) :
m_oDocument(oDocument),
- m_sTargetFolder(sPath),
+ m_sTargetFolder(sPath.c_str()),
m_oRels( _T(""), oDocument ),
m_oDocRels( _T("document.xml"), oDocument )
{
diff --git a/ASCOfficeRtfFile/RtfFormatLib/source/Writer/OOXWriter.h b/ASCOfficeRtfFile/RtfFormatLib/source/Writer/OOXWriter.h
index e38c3d4efd..9a8d67155b 100644
--- a/ASCOfficeRtfFile/RtfFormatLib/source/Writer/OOXWriter.h
+++ b/ASCOfficeRtfFile/RtfFormatLib/source/Writer/OOXWriter.h
@@ -31,11 +31,11 @@ public:
//TempFolder
CString m_sTempFolder;
-
CString m_sTargetFolder;
+
std::map m_aBookmarksId;
- OOXWriter( RtfDocument& oDocument, CString sPath );
+ OOXWriter( RtfDocument& oDocument, std::wstring sPath );
~OOXWriter();
bool Save();
diff --git a/ASCOfficeTxtFile/TxtXmlFormatLib/Win32/TxtXmlFormatLib.vcproj b/ASCOfficeTxtFile/TxtXmlFormatLib/Win32/TxtXmlFormatLib.vcproj
index 216d1770b0..beaee56d5d 100644
--- a/ASCOfficeTxtFile/TxtXmlFormatLib/Win32/TxtXmlFormatLib.vcproj
+++ b/ASCOfficeTxtFile/TxtXmlFormatLib/Win32/TxtXmlFormatLib.vcproj
@@ -82,12 +82,11 @@
/>
+
+
+
-
-
diff --git a/ASCOfficeUtils/ASCOfficeUtils/ZipUtilsCP.cpp b/ASCOfficeUtils/ASCOfficeUtils/ZipUtilsCP.cpp
index b4e67cc230..fa428b73fa 100644
--- a/ASCOfficeUtils/ASCOfficeUtils/ZipUtilsCP.cpp
+++ b/ASCOfficeUtils/ASCOfficeUtils/ZipUtilsCP.cpp
@@ -438,12 +438,17 @@ namespace ZLibZipUtils
{
if (current_file_is_find(unzip_file_handle, filePathInZip) == true)
{
- unz_file_info file_info;
- unzGetCurrentFileInfo(unzip_file_handle, &file_info, NULL, 0, NULL, 0, NULL, 0);
- nFileSize = file_info.uncompressed_size;
- (*fileInBytes) = new BYTE[nFileSize];
- get_file(unzip_file_handle, (*fileInBytes), nFileSize);
- return true;
+ unz_file_info file_info;
+ unzGetCurrentFileInfo(unzip_file_handle, &file_info, NULL, 0, NULL, 0, NULL, 0);
+
+ if (nFileSize > 0)
+ nFileSize = (std::min)(nFileSize, file_info.uncompressed_size);
+ else
+ nFileSize = file_info.uncompressed_size;
+
+ (*fileInBytes) = new BYTE[nFileSize];
+ get_file(unzip_file_handle, (*fileInBytes), nFileSize);
+ return true;
}
// else just skip the erroneous file
} while (UNZ_OK == unzGoToNextFile(unzip_file_handle));
diff --git a/Common/DocxFormat/Projects/DocxFormat2005.vcproj b/Common/DocxFormat/Projects/DocxFormat2005.vcproj
index 9a48e6827a..e4ee4c3618 100644
--- a/Common/DocxFormat/Projects/DocxFormat2005.vcproj
+++ b/Common/DocxFormat/Projects/DocxFormat2005.vcproj
@@ -511,7 +511,7 @@
>
+
+#include "OfficeFileFormats.h"
+
+namespace POLE
+{
+ class Storage;
+}
+class COfficeFileFormatChecker
+{
+public:
+ int nFileType;
+
+ COfficeFileFormatChecker()
+ {
+ nFileType = AVS_OFFICESTUDIO_FILE_UNKNOWN;
+ }
+ COfficeFileFormatChecker(std::wstring sFileName)
+ {
+ nFileType = AVS_OFFICESTUDIO_FILE_UNKNOWN;
+
+ isOfficeFile(sFileName);
+ }
+
+ bool isOfficeFile(const std::wstring & fileName);
+
+ std::wstring GetFormatExtension(const std::wstring & fileName);
+ std::wstring GetExtensionByType(int type);
+
+private:
+
+ bool isOOXFormatFile (const std::wstring & fileName);
+ bool isOpenOfficeFormatFile (const std::wstring & fileName);
+ bool isOnlyOfficeFormatFile (const std::wstring & fileName);
+
+ bool isDocFormatFile (POLE::Storage *storage);
+ bool isXlsFormatFile (POLE::Storage *storage);
+ bool isPptFormatFile (POLE::Storage *storage);
+
+ bool isRtfFormatFile (unsigned char* pBuffer,int dwBytes);
+ bool isHtmlFormatFile (unsigned char* pBuffer,int dwBytes);
+ bool isPdfFormatFile (unsigned char* pBuffer,int dwBytes);
+
+ bool isBinaryDoctFormatFile (unsigned char* pBuffer,int dwBytes);
+ bool isBinaryXlstFormatFile (unsigned char* pBuffer,int dwBytes);
+ bool isBinaryPpttFormatFile (unsigned char* pBuffer,int dwBytes);
+};
diff --git a/Common/OfficeFileFormats.h b/Common/OfficeFileFormats.h
index 4985e4e804..48f9480ad7 100644
--- a/Common/OfficeFileFormats.h
+++ b/Common/OfficeFileFormats.h
@@ -70,3 +70,4 @@
#define AVS_OFFICESTUDIO_FILE_CANVAS_WORD AVS_OFFICESTUDIO_FILE_CANVAS + 0x0001
#define AVS_OFFICESTUDIO_FILE_CANVAS_SPREADSHEET AVS_OFFICESTUDIO_FILE_CANVAS + 0x0002
#define AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION AVS_OFFICESTUDIO_FILE_CANVAS + 0x0003
+#define AVS_OFFICESTUDIO_FILE_CANVAS_PDF AVS_OFFICESTUDIO_FILE_CANVAS + 0x0004