(1.0.0.125) текст частично терялся для документов у которых символы записаны в разрывных блоках

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@56771 954022d7-b5bf-4e40-9824-e11837661b57

.gitattributes

@@ -177,6 +177,7 @@ ASCOfficeDocFile/DocDocxConverter/DocumentProperties.h svn_mime_002dtype=applica
 ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/DocFileTest.exe svn_mime_002dtype=application%2Foctet-stream
 ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/Interop.ASCDocFile.dll svn_mime_002dtype=application%2Foctet-stream
 ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/TestFile.docx svn_mime_002dtype=application%2Foctet-stream
+ASCOfficeDocFile/Tests/DocFileTest/bin/Debug/test.doc svn_mime_002dtype=application%2Foctet-stream
 ASCOfficeEWSEditor/ASCOfficeEWSEditor/Editor/Charts svnc_bugtraq_003anumber=true
 ASCOfficeFB2File/ASCOfficeFB2File/Resource/DocxTemplate.docx svn_mime_002dtype=application%2Foctet-stream
 ASCOfficeFB2File/ASCOfficeFB2FileTest/ASCOfficeFB2FileTest/bin/Release/AVSOfficeFB2FileTest.exe svn_mime_002dtype=application%2Foctet-stream

ASCOfficeDocFile/ASCOfficeDocFile/ASCDocFile.cpp

@@ -8,33 +8,34 @@
 
 ASCOfficeCriticalSection  g_oCriticalSection;
 
