diff --git a/ASCOfficeDocFile/DocFormatTest/DocFormatTest.cpp b/ASCOfficeDocFile/DocFormatTest/DocFormatTest.cpp new file mode 100644 index 0000000000..152997c72b --- /dev/null +++ b/ASCOfficeDocFile/DocFormatTest/DocFormatTest.cpp @@ -0,0 +1,30 @@ +// DocFormatTest.cpp : Defines the entry point for the console application. +// +#include "../../../../ASCOfficeDocFile/DocFormatLib/DocFormatLib.h" + +#include "../../../../ASCOfficeDocFile/win32/ASCOfficeCriticalSection.h" + +#include +#include + +int _tmain(int argc, _TCHAR* argv[]) +{ + std::wstring sSrcDoc = _T("d:\\test\\_doc\\PZ.doc"); + std::wstring sResBackDocx = _T("d:\\test\\_doc\\PZ.doc-my.docx"); + + std::wstring sTemp = _T("d:\\home/lena/Documents/temp"); + + std::wstring sXMLOptions = _T(""); + + // doc->docx + COfficeDocFile docFile; + docFile.put_TempDirectory(sTemp); + + HRESULT hRes = docFile.LoadFromFile( sSrcDoc, sResBackDocx, NULL); + + if (hRes != S_OK)return 2; + + + return 0; +} + diff --git a/ASCOfficeDocFile/DocFormatTest/DocFormatTest.vcproj b/ASCOfficeDocFile/DocFormatTest/DocFormatTest.vcproj new file mode 100644 index 0000000000..a3b2396a9f --- /dev/null +++ b/ASCOfficeDocFile/DocFormatTest/DocFormatTest.vcproj @@ -0,0 +1,384 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ASCOfficeDocFile/Tests/DocFileTest/DocFileTest.csproj b/ASCOfficeDocFile/Tests/DocFileTest/DocFileTest.csproj deleted file mode 100644 index f70ce18eb2..0000000000 --- a/ASCOfficeDocFile/Tests/DocFileTest/DocFileTest.csproj +++ /dev/null @@ -1,92 +0,0 @@ - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {A18419D0-589A-4D6F-932D-A5F2DC0C3DF5} - WinExe - Properties - DocFileTest - DocFileTest - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - false - - - pdbonly - false - bin\Release\ - TRACE - prompt - 4 - true - false - - - - - - - - - - - - Form - - - MainForm.cs - - - - - Designer - MainForm.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - {35C0955D-A67D-4517-B670-5826ED38343D} - 1 - 0 - 0 - tlbimp - False - - - - - \ No newline at end of file diff --git a/ASCOfficeDocFile/Tests/DocFileTest/DocFileTest.csproj.user b/ASCOfficeDocFile/Tests/DocFileTest/DocFileTest.csproj.user deleted file mode 100644 index f1237bf90c..0000000000 --- a/ASCOfficeDocFile/Tests/DocFileTest/DocFileTest.csproj.user +++ /dev/null @@ -1,8 +0,0 @@ - - - true - - - true - - \ No newline at end of file diff --git a/ASCOfficeDocFile/Tests/DocFileTest/DocFileTest_VS2012.csproj b/ASCOfficeDocFile/Tests/DocFileTest/DocFileTest_VS2012.csproj deleted file mode 100644 index e42e4372a5..0000000000 --- a/ASCOfficeDocFile/Tests/DocFileTest/DocFileTest_VS2012.csproj +++ /dev/null @@ -1,138 +0,0 @@ - - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {A18419D0-589A-4D6F-932D-A5F2DC0C3DF5} - WinExe - Properties - DocFileTest - DocFileTest - v4.5 - - - - - 2.0 - - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - false - false - Off - false - - - pdbonly - false - bin\Release\ - TRACE - prompt - 4 - true - false - false - - - - - - - - - - - - - - Form - - - MainForm.cs - - - - - Designer - MainForm.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - {35C0955D-A67D-4517-B670-5826ED38343D} - 1 - 0 - 0 - tlbimp - False - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - - - - - - \ No newline at end of file diff --git a/ASCOfficeDocFile/Tests/DocFileTest/MainForm.Designer.cs b/ASCOfficeDocFile/Tests/DocFileTest/MainForm.Designer.cs deleted file mode 100644 index 00bebfa5f8..0000000000 --- a/ASCOfficeDocFile/Tests/DocFileTest/MainForm.Designer.cs +++ /dev/null @@ -1,73 +0,0 @@ -namespace DocFileTest -{ - partial class MainForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.button1 = new System.Windows.Forms.Button(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.SuspendLayout(); - // - // button1 - // - this.button1.Location = new System.Drawing.Point(556, 10); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); - this.button1.TabIndex = 0; - this.button1.Text = "Convert"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(13, 13); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(537, 20); - this.textBox1.TabIndex = 1; - // - // MainForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(643, 51); - this.Controls.Add(this.textBox1); - this.Controls.Add(this.button1); - this.Name = "MainForm"; - this.Text = "DocFile"; - this.Load += new System.EventHandler(this.MainForm_Load); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Button button1; - private System.Windows.Forms.TextBox textBox1; - } -} - diff --git a/ASCOfficeDocFile/Tests/DocFileTest/MainForm.cs b/ASCOfficeDocFile/Tests/DocFileTest/MainForm.cs deleted file mode 100644 index 94baba11c6..0000000000 --- a/ASCOfficeDocFile/Tests/DocFileTest/MainForm.cs +++ /dev/null @@ -1,131 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Text; -using System.Windows.Forms; -using System.IO; -using System.IO.Compression; -using System.Runtime.InteropServices; - -using ASCDocFile; - -namespace DocFileTest -{ - public partial class MainForm : Form - { - public const int ERROR_FIRST = (1 << 31) | (4 << 16) | 0x0300; - public const int ERROR_UNEXPECTED = ERROR_FIRST + 0x0000; - public const int ERROR_BUSY = ERROR_FIRST + 0x0001; - public const int ERROR_MEMORY = ERROR_FIRST + 0x0002; - public const int ERROR_FILEACCESS = ERROR_FIRST + 0x0003; - public const int ERROR_FILEFORMAT = ERROR_FIRST + 0x0004; - public const int ERROR_PASSWORD = ERROR_FIRST + 0x0005; - public const int ERROR_DRM = ERROR_FIRST + 0x0006; - - public const bool DOC_TO_DOCX = true; - public const string DOC_FILE_NAME = "test"; - - public MainForm() - { - InitializeComponent(); - } - - private void button1_Click(object sender, EventArgs e) - { - string filePath = this.textBox1.Text; - if (0 == filePath.Length) - { - filePath = Path.GetDirectoryName(Application.ExecutablePath) + "\\" + DOC_FILE_NAME; - } - - string docFile = Path.GetDirectoryName(filePath) + "\\" + DOC_FILE_NAME + ".doc"; - string docxFilePath = Path.GetDirectoryName(filePath) + "\\" + DOC_FILE_NAME; - string docxFile = Path.GetDirectoryName(filePath) + "\\" + DOC_FILE_NAME + ".docx"; - - if (File.Exists(docFile)) - { - if (Directory.Exists(docxFilePath)) - { - Directory.Delete(docxFilePath, true); - } - - Directory.CreateDirectory(docxFilePath); - - COfficeDocFile oFile = new COfficeDocFile(); - if (null != oFile) - { - if (DOC_TO_DOCX) - { - if (File.Exists(docxFile)) - { - File.Delete(docxFile); - } - - try - { - oFile.LoadFromFile(docFile, docxFilePath, ""); - } - catch (COMException ex) - { - if (ERROR_BUSY == ex.ErrorCode) - { - MessageBox.Show("ERROR_BUSY - Source File: " + docFile, "DocTest (doc to docx)", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - else if (ERROR_MEMORY == ex.ErrorCode) - { - MessageBox.Show("ERROR_BUSY - Source File: " + docFile, "DocTest (doc to docx)", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - else if (ERROR_FILEACCESS == ex.ErrorCode) - { - MessageBox.Show("ERROR_FILEACCESS - Source File: " + docFile, "DocTest (doc to docx)", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - else if (ERROR_FILEFORMAT == ex.ErrorCode) - { - MessageBox.Show("ERROR_FILEFORMAT - Source File: " + docFile, "DocTest (doc to docx)", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - else if (ERROR_PASSWORD == ex.ErrorCode) - { - MessageBox.Show("ERROR_PASSWORD - Source File: " + docFile, "DocTest (doc to docx)", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - else if (ERROR_DRM == ex.ErrorCode) - { - MessageBox.Show("ERROR_DRM - Source File: " + docFile, "DocTest (doc to docx)", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - - Directory.Delete(docxFilePath, true); - Close(); - } - - using (var fs = new FileStream(docxFile, FileMode.Create)) - { - using (var zip = new ZipArchive(fs, ZipArchiveMode.Create)) - { - string[] fileEntries = Directory.GetFiles(docxFilePath, "*.*", SearchOption.AllDirectories); - foreach (string fileName in fileEntries) - { - string fileRelative = fileName.Replace(docxFilePath + "\\", ""); - zip.CreateEntryFromFile(fileName, fileRelative); - } - } - } - - Directory.Delete(docxFilePath, true); - } - else - { - // oFile.SaveToFile(docFile, docxFile, ""); // docx to doc - } - } - } - - Close(); - } - - private void MainForm_Load(object sender, EventArgs e) - { - button1_Click(null, null); - } - } -} \ No newline at end of file diff --git a/ASCOfficeDocFile/Tests/DocFileTest/MainForm.resx b/ASCOfficeDocFile/Tests/DocFileTest/MainForm.resx deleted file mode 100644 index ff31a6db56..0000000000 --- a/ASCOfficeDocFile/Tests/DocFileTest/MainForm.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/ASCOfficeDocFile/Tests/DocFileTest/Program.cs b/ASCOfficeDocFile/Tests/DocFileTest/Program.cs deleted file mode 100644 index 83332106fa..0000000000 --- a/ASCOfficeDocFile/Tests/DocFileTest/Program.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Windows.Forms; - -namespace DocFileTest -{ - static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main() - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new MainForm()); - } - } -} \ No newline at end of file diff --git a/ASCOfficeDocFile/Tests/DocFileTest/Properties/AssemblyInfo.cs b/ASCOfficeDocFile/Tests/DocFileTest/Properties/AssemblyInfo.cs deleted file mode 100644 index 2fb14908ec..0000000000 --- a/ASCOfficeDocFile/Tests/DocFileTest/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("DocFileTest")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Ascensio System SIA")] -[assembly: AssemblyProduct("DocFileTest")] -[assembly: AssemblyCopyright("Ascensio System SIA Copyright (c) 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("1375d084-8f70-4e23-be9d-8a594d59103f")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ASCOfficeDocFile/Tests/DocFileTest/Properties/Resources.Designer.cs b/ASCOfficeDocFile/Tests/DocFileTest/Properties/Resources.Designer.cs deleted file mode 100644 index 9a620d7ca5..0000000000 --- a/ASCOfficeDocFile/Tests/DocFileTest/Properties/Resources.Designer.cs +++ /dev/null @@ -1,63 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.18063 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace DocFileTest.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DocFileTest.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - } -} diff --git a/ASCOfficeDocFile/Tests/DocFileTest/Properties/Resources.resx b/ASCOfficeDocFile/Tests/DocFileTest/Properties/Resources.resx deleted file mode 100644 index ffecec851a..0000000000 --- a/ASCOfficeDocFile/Tests/DocFileTest/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/ASCOfficeDocFile/Tests/DocFileTest/Properties/Settings.Designer.cs b/ASCOfficeDocFile/Tests/DocFileTest/Properties/Settings.Designer.cs deleted file mode 100644 index f1a216af2a..0000000000 --- a/ASCOfficeDocFile/Tests/DocFileTest/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.18063 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace DocFileTest.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/ASCOfficeDocFile/Tests/DocFileTest/Properties/Settings.settings b/ASCOfficeDocFile/Tests/DocFileTest/Properties/Settings.settings deleted file mode 100644 index abf36c5d3d..0000000000 --- a/ASCOfficeDocFile/Tests/DocFileTest/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ASCOfficeDocFile/Tests/DocFileTest/app.config b/ASCOfficeDocFile/Tests/DocFileTest/app.config deleted file mode 100644 index b7a7ef1660..0000000000 --- a/ASCOfficeDocFile/Tests/DocFileTest/app.config +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/DocFileTest.exe b/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/DocFileTest.exe deleted file mode 100644 index 766f3cad2b..0000000000 Binary files a/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/DocFileTest.exe and /dev/null differ diff --git a/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/DocFileTest.exe.config b/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/DocFileTest.exe.config deleted file mode 100644 index b7a7ef1660..0000000000 --- a/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/DocFileTest.exe.config +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/DocFileTest.pdb b/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/DocFileTest.pdb deleted file mode 100644 index ffd0577b6e..0000000000 Binary files a/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/DocFileTest.pdb and /dev/null differ diff --git a/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/Interop.ASCDocFile.dll b/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/Interop.ASCDocFile.dll deleted file mode 100644 index ac5c61c854..0000000000 Binary files a/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/Interop.ASCDocFile.dll and /dev/null differ diff --git a/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/TestFile.docx b/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/TestFile.docx deleted file mode 100644 index 277e9eb79e..0000000000 Binary files a/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/TestFile.docx and /dev/null differ diff --git a/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/test.doc b/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/test.doc deleted file mode 100644 index 44eef20925..0000000000 Binary files a/ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/test.doc and /dev/null differ diff --git a/ASCOfficeDocFile/Win32/OfficeDocFile_VS2005.sln b/ASCOfficeDocFile/Win32/OfficeDocFile_VS2005.sln index 0edd7db256..174536479b 100644 --- a/ASCOfficeDocFile/Win32/OfficeDocFile_VS2005.sln +++ b/ASCOfficeDocFile/Win32/OfficeDocFile_VS2005.sln @@ -8,14 +8,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeDocFile", "ASCOffi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocFormatLib", "..\DocFormatLib\Win32\DocFormatLib.vcproj", "{C5371405-338F-4B70-83BD-2A5CDF64F383}" ProjectSection(ProjectDependencies) = postProject + {F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363} + {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} {A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0} {21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0} - {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} - {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} EndProjectSection 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}" ProjectSection(ProjectDependencies) = postProject {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} @@ -25,13 +23,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agg2d", "..\..\DesktopEdito 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}") = "DocFormatTest", "..\..\Test\Applications\DocxFormatTests\DocFormatTest\win32\DocFormatTest.vcproj", "{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\..\Common\DocxFormat\Projects\DocxFormat2005.vcproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocFormatTest", "..\DocFormatTest\DocFormatTest.vcproj", "{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}" ProjectSection(ProjectDependencies) = postProject + {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} + {A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0} + {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} + {21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0} + {F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363} {C5371405-338F-4B70-83BD-2A5CDF64F383} = {C5371405-338F-4B70-83BD-2A5CDF64F383} - {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\..\Common\DocxFormat\Projects\DocxFormat2005.vcproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeUtilsLib", "..\..\OfficeUtils\win32\OfficeUtilsLib.vcproj", "{F8274B05-168E-4D6E-B843-AA7510725363}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -73,20 +77,6 @@ Global {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 @@ -129,20 +119,6 @@ Global {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 - {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 @@ -157,6 +133,34 @@ Global {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 + {0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Any CPU.ActiveCfg = Debug|x64 + {0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Mixed Platforms.Build.0 = Debug|x64 + {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|x64 + {0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Release|Mixed Platforms.Build.0 = Release|x64 + {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 + {F8274B05-168E-4D6E-B843-AA7510725363}.Debug|Any CPU.ActiveCfg = Debug|x64 + {F8274B05-168E-4D6E-B843-AA7510725363}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {F8274B05-168E-4D6E-B843-AA7510725363}.Debug|Mixed Platforms.Build.0 = Debug|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|Any CPU.ActiveCfg = Release|x64 + {F8274B05-168E-4D6E-B843-AA7510725363}.Release|Mixed Platforms.ActiveCfg = Release|x64 + {F8274B05-168E-4D6E-B843-AA7510725363}.Release|Mixed Platforms.Build.0 = Release|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