-STDMETHODIMP COfficeDocFile::LoadFromFile (BSTR sSrcFileName, BSTR sDstPath, BSTR sXMLOptions)
+STDMETHODIMP COfficeDocFile::LoadFromFile(BSTR bsDocFile, BSTR bsDocxFilePath, BSTR bsXMLOptions) 
 {
-	HRESULT hr					=	AVS_ERROR_UNEXPECTED;
-
-	wstring fullFileNameStr (sSrcFileName);
-
-	wstring::size_type lastCh	=	fullFileNameStr.find_last_of( _T( '\\' ) );
-	wstring::size_type lastDot	=	fullFileNameStr.find_last_of( _T( '.' ) );
-
-	wstring FileNameStr( ( fullFileNameStr.begin() + lastCh ), ( fullFileNameStr.begin() + lastDot ) );
-	FileNameStr += wstring( _T( ".docx" ) );
-	wstring outPutFile = wstring( sDstPath ) + FileNameStr;
-
 #ifdef _DEBUG
 	//_CrtDumpMemoryLeaks();
 	//_CrtSetBreakAlloc(11001);
-#endif 
+#endif 	
+	
+	HRESULT hr = AVS_ERROR_UNEXPECTED;
+
+	std::wstring strDocFile(bsDocFile);
+	std::wstring strDocxPath(bsDocxFilePath);
+
+	std::wstring::size_type lastCh	= strDocFile.find_last_of(_T('\\'));
+	std::wstring::size_type lastDot	= strDocFile.find_last_of(_T('.'));
 
-	ProgressCallback			ffCallBack;
+	std::wstring strFileName((strDocFile.begin() + lastCh), (strDocFile.begin() + lastDot));
+	strFileName += std::wstring(_T(".docx"));
+	std::wstring docxFile = strDocxPath + strFileName;
+
+	ProgressCallback ffCallBack;
 
-	ffCallBack.OnProgress		=	OnProgressFunc;
-	ffCallBack.OnProgressEx		=	OnProgressExFunc;
-	ffCallBack.caller			=	this;
+	ffCallBack.OnProgress	= OnProgressFunc;
+	ffCallBack.OnProgressEx	= OnProgressExFunc;
+	ffCallBack.caller		= this;
 
 	DocFileFormat::Converter docToDocx;
 
-	hr							=	docToDocx.LoadAndConvert(sSrcFileName, outPutFile.c_str(), &ffCallBack);
+	hr						=	docToDocx.LoadAndConvert(bsDocFile, docxFile.c_str(), &ffCallBack);
 
 #ifdef _DEBUG
 	//_CrtDumpMemoryLeaks();

ASCOfficeDocFile/ASCOfficeDocFile/ASCDocFile.h

@@ -57,7 +57,7 @@ public:
 	// OfficeFileTemplate Methods
 public:
 
-	STDMETHOD(LoadFromFile)(BSTR sSrcFileName, BSTR sDstPath, BSTR sXMLOptions);
+	STDMETHOD(LoadFromFile)(BSTR bsDocFile, BSTR bsDocxFilePath, BSTR bsXMLOptions);
 	STDMETHOD(SaveToFile)(BSTR sDstFileName, BSTR sSrcPath, BSTR sXMLOptions);
 
 protected:

ASCOfficeDocFile/ASCOfficeDocFile/stdafx.h

-// 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
@@ -15,7 +11,7 @@
 #endif
 
 #ifndef _WIN32_WINNT		// Allow use of features specific to Windows NT 4 or later.
-#define _WIN32_WINNT 0x0400	// Change this to the appropriate value to target Windows 2000 or later.
+#define _WIN32_WINNT 0x0400	// 0x0501 // VS_2012// 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.

ASCOfficeDocFile/ASCOfficeDocFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //0
-//124
-#define INTVER 1,0,0,124
-#define STRVER "1,0,0,124\0"
+//125
+#define INTVER 1,0,0,125
+#define STRVER "1,0,0,125\0"

ASCOfficeDocFile/DocDocxConverter/Converter.cpp

@@ -163,7 +163,7 @@ namespace DocFileFormat
 
 		long result = AVS_ERROR_UNEXPECTED;
 
-		//	       
+		// NOTE: debug mode - disable exceptions
 
 #ifdef DEBUG
 		

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.cpp

@@ -22,12 +22,12 @@ namespace DocFileFormat
 {
 	void OpenXmlPackage::GetOutputDir()
 	{
-		wstring::size_type pos = this->_fileName.find_last_of( _T( "\\" ) );
-		this->_outputDir = std::wstring( pos, NULL );
-		copy( this->_fileName.begin(), ( this->_fileName.begin() + pos ), this->_outputDir.begin() );
+		wstring::size_type pos = m_strFileName.find_last_of( _T( "\\" ) );
+		m_strOutputPath = std::wstring( pos, NULL );
+		copy(m_strFileName.begin(), (m_strFileName.begin() + pos ),m_strOutputPath.begin() );
 	}
 
-	OpenXmlPackage::OpenXmlPackage( const WordDocument* _docFile ):	_fileName( _T( "" ) ), _outputDir( _T( "" ) ), relID(1), _imageCounter(0), _headerCounter(0), _footerCounter(0),
+	OpenXmlPackage::OpenXmlPackage(const WordDocument* _docFile) : m_strFileName(_T("")), m_strOutputPath(_T("")), relID(1), _imageCounter(0), _headerCounter(0), _footerCounter(0),
 		_oleCounter(0), docFile(NULL), DocumentRelationshipsFile( _T( "word/_rels/document.xml.rels" ) ), MainRelationshipsFile( _T( "_rels/.rels" ) ),
 		FootnotesRelationshipsFile( _T( "word/_rels/footnotes.xml.rels" ) ), EndnotesRelationshipsFile( _T( "word/_rels/endnotes.xml.rels" ) ),
 		CommentsRelationshipsFile( _T( "word/_rels/comments.xml.rels" ) ), NumberingRelationshipsFile( _T( "word/_rels/numbering.xml.rels" ) )
@@ -53,7 +53,7 @@ namespace DocFileFormat
 	{
 #ifdef CREATE_UNZIPPED_XMLS
 
-		CreateDirectory( ( this->_outputDir + std::wstring( _T( "\\_rels" ) ) ).c_str(), NULL );
+		CreateDirectory( (m_strOutputPath + std::wstring( _T( "\\_rels" ) ) ).c_str(), NULL );
 
 #endif //CREATE_UNZIPPED_XMLS
 
@@ -61,7 +61,7 @@ namespace DocFileFormat
 
 #ifdef CREATE_UNZIPPED_XMLS
 
-		CreateDirectory( ( this->_outputDir + std::wstring( _T( "\\word\\_rels" ) ) ).c_str(), NULL );
+		CreateDirectory( (m_strOutputPath + std::wstring( _T( "\\word\\_rels" ) ) ).c_str(), NULL );
 
 #endif //CREATE_UNZIPPED_XMLS
 
@@ -428,11 +428,11 @@ namespace DocFileFormat
 
 #ifdef CREATE_ZIPPED_DOCX
 
-			SaveToFile( this->_outputDir, relationshipsFile.FileName, zf, std::wstring( writer.GetXmlString() ) );
+			SaveToFile(m_strOutputPath, relationshipsFile.FileName, zf, std::wstring( writer.GetXmlString() ) );
 
 #else
 
-			SaveToFile( this->_outputDir, relationshipsFile.FileName, std::wstring( writer.GetXmlString() ) );
+			SaveToFile(m_strOutputPath, relationshipsFile.FileName, std::wstring( writer.GetXmlString() ) );
 
 #endif // CREATE_ZIPPED_DOCX
 		}
@@ -471,11 +471,11 @@ namespace DocFileFormat
 
 #ifdef CREATE_ZIPPED_DOCX
 
-		SaveToFile( this->_outputDir, std::wstring( _T( "[Content_Types].xml" ) ), zf, std::wstring( writer.GetXmlString() ) );
+		SaveToFile(m_strOutputPath, std::wstring( _T( "[Content_Types].xml" ) ), zf, std::wstring( writer.GetXmlString() ) );
 
 #else
 
-		SaveToFile( this->_outputDir, std::wstring( _T( "[Content_Types].xml" ) ), std::wstring( writer.GetXmlString() ) );
+		SaveToFile(m_strOutputPath, std::wstring( _T( "[Content_Types].xml" ) ), std::wstring( writer.GetXmlString() ) );
 
 #endif // CREATE_ZIPPED_DOCX
 	}

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.h

@@ -128,8 +128,9 @@ namespace DocFileFormat
 		int AddPart( const IMapping* mapping, const wstring& packageDir, const wstring& fileName, const wstring& contentType = _T( "" ), const wstring& relationshipType = _T( "" ), const wstring& targetMode = _T( "" ) );
 
 	protected:	  
-		wstring _outputDir;
-		wstring _fileName;
+
+		std::wstring m_strOutputPath;
+		std::wstring m_strFileName;
 
 		OpenXmlPackage( const WordDocument* _docFile );
 

ASCOfficeDocFile/DocDocxConverter/PieceTable.cpp

@@ -128,9 +128,9 @@ namespace DocFileFormat
 
 namespace DocFileFormat
 {
-	vector<WCHAR>* PieceTable::GetAllEncodingText(IStream* stream)
+	std::vector<WCHAR>* PieceTable::GetAllEncodingText(IStream* stream)
 	{
-		vector<WCHAR> *piecePairs = new vector<WCHAR>();
+		std::vector<WCHAR> *piecePairs = new std::vector<WCHAR>();
 
 		for ( list<PieceDescriptor>::iterator iter = this->Pieces.begin(); iter != this->Pieces.end(); ++iter)
 		{
@@ -156,7 +156,7 @@ namespace DocFileFormat
 			stream->Seek(nSeekPos, STREAM_SEEK_SET, NULL);
 			stream->Read(bytes, cb, NULL);
 
-			FormatUtils::GetSTLCollectionFromBytes<vector<WCHAR> >(piecePairs, bytes, cb, pcd.encoding);
+			FormatUtils::GetSTLCollectionFromBytes<std::vector<WCHAR> >(piecePairs, bytes, cb, pcd.encoding);
 
 			RELEASEARRAYOBJECTS(bytes);
 		}
@@ -164,9 +164,9 @@ namespace DocFileFormat
 		return piecePairs;
 	}
 
-	vector<WCHAR>* PieceTable::GetEncodingChars (int fcStart, int fcEnd, IStream* wordStream)
+	std::vector<WCHAR>* PieceTable::GetEncodingChars (int fcStart, int fcEnd, IStream* wordStream)
 	{
-		vector<WCHAR> *encodingChars = new vector<WCHAR>();
+		std::vector<WCHAR> *encodingChars = new std::vector<WCHAR>();
 
 		for (list<PieceDescriptor>::iterator iter = Pieces.begin(); iter != Pieces.end(); ++iter)
 		{
@@ -223,7 +223,7 @@ namespace DocFileFormat
 				wordStream->Read( bytes, cb, NULL );
 
 				//get the chars
-				FormatUtils::GetSTLCollectionFromBytes<vector<WCHAR>>( encodingChars, bytes, cb, pcd.encoding );
+				FormatUtils::GetSTLCollectionFromBytes<std::vector<WCHAR>>( encodingChars, bytes, cb, pcd.encoding );
 
 				RELEASEARRAYOBJECTS( bytes );
 			}
@@ -243,13 +243,13 @@ namespace DocFileFormat
 				wordStream->Read( bytes, cb, NULL );
 
 				//get the chars
-				FormatUtils::GetSTLCollectionFromBytes<vector<WCHAR>>( encodingChars, bytes, cb, pcd.encoding );
+				FormatUtils::GetSTLCollectionFromBytes<std::vector<WCHAR>>(encodingChars, bytes, cb, pcd.encoding);
 
-				RELEASEARRAYOBJECTS( bytes );
+				RELEASEARRAYOBJECTS(bytes);
 
 				break;
 			}
-			else if ( ( fcStart >= (int)pcd.fc ) && ( fcEnd <= pcdFcEnd ) )
+			else if ((fcStart >= (int)pcd.fc) && (fcEnd <= pcdFcEnd))
 			{
 				//requested chars are completly in this piece
 				//read from fcStart to fcEnd
@@ -290,23 +290,25 @@ namespace DocFileFormat
 		}
 		return encodingChars;
 	}
-	vector<WCHAR>* PieceTable::GetChars(int fcStart, int fcEnd, int cp, IStream* word)
+	std::vector<WCHAR>* PieceTable::GetChars(int fcStart, int fcEnd, int cp, IStream* word)
 	{
-		vector<WCHAR>* encodingChars = new vector<WCHAR>();
+		std::vector<WCHAR>* encodingChars = new std::vector<WCHAR>();
 
 		//if (fcStart >= fcEnd)
 		//	return encodingChars;
 
-		if (fcStart == 20488 && fcEnd == 20560)
-		{
-			int ccc = 0;
-		}
+#ifdef _DEBUG
+		//if (fcStart == 3296 && fcEnd == 3326)
+		//{
+		//	int ccc = 0;
+		//}
+#endif
 
 		int fcSize = fcEnd - fcStart;
 
 		bool read = true;
 
-		for (list<PieceDescriptor>::iterator iter = m_carriageIter; iter != Pieces.end(); ++iter)
+		for (list<PieceDescriptor>::iterator iter = Pieces.begin(); iter != Pieces.end(); ++iter)
 		{
 			PieceDescriptor pcd = (*iter);
 
@@ -410,6 +412,8 @@ namespace DocFileFormat
 			}
 			else if (fcEnd < (int)pcd.fc)		//	this piece is beyond the requested range
 			{	
+				//ATLTRACE(_T("PieceTable::GetChars() - fcEnd < (int)pcd.fc\n"));
+
 				//      ,    
 
 				//size_t count = encodingChars->size();
@@ -447,7 +451,7 @@ namespace DocFileFormat
 		return encodingChars;
 	}
 
-	inline bool PieceTable::ReadSymbolsBuffer(int pos, int size, Encoding encoding, IStream* word, vector<WCHAR>* encodingChars)
+	inline bool PieceTable::ReadSymbolsBuffer(int pos, int size, Encoding encoding, IStream* word, std::vector<WCHAR>* encodingChars)
 	{
 		byte* bytes = new byte[size];
 		if (NULL == bytes)
@@ -458,7 +462,7 @@ namespace DocFileFormat
 		word->Seek(readPos, STREAM_SEEK_SET, NULL);
 		word->Read(bytes, size, NULL);
 
-		FormatUtils::GetSTLCollectionFromBytes<vector<WCHAR>>(encodingChars, bytes, size, encoding);
+		FormatUtils::GetSTLCollectionFromBytes<std::vector<WCHAR>>(encodingChars, bytes, size, encoding);
 		RELEASEARRAYOBJECTS(bytes);
 
 		return true;

ASCOfficeDocFile/DocDocxConverter/PieceTable.h

@@ -20,24 +20,24 @@ namespace DocFileFormat
 
 	public:
 		~PieceTable();
-		/// Parses the pice table and creates a list of PieceDescriptors.
-		PieceTable( FileInformationBlock *fib, IStream *tableStream );
-		vector<WCHAR>* GetAllEncodingText( IStream *wordStream );
-		vector<WCHAR>* GetEncodingChars( int fcStart, int fcEnd, IStream *wordStream);
-		vector<WCHAR>* GetChars (int fcStart, int fcEnd, int cp, IStream* word);
+		// Parses the pice table and creates a list of PieceDescriptors.
+		PieceTable(FileInformationBlock* fib, IStream* tableStream);
+		std::vector<WCHAR>* GetAllEncodingText(IStream* wordStream);
+		std::vector<WCHAR>* GetEncodingChars(int fcStart, int fcEnd, IStream* wordStream);
+		std::vector<WCHAR>* GetChars (int fcStart, int fcEnd, int cp, IStream* word);
 
 	private:
-		bool ReadSymbolsBuffer(int pos, int size, Encoding encoding, IStream* word, vector<WCHAR>* encodingChars);
+		bool ReadSymbolsBuffer(int pos, int size, Encoding encoding, IStream* word, std::vector<WCHAR>* encodingChars);
 
 	public:
 
-		/// A list of PieceDescriptor standing for each piece of text.
-		list<PieceDescriptor> Pieces;
-		/// A dictionary with character positions as keys and the matching FCs as values
-		map<int, int>* FileCharacterPositions;
-		/// A dictionary with file character positions as keys and the matching CPs as values
-		map<int, int>* CharacterPositions;
+		// A list of PieceDescriptor standing for each piece of text.
+		std::list<PieceDescriptor> Pieces;
+		// A dictionary with character positions as keys and the matching FCs as values
+		std::map<int, int>* FileCharacterPositions;
+		// A dictionary with file character positions as keys and the matching CPs as values
+		std::map<int, int>* CharacterPositions;
 
-		list<PieceDescriptor>::iterator	m_carriageIter;
+		std::list<PieceDescriptor>::iterator	m_carriageIter;
 	};
 }

ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.h

@@ -49,9 +49,8 @@ namespace DocFileFormat
 #endif // CREATE_ZIPPED_DOCX
 
 	public:
-		WordprocessingDocument( const WCHAR* _fileName, const WordDocument* _docFile );
+		WordprocessingDocument(const WCHAR* _fileName, const WordDocument* _docFile);
 		virtual ~WordprocessingDocument();
 		void SaveDocument();
-		void SaveDocument( const WCHAR *file );
 	};
 }
\ No newline at end of file

ASCOfficeDocFile/Tests/DocFileTest/MainForm.cs

@@ -6,6 +6,7 @@ using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
 using System.IO;
+using System.IO.Compression;
 
 using ASCDocFile;
 
@@ -13,6 +14,9 @@ namespace DocFileTest
 {
     public partial class MainForm : Form
     {
+        public const bool DOC_TO_DOCX = true;
+        public const string DOC_FILE_NAME = "test";
+
         public MainForm()
         {
             InitializeComponent();
@@ -22,13 +26,56 @@ namespace DocFileTest
         {
             string filePath = this.textBox1.Text;
             if (0 == filePath.Length)
-                filePath = Path.GetDirectoryName(Application.ExecutablePath) + "\\TestFile";
+            {
+                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);
+                        }
+
+                        oFile.LoadFromFile(docFile, docxFilePath, "");
 
-            string docFile = Path.GetDirectoryName(filePath) + "\\TestFile.doc";
-            string docxFile = Path.GetDirectoryName(filePath) + "\\TestFile";
+                        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);
+                                }
+                            }
+                        }
 
-            COfficeDocFile oFile = new COfficeDocFile();
-            oFile.SaveToFile(docFile, docxFile, "");
+                        Directory.Delete(docxFilePath, true);
+                    }
+                    else
+                    {
+                        // oFile.SaveToFile(docFile, docxFile, ""); // docx to doc
+                    }
+                }
+            }
 
             Close();
         }

ASCOfficeDocFile/Tests/DocFileTest/Properties/Resources.Designer.cs

 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.5472
+//     Runtime Version:4.0.30319.18063
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace DocFileTest.Properties
-{
-
-
+namespace DocFileTest.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,51 +19,43 @@ namespace DocFileTest.Properties
     // 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", "2.0.0.0")]
+    [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
-    {
-
+    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()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        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;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }

ASCOfficeDocFile/Tests/DocFileTest/Properties/Settings.Designer.cs

 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.5472
+//     Runtime Version:4.0.30319.18063
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace DocFileTest.Properties
-{
-
-
+namespace DocFileTest.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [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
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }

Common/ASCDocxFormat/Projects/Common2012.vcproj

+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="Common"
+	ProjectGUID="{399893AA-3617-4CD8-A980-7F15CDAFA3D2}"
+	RootNamespace="Common"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\Lib\Debug"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="./../Source/Utility"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="precompiled_common.h"
+				ProgramDataBaseFileName="$(IntDir)\common.pdb"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalLibraryDirectories=""
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\Lib\Release"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="./../Source/Utility"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="precompiled_common.h"
+				ProgramDataBaseFileName="$(IntDir)\common.pdb"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalLibraryDirectories=""
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\Source\Common\AbstractConverter.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Align.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Align.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Color.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Color.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Common.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Index.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Index.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\NumFormat.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\NumFormat.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Point.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Position.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Position.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\precompiled_common.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\precompiled_common.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Size.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Wrap.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\Wrap.h"
+			>
+		</File>
+		<File
+			RelativePath="..\Source\Common\ZIndex.cpp"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					ObjectFile="$(IntDir)\Common\"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\Source\Common\ZIndex.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Common/ASCDocxFormat/Projects/Common2012.vcxproj

+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>Common</ProjectName>
+    <ProjectGuid>{399893AA-3617-4CD8-A980-7F15CDAFA3D2}</ProjectGuid>
+    <RootNamespace>Common</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>..\Lib\Debug\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>..\Lib\Release\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>./../Source/Utility;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>precompiled_common.h</PrecompiledHeaderFile>
+      <ProgramDataBaseFileName>$(IntDir)common.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>./../Source/Utility;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>precompiled_common.h</PrecompiledHeaderFile>
+      <ProgramDataBaseFileName>$(IntDir)common.pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\Source\Common\AbstractConverter.h" />
+    <ClInclude Include="..\Source\Common\Align.h" />
+    <ClInclude Include="..\Source\Common\Color.h" />
+    <ClInclude Include="..\Source\Common\Common.h" />
+    <ClInclude Include="..\Source\Common\Index.h" />
+    <ClInclude Include="..\Source\Common\NumFormat.h" />
+    <ClInclude Include="..\Source\Common\Point.h" />
+    <ClInclude Include="..\Source\Common\Position.h" />
+    <ClInclude Include="..\Source\Common\precompiled_common.h" />
+    <ClInclude Include="..\Source\Common\Size.h" />
+    <ClInclude Include="..\Source\Common\Wrap.h" />
+    <ClInclude Include="..\Source\Common\ZIndex.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\Source\Common\Align.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Common\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Common\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\Source\Common\Color.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Common\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Common\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\Source\Common\Index.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Common\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Common\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\Source\Common\NumFormat.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Common\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Common\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\Source\Common\Position.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Common\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Common\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\Source\Common\precompiled_common.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\Source\Common\Wrap.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Common\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Common\</ObjectFileName>
+    </ClCompile>
+    <ClCompile Include="..\Source\Common\ZIndex.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Common\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Common\</ObjectFileName>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="Utility2012.vcxproj">
+      <Project>{7b9f3647-32d3-4f82-8ca5-a43e490e1457}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="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>
\ No newline at end of file