diff --git a/ASCOfficeOdfFile/formulasconvert/src/formulasconvert_odf.cpp b/ASCOfficeOdfFile/formulasconvert/src/formulasconvert_odf.cpp
index 0451e3e1de..453169e0ca 100644
--- a/ASCOfficeOdfFile/formulasconvert/src/formulasconvert_odf.cpp
+++ b/ASCOfficeOdfFile/formulasconvert/src/formulasconvert_odf.cpp
@@ -1,4 +1,4 @@
-#include <cpdoccore/formulasconvert.h>
+#include "../include/cpdoccore/formulasconvert.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
diff --git a/ASCOfficeOdfFile/formulasconvert/src/formulasconvert_oox.cpp b/ASCOfficeOdfFile/formulasconvert/src/formulasconvert_oox.cpp
index 9028fbdbc8..af803616a8 100644
--- a/ASCOfficeOdfFile/formulasconvert/src/formulasconvert_oox.cpp
+++ b/ASCOfficeOdfFile/formulasconvert/src/formulasconvert_oox.cpp
@@ -1,4 +1,4 @@
-#include <cpdoccore/formulasconvert.h>
+#include "../include/cpdoccore/formulasconvert.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
diff --git a/ASCOfficeOdfFile/win32/cpcommon.vcproj b/ASCOfficeOdfFile/win32/cpcommon.vcproj
index 07295dcadd..96a8a001f8 100644
--- a/ASCOfficeOdfFile/win32/cpcommon.vcproj
+++ b/ASCOfficeOdfFile/win32/cpcommon.vcproj
@@ -290,64 +290,64 @@
 			Name="include"
 			>
 			<File
-				RelativePath=".\include\cpdoccore\common\boost_filesystem_version.h"
+				RelativePath="..\include\cpdoccore\common\boost_filesystem_version.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\cpdoccore\common\readdocelement.h"
+				RelativePath="..\include\cpdoccore\common\readdocelement.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\cpdoccore\common\writedocelement.h"
+				RelativePath="..\include\cpdoccore\common\writedocelement.h"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath=".\include\cpdoccore\CPAssert.h"
+			RelativePath="..\include\cpdoccore\CPAssert.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\common\CPColorUtils.cpp"
+			RelativePath="..\src\common\CPColorUtils.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\include\cpdoccore\CPColorUtils.h"
+			RelativePath="..\include\cpdoccore\CPColorUtils.h"
 			>
 		</File>
 		<File
-			RelativePath=".\include\cpdoccore\CPHash.h"
+			RelativePath="..\include\cpdoccore\CPHash.h"
 			>
 		</File>
 		<File
-			RelativePath=".\include\cpdoccore\CPNoncopyable.h"
+			RelativePath="..\include\cpdoccore\CPNoncopyable.h"
 			>
 		</File>
 		<File
-			RelativePath=".\include\cpdoccore\CPOptional.h"
+			RelativePath="..\include\cpdoccore\CPOptional.h"
 			>
 		</File>
 		<File
-			RelativePath=".\include\cpdoccore\CPScopedPtr.h"
+			RelativePath="..\include\cpdoccore\CPScopedPtr.h"
 			>
 		</File>
 		<File
-			RelativePath=".\include\cpdoccore\CPSharedPtr.h"
+			RelativePath="..\include\cpdoccore\CPSharedPtr.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\common\CPString.cpp"
+			RelativePath="..\src\common\CPString.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\include\cpdoccore\CPString.h"
+			RelativePath="..\include\cpdoccore\CPString.h"
 			>
 		</File>
 		<File
-			RelativePath=".\include\cpdoccore\CPWeakPtr.h"
+			RelativePath="..\include\cpdoccore\CPWeakPtr.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\common\precompiled_cpcommon.cpp"
+			RelativePath="..\src\common\precompiled_cpcommon.cpp"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -383,11 +383,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath=".\src\common\precompiled_cpcommon.h"
+			RelativePath="..\src\common\precompiled_cpcommon.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\common\readdocelement.cpp"
+			RelativePath="..\src\common\readdocelement.cpp"
 			>
 		</File>
 	</Files>
diff --git a/ASCOfficeOdfFile/win32/cpdocument.sln b/ASCOfficeOdfFile/win32/cpdocument.sln
index 6c43a2eb65..22a95dbda5 100644
--- a/ASCOfficeOdfFile/win32/cpdocument.sln
+++ b/ASCOfficeOdfFile/win32/cpdocument.sln
@@ -1,38 +1,31 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpxml", "cpxml.vcproj", "{41BED424-4EAF-4053-8A5F-1E2A387D53D1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml_wrapper", "cpxml.vcproj", "{41BED424-4EAF-4053-8A5F-1E2A387D53D1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpodf", "cpodf.vcproj", "{50E20601-4A8D-4AFB-8870-63828D328429}"
+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}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpcommon", "cpcommon.vcproj", "{609ED938-3CA8-4BED-B363-25096D4C4812}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "cpcommon.vcproj", "{609ED938-3CA8-4BED-B363-25096D4C4812}"
 	ProjectSection(ProjectDependencies) = postProject
 		{41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFile", "ASCOfficeOdfFile\ASCOfficeOdfFile.vcproj", "{64B09C98-22DC-494E-A882-9E2D7D18557C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1}
-		{50E20601-4A8D-4AFB-8870-63828D328429} = {50E20601-4A8D-4AFB-8870-63828D328429}
-		{609ED938-3CA8-4BED-B363-25096D4C4812} = {609ED938-3CA8-4BED-B363-25096D4C4812}
-		{94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FormulasConvert", "formulasconvert.vcproj", "{94954A67-A853-43B1-A727-6EF2774C5A6A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFileTest", "examples\ASCOfficeOdfFileTest\ASCOfficeOdfFileTest.vcproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
-	ProjectSection(ProjectDependencies) = postProject
-		{64B09C98-22DC-494E-A882-9E2D7D18557C} = {64B09C98-22DC-494E-A882-9E2D7D18557C}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFile", "..\ASCOfficeOdfFile\ASCOfficeOdfFile.vcproj", "{64B09C98-22DC-494E-A882-9E2D7D18557C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpformulasconvert", "formulasconvert\formulasconvert.vcproj", "{94954A67-A853-43B1-A727-6EF2774C5A6A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFileTest", "..\Test\ASCOfficeOdfFileTest\ASCOfficeOdfFileTest.vcproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
 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
@@ -41,6 +34,9 @@ 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
@@ -49,6 +45,9 @@ Global
 		{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
@@ -57,34 +56,47 @@ Global
 		{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
-		{64B09C98-22DC-494E-A882-9E2D7D18557C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{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|Win32.ActiveCfg = Release|Win32
-		{64B09C98-22DC-494E-A882-9E2D7D18557C}.Release|Win32.Build.0 = Release|Win32
-		{64B09C98-22DC-494E-A882-9E2D7D18557C}.Release|x64.ActiveCfg = Release|Win32
-		{64B09C98-22DC-494E-A882-9E2D7D18557C}.Release|x64.Build.0 = Release|Win32
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|Win32.Build.0 = Debug|Win32
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|x64.ActiveCfg = Debug|x64
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|x64.Build.0 = Debug|x64
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.ActiveCfg = Release|Win32
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.Build.0 = Release|Win32
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|x64.ActiveCfg = Release|Win32
-		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|x64.Build.0 = Release|Win32
 		{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|Win32
-		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|x64.Build.0 = Release|Win32
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|x64.ActiveCfg = Release|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|x64.Build.0 = Release|x64
+		{64B09C98-22DC-494E-A882-9E2D7D18557C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{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
+		{64B09C98-22DC-494E-A882-9E2D7D18557C}.Release|x64.Build.0 = Release|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|Win32.Build.0 = Debug|Win32
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|x64.ActiveCfg = Debug|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|x64.Build.0 = Debug|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release 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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/ASCOfficeOdfFile/win32/cpodf.vcproj b/ASCOfficeOdfFile/win32/cpodf.vcproj
index aef9e7e0e0..20c03f8757 100644
--- a/ASCOfficeOdfFile/win32/cpodf.vcproj
+++ b/ASCOfficeOdfFile/win32/cpodf.vcproj
@@ -288,63 +288,55 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="include"
-			>
-			<File
-				RelativePath=".\include\cpdoccore\odf\odfformat.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="utility"
 			>
 			<File
-				RelativePath=".\src\odf\abstract_xml.cpp"
+				RelativePath="..\src\odf\abstract_xml.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\abstract_xml.h"
+				RelativePath="..\src\odf\abstract_xml.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\boost_string.h"
+				RelativePath="..\include\boost_string.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\createandread.cpp"
+				RelativePath="..\src\odf\createandread.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\errors.h"
+				RelativePath="..\src\odf\errors.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\lexical_cast.h"
+				RelativePath="..\include\lexical_cast.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\logging.cpp"
+				RelativePath="..\src\odf\logging.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\include\logging.h"
+				RelativePath="..\include\logging.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\odfattributes.h"
+				RelativePath="..\src\odf\odfattributes.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\office_elements_create.cpp"
+				RelativePath="..\src\odf\office_elements_create.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\office_elements_create.h"
+				RelativePath="..\src\odf\office_elements_create.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\precompiled_cpodf.cpp"
+				RelativePath="..\src\odf\precompiled_cpodf.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -380,23 +372,23 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\odf\precompiled_cpodf.h"
+				RelativePath="..\src\odf\precompiled_cpodf.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\regex.h"
+				RelativePath="..\include\regex.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\serialize_elements.h"
+				RelativePath="..\src\odf\serialize_elements.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\svg_parser.cpp"
+				RelativePath="..\src\odf\svg_parser.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\svg_parser.h"
+				RelativePath="..\src\odf\svg_parser.h"
 				>
 			</File>
 		</Filter>
@@ -404,119 +396,119 @@
 			Name="style"
 			>
 			<File
-				RelativePath=".\src\odf\calcs_styles.cpp"
+				RelativePath="..\src\odf\calcs_styles.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\calcs_styles.h"
+				RelativePath="..\src\odf\calcs_styles.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\header_footer.cpp"
+				RelativePath="..\src\odf\header_footer.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\header_footer.h"
+				RelativePath="..\src\odf\header_footer.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_chart_properties.cpp"
+				RelativePath="..\src\odf\style_chart_properties.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_chart_properties.h"
+				RelativePath="..\src\odf\style_chart_properties.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_graphic_properties.cpp"
+				RelativePath="..\src\odf\style_graphic_properties.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_graphic_properties.h"
+				RelativePath="..\src\odf\style_graphic_properties.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_map.cpp"
+				RelativePath="..\src\odf\style_map.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_map.h"
+				RelativePath="..\src\odf\style_map.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_paragraph_properties.cpp"
+				RelativePath="..\src\odf\style_paragraph_properties.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_paragraph_properties.h"
+				RelativePath="..\src\odf\style_paragraph_properties.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_paragraph_properties_docx.cpp"
+				RelativePath="..\src\odf\style_paragraph_properties_docx.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_paragraph_properties_pptx.cpp"
+				RelativePath="..\src\odf\style_paragraph_properties_pptx.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_presentation.cpp"
+				RelativePath="..\src\odf\style_presentation.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_presentation.h"
+				RelativePath="..\src\odf\style_presentation.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_ref.h"
+				RelativePath="..\src\odf\style_ref.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_table_properties.cpp"
+				RelativePath="..\src\odf\style_table_properties.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_table_properties.h"
+				RelativePath="..\src\odf\style_table_properties.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_text_properties.cpp"
+				RelativePath="..\src\odf\style_text_properties.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\style_text_properties.h"
+				RelativePath="..\src\odf\style_text_properties.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\styles.cpp"
+				RelativePath="..\src\odf\styles.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\styles.h"
+				RelativePath="..\src\odf\styles.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\styles_list.cpp"
+				RelativePath="..\src\odf\styles_list.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\styles_list.h"
+				RelativePath="..\src\odf\styles_list.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\styles_lite_container.cpp"
+				RelativePath="..\src\odf\styles_lite_container.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\styles_lite_container.h"
+				RelativePath="..\src\odf\styles_lite_container.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\templates.cpp"
+				RelativePath="..\src\odf\templates.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\templates.h"
+				RelativePath="..\src\odf\templates.h"
 				>
 			</File>
 		</Filter>
@@ -524,135 +516,135 @@
 			Name="datatypes odf"
 			>
 			<File
-				RelativePath=".\src\odf\datatypes\anchortype.cpp"
+				RelativePath="..\src\odf\datatypes\anchortype.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\anchortype.h"
+				RelativePath="..\src\odf\datatypes\anchortype.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\backgroundcolor.cpp"
+				RelativePath="..\src\odf\datatypes\backgroundcolor.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\backgroundcolor.h"
+				RelativePath="..\src\odf\datatypes\backgroundcolor.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\bool.cpp"
+				RelativePath="..\src\odf\datatypes\bool.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\bool.h"
+				RelativePath="..\src\odf\datatypes\bool.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\bordermodel.cpp"
+				RelativePath="..\src\odf\datatypes\bordermodel.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\bordermodel.h"
+				RelativePath="..\src\odf\datatypes\bordermodel.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\borderstyle.cpp"
+				RelativePath="..\src\odf\datatypes\borderstyle.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\borderstyle.h"
+				RelativePath="..\src\odf\datatypes\borderstyle.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\borderwidths.cpp"
+				RelativePath="..\src\odf\datatypes\borderwidths.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\borderwidths.h"
+				RelativePath="..\src\odf\datatypes\borderwidths.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\chartdatalabelnumber.cpp"
+				RelativePath="..\src\odf\datatypes\chartdatalabelnumber.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\chartdatalabelnumber.h"
+				RelativePath="..\src\odf\datatypes\chartdatalabelnumber.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\charterrorcategory.cpp"
+				RelativePath="..\src\odf\datatypes\charterrorcategory.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\charterrorcategory.h"
+				RelativePath="..\src\odf\datatypes\charterrorcategory.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\chartinterpolation.cpp"
+				RelativePath="..\src\odf\datatypes\chartinterpolation.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\chartinterpolation.h"
+				RelativePath="..\src\odf\datatypes\chartinterpolation.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\chartlabelarrangement.cpp"
+				RelativePath="..\src\odf\datatypes\chartlabelarrangement.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\chartlabelarrangement.h"
+				RelativePath="..\src\odf\datatypes\chartlabelarrangement.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\chartregressiontype.cpp"
+				RelativePath="..\src\odf\datatypes\chartregressiontype.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\chartregressiontype.h"
+				RelativePath="..\src\odf\datatypes\chartregressiontype.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\chartseriessource.cpp"
+				RelativePath="..\src\odf\datatypes\chartseriessource.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\chartseriessource.h"
+				RelativePath="..\src\odf\datatypes\chartseriessource.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\chartsolidtype.cpp"
+				RelativePath="..\src\odf\datatypes\chartsolidtype.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\chartsolidtype.h"
+				RelativePath="..\src\odf\datatypes\chartsolidtype.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\chartsymbol.cpp"
+				RelativePath="..\src\odf\datatypes\chartsymbol.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\chartsymbol.h"
+				RelativePath="..\src\odf\datatypes\chartsymbol.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\clockvalue.cpp"
+				RelativePath="..\src\odf\datatypes\clockvalue.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\clockvalue.h"
+				RelativePath="..\src\odf\datatypes\clockvalue.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\color.cpp"
+				RelativePath="..\src\odf\datatypes\color.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\color.h"
+				RelativePath="..\src\odf\datatypes\color.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\common_attlists.cpp"
+				RelativePath="..\src\odf\datatypes\common_attlists.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -692,583 +684,583 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\common_attlists.h"
+				RelativePath="..\src\odf\datatypes\common_attlists.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\direction.cpp"
+				RelativePath="..\src\odf\datatypes\direction.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\direction.h"
+				RelativePath="..\src\odf\datatypes\direction.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\drawfill.cpp"
+				RelativePath="..\src\odf\datatypes\drawfill.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\drawfill.h"
+				RelativePath="..\src\odf\datatypes\drawfill.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\dropcaplength.cpp"
+				RelativePath="..\src\odf\datatypes\dropcaplength.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\dropcaplength.h"
+				RelativePath="..\src\odf\datatypes\dropcaplength.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\errors.h"
+				RelativePath="..\src\odf\datatypes\errors.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fillimagerefpoint.cpp"
+				RelativePath="..\src\odf\datatypes\fillimagerefpoint.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fillimagerefpoint.h"
+				RelativePath="..\src\odf\datatypes\fillimagerefpoint.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fobreak.cpp"
+				RelativePath="..\src\odf\datatypes\fobreak.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fobreak.h"
+				RelativePath="..\src\odf\datatypes\fobreak.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fontfamilygeneric.cpp"
+				RelativePath="..\src\odf\datatypes\fontfamilygeneric.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fontfamilygeneric.h"
+				RelativePath="..\src\odf\datatypes\fontfamilygeneric.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fontpitch.cpp"
+				RelativePath="..\src\odf\datatypes\fontpitch.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fontpitch.h"
+				RelativePath="..\src\odf\datatypes\fontpitch.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fontrelief.cpp"
+				RelativePath="..\src\odf\datatypes\fontrelief.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fontrelief.h"
+				RelativePath="..\src\odf\datatypes\fontrelief.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fontsize.cpp"
+				RelativePath="..\src\odf\datatypes\fontsize.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fontsize.h"
+				RelativePath="..\src\odf\datatypes\fontsize.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fontstretch.cpp"
+				RelativePath="..\src\odf\datatypes\fontstretch.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fontstretch.h"
+				RelativePath="..\src\odf\datatypes\fontstretch.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fontstyle.cpp"
+				RelativePath="..\src\odf\datatypes\fontstyle.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fontstyle.h"
+				RelativePath="..\src\odf\datatypes\fontstyle.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fontvariant.cpp"
+				RelativePath="..\src\odf\datatypes\fontvariant.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fontvariant.h"
+				RelativePath="..\src\odf\datatypes\fontvariant.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fontweight.cpp"
+				RelativePath="..\src\odf\datatypes\fontweight.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\fontweight.h"
+				RelativePath="..\src\odf\datatypes\fontweight.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\gradientstyle.cpp"
+				RelativePath="..\src\odf\datatypes\gradientstyle.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\gradientstyle.h"
+				RelativePath="..\src\odf\datatypes\gradientstyle.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\hatchstyle.cpp"
+				RelativePath="..\src\odf\datatypes\hatchstyle.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\hatchstyle.h"
+				RelativePath="..\src\odf\datatypes\hatchstyle.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\hyphenationkeep.cpp"
+				RelativePath="..\src\odf\datatypes\hyphenationkeep.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\hyphenationkeep.h"
+				RelativePath="..\src\odf\datatypes\hyphenationkeep.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\hyphenationladdercount.cpp"
+				RelativePath="..\src\odf\datatypes\hyphenationladdercount.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\hyphenationladdercount.h"
+				RelativePath="..\src\odf\datatypes\hyphenationladdercount.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\keeptogether.cpp"
+				RelativePath="..\src\odf\datatypes\keeptogether.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\keeptogether.h"
+				RelativePath="..\src\odf\datatypes\keeptogether.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\layoutgridmode.cpp"
+				RelativePath="..\src\odf\datatypes\layoutgridmode.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\layoutgridmode.h"
+				RelativePath="..\src\odf\datatypes\layoutgridmode.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\length.cpp"
+				RelativePath="..\src\odf\datatypes\length.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\length.h"
+				RelativePath="..\src\odf\datatypes\length.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\lengthorpercent.cpp"
+				RelativePath="..\src\odf\datatypes\lengthorpercent.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\lengthorpercent.h"
+				RelativePath="..\src\odf\datatypes\lengthorpercent.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\letterspacing.cpp"
+				RelativePath="..\src\odf\datatypes\letterspacing.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\letterspacing.h"
+				RelativePath="..\src\odf\datatypes\letterspacing.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\linebreak.cpp"
+				RelativePath="..\src\odf\datatypes\linebreak.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\linebreak.h"
+				RelativePath="..\src\odf\datatypes\linebreak.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\linemode.cpp"
+				RelativePath="..\src\odf\datatypes\linemode.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\linemode.h"
+				RelativePath="..\src\odf\datatypes\linemode.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\linestyle.cpp"
+				RelativePath="..\src\odf\datatypes\linestyle.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\linestyle.h"
+				RelativePath="..\src\odf\datatypes\linestyle.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\linetype.cpp"
+				RelativePath="..\src\odf\datatypes\linetype.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\linetype.h"
+				RelativePath="..\src\odf\datatypes\linetype.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\linewidth.cpp"
+				RelativePath="..\src\odf\datatypes\linewidth.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\linewidth.h"
+				RelativePath="..\src\odf\datatypes\linewidth.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\markerstyle.cpp"
+				RelativePath="..\src\odf\datatypes\markerstyle.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\markerstyle.h"
+				RelativePath="..\src\odf\datatypes\markerstyle.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\noteclass.cpp"
+				RelativePath="..\src\odf\datatypes\noteclass.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\noteclass.h"
+				RelativePath="..\src\odf\datatypes\noteclass.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\odfattributes.h"
+				RelativePath="..\src\odf\datatypes\odfattributes.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\officevaluetype.cpp"
+				RelativePath="..\src\odf\datatypes\officevaluetype.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\officevaluetype.h"
+				RelativePath="..\src\odf\datatypes\officevaluetype.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\pageusage.cpp"
+				RelativePath="..\src\odf\datatypes\pageusage.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\pageusage.h"
+				RelativePath="..\src\odf\datatypes\pageusage.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\percent.cpp"
+				RelativePath="..\src\odf\datatypes\percent.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\percent.h"
+				RelativePath="..\src\odf\datatypes\percent.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\percentorscale.cpp"
+				RelativePath="..\src\odf\datatypes\percentorscale.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\percentorscale.h"
+				RelativePath="..\src\odf\datatypes\percentorscale.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\presentationclass.cpp"
+				RelativePath="..\src\odf\datatypes\presentationclass.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\presentationclass.h"
+				RelativePath="..\src\odf\datatypes\presentationclass.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\punctuationwrap.cpp"
+				RelativePath="..\src\odf\datatypes\punctuationwrap.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\punctuationwrap.h"
+				RelativePath="..\src\odf\datatypes\punctuationwrap.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\rotationalign.cpp"
+				RelativePath="..\src\odf\datatypes\rotationalign.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\rotationalign.h"
+				RelativePath="..\src\odf\datatypes\rotationalign.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\runthrough.cpp"
+				RelativePath="..\src\odf\datatypes\runthrough.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\runthrough.h"
+				RelativePath="..\src\odf\datatypes\runthrough.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\scripttype.cpp"
+				RelativePath="..\src\odf\datatypes\scripttype.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\scripttype.h"
+				RelativePath="..\src\odf\datatypes\scripttype.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\shadowtype.cpp"
+				RelativePath="..\src\odf\datatypes\shadowtype.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\shadowtype.h"
+				RelativePath="..\src\odf\datatypes\shadowtype.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\smil_transitiontype.cpp"
+				RelativePath="..\src\odf\datatypes\smil_transitiontype.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\smil_transitiontype.h"
+				RelativePath="..\src\odf\datatypes\smil_transitiontype.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\style_ref.cpp"
+				RelativePath="..\src\odf\datatypes\style_ref.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\style_ref.h"
+				RelativePath="..\src\odf\datatypes\style_ref.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\stylefamily.cpp"
+				RelativePath="..\src\odf\datatypes\stylefamily.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\stylefamily.h"
+				RelativePath="..\src\odf\datatypes\stylefamily.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\stylehorizontalpos.cpp"
+				RelativePath="..\src\odf\datatypes\stylehorizontalpos.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\stylehorizontalpos.h"
+				RelativePath="..\src\odf\datatypes\stylehorizontalpos.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\stylehorizontalrel.cpp"
+				RelativePath="..\src\odf\datatypes\stylehorizontalrel.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\stylehorizontalrel.h"
+				RelativePath="..\src\odf\datatypes\stylehorizontalrel.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\styleleadercolor.cpp"
+				RelativePath="..\src\odf\datatypes\styleleadercolor.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\styleleadercolor.h"
+				RelativePath="..\src\odf\datatypes\styleleadercolor.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\styleposition.cpp"
+				RelativePath="..\src\odf\datatypes\styleposition.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\styleposition.h"
+				RelativePath="..\src\odf\datatypes\styleposition.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\stylerepeat.cpp"
+				RelativePath="..\src\odf\datatypes\stylerepeat.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\stylerepeat.h"
+				RelativePath="..\src\odf\datatypes\stylerepeat.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\styletype.cpp"
+				RelativePath="..\src\odf\datatypes\styletype.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\styletype.h"
+				RelativePath="..\src\odf\datatypes\styletype.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\styleverticalpos.cpp"
+				RelativePath="..\src\odf\datatypes\styleverticalpos.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\styleverticalpos.h"
+				RelativePath="..\src\odf\datatypes\styleverticalpos.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\styleverticalrel.cpp"
+				RelativePath="..\src\odf\datatypes\styleverticalrel.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\styleverticalrel.h"
+				RelativePath="..\src\odf\datatypes\styleverticalrel.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\stylewrap.cpp"
+				RelativePath="..\src\odf\datatypes\stylewrap.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\stylewrap.h"
+				RelativePath="..\src\odf\datatypes\stylewrap.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\stylewrapcontourmode.cpp"
+				RelativePath="..\src\odf\datatypes\stylewrapcontourmode.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\stylewrapcontourmode.h"
+				RelativePath="..\src\odf\datatypes\stylewrapcontourmode.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\tablealign.cpp"
+				RelativePath="..\src\odf\datatypes\tablealign.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\tablealign.h"
+				RelativePath="..\src\odf\datatypes\tablealign.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\tablecentering.cpp"
+				RelativePath="..\src\odf\datatypes\tablecentering.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\tablecentering.h"
+				RelativePath="..\src\odf\datatypes\tablecentering.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\tablemode.cpp"
+				RelativePath="..\src\odf\datatypes\tablemode.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\tablemode.h"
+				RelativePath="..\src\odf\datatypes\tablemode.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\tablevisibility.cpp"
+				RelativePath="..\src\odf\datatypes\tablevisibility.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\tablevisibility.h"
+				RelativePath="..\src\odf\datatypes\tablevisibility.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\targetframename.cpp"
+				RelativePath="..\src\odf\datatypes\targetframename.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\targetframename.h"
+				RelativePath="..\src\odf\datatypes\targetframename.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\textalign.cpp"
+				RelativePath="..\src\odf\datatypes\textalign.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\textalign.h"
+				RelativePath="..\src\odf\datatypes\textalign.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\textalignsource.cpp"
+				RelativePath="..\src\odf\datatypes\textalignsource.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\textalignsource.h"
+				RelativePath="..\src\odf\datatypes\textalignsource.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\textautospace.cpp"
+				RelativePath="..\src\odf\datatypes\textautospace.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\textautospace.h"
+				RelativePath="..\src\odf\datatypes\textautospace.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\textcombine.cpp"
+				RelativePath="..\src\odf\datatypes\textcombine.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\textcombine.h"
+				RelativePath="..\src\odf\datatypes\textcombine.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\textdisplay.cpp"
+				RelativePath="..\src\odf\datatypes\textdisplay.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\textdisplay.h"
+				RelativePath="..\src\odf\datatypes\textdisplay.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\textemphasize.cpp"
+				RelativePath="..\src\odf\datatypes\textemphasize.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\textemphasize.h"
+				RelativePath="..\src\odf\datatypes\textemphasize.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\textposition.cpp"
+				RelativePath="..\src\odf\datatypes\textposition.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\textposition.h"
+				RelativePath="..\src\odf\datatypes\textposition.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\textrotationscale.cpp"
+				RelativePath="..\src\odf\datatypes\textrotationscale.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\textrotationscale.h"
+				RelativePath="..\src\odf\datatypes\textrotationscale.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\texttransform.cpp"
+				RelativePath="..\src\odf\datatypes\texttransform.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\texttransform.h"
+				RelativePath="..\src\odf\datatypes\texttransform.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\underlinecolor.cpp"
+				RelativePath="..\src\odf\datatypes\underlinecolor.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\underlinecolor.h"
+				RelativePath="..\src\odf\datatypes\underlinecolor.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\verticalalign.cpp"
+				RelativePath="..\src\odf\datatypes\verticalalign.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\verticalalign.h"
+				RelativePath="..\src\odf\datatypes\verticalalign.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\wrapoption.cpp"
+				RelativePath="..\src\odf\datatypes\wrapoption.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\wrapoption.h"
+				RelativePath="..\src\odf\datatypes\wrapoption.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\writingmode.cpp"
+				RelativePath="..\src\odf\datatypes\writingmode.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\writingmode.h"
+				RelativePath="..\src\odf\datatypes\writingmode.h"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\xlink.cpp"
+				RelativePath="..\src\odf\datatypes\xlink.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\odf\datatypes\xlink.h"
+				RelativePath="..\src\odf\datatypes\xlink.h"
 				>
 			</File>
 		</Filter>
@@ -1279,75 +1271,75 @@
 				Name="docx"
 				>
 				<File
-					RelativePath=".\src\docx\docx_content_type.cpp"
+					RelativePath="..\src\docx\docx_content_type.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\docx_content_type.h"
+					RelativePath="..\src\docx\docx_content_type.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\docx_conversion_context.cpp"
+					RelativePath="..\src\docx\docx_conversion_context.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\docx_conversion_context.h"
+					RelativePath="..\src\docx\docx_conversion_context.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\docx_conversion_state.h"
+					RelativePath="..\src\docx\docx_conversion_state.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\docx_drawing.cpp"
+					RelativePath="..\src\docx\docx_drawing.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\docx_drawing.h"
+					RelativePath="..\src\docx\docx_drawing.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\docx_package.cpp"
+					RelativePath="..\src\docx\docx_package.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\docx_package.h"
+					RelativePath="..\src\docx\docx_package.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\docx_rels.cpp"
+					RelativePath="..\src\docx\docx_rels.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\docx_rels.h"
+					RelativePath="..\src\docx\docx_rels.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\docx_table_context.cpp"
+					RelativePath="..\src\docx\docx_table_context.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\docx_table_context.h"
+					RelativePath="..\src\docx\docx_table_context.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\headers_footers.cpp"
+					RelativePath="..\src\docx\headers_footers.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\headers_footers.h"
+					RelativePath="..\src\docx\headers_footers.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\hyperlinks.cpp"
+					RelativePath="..\src\docx\hyperlinks.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\hyperlinks.h"
+					RelativePath="..\src\docx\hyperlinks.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\namespaces.cpp"
+					RelativePath="..\src\docx\namespaces.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -1387,7 +1379,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath=".\src\docx\namespaces.h"
+					RelativePath="..\src\docx\namespaces.h"
 					>
 				</File>
 			</Filter>
@@ -1395,287 +1387,287 @@
 				Name="xlsx"
 				>
 				<File
-					RelativePath=".\src\docx\xlsx_alignment.cpp"
+					RelativePath="..\src\docx\xlsx_alignment.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_alignment.h"
+					RelativePath="..\src\docx\xlsx_alignment.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_border.cpp"
+					RelativePath="..\src\docx\xlsx_border.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_border.h"
+					RelativePath="..\src\docx\xlsx_border.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_borders.cpp"
+					RelativePath="..\src\docx\xlsx_borders.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_borders.h"
+					RelativePath="..\src\docx\xlsx_borders.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_cell_format.cpp"
+					RelativePath="..\src\docx\xlsx_cell_format.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_cell_format.h"
+					RelativePath="..\src\docx\xlsx_cell_format.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_cell_style.cpp"
+					RelativePath="..\src\docx\xlsx_cell_style.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_cell_style.h"
+					RelativePath="..\src\docx\xlsx_cell_style.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_cell_styles.cpp"
+					RelativePath="..\src\docx\xlsx_cell_styles.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_cell_styles.h"
+					RelativePath="..\src\docx\xlsx_cell_styles.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_color.cpp"
+					RelativePath="..\src\docx\xlsx_color.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_color.h"
+					RelativePath="..\src\docx\xlsx_color.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_comments.cpp"
+					RelativePath="..\src\docx\xlsx_comments.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_comments.h"
+					RelativePath="..\src\docx\xlsx_comments.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_comments_context.cpp"
+					RelativePath="..\src\docx\xlsx_comments_context.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_comments_context.h"
+					RelativePath="..\src\docx\xlsx_comments_context.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_complex_number_format.cpp"
+					RelativePath="..\src\docx\xlsx_complex_number_format.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_complex_number_format.h"
+					RelativePath="..\src\docx\xlsx_complex_number_format.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_defined_names.cpp"
+					RelativePath="..\src\docx\xlsx_defined_names.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_defined_names.h"
+					RelativePath="..\src\docx\xlsx_defined_names.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_drawing.cpp"
+					RelativePath="..\src\docx\xlsx_drawing.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_drawing.h"
+					RelativePath="..\src\docx\xlsx_drawing.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_drawing_context.cpp"
+					RelativePath="..\src\docx\xlsx_drawing_context.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_drawing_context.h"
+					RelativePath="..\src\docx\xlsx_drawing_context.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_drawings.cpp"
+					RelativePath="..\src\docx\xlsx_drawings.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_drawings.h"
+					RelativePath="..\src\docx\xlsx_drawings.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_fill.cpp"
+					RelativePath="..\src\docx\xlsx_fill.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_fill.h"
+					RelativePath="..\src\docx\xlsx_fill.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_fills.cpp"
+					RelativePath="..\src\docx\xlsx_fills.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_fills.h"
+					RelativePath="..\src\docx\xlsx_fills.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_font.cpp"
+					RelativePath="..\src\docx\xlsx_font.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_font.h"
+					RelativePath="..\src\docx\xlsx_font.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_fonts.cpp"
+					RelativePath="..\src\docx\xlsx_fonts.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_fonts.h"
+					RelativePath="..\src\docx\xlsx_fonts.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_formula.h"
+					RelativePath="..\src\docx\xlsx_formula.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_hyperlinks.cpp"
+					RelativePath="..\src\docx\xlsx_hyperlinks.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_hyperlinks.h"
+					RelativePath="..\src\docx\xlsx_hyperlinks.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_merge_cells.cpp"
+					RelativePath="..\src\docx\xlsx_merge_cells.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_merge_cells.h"
+					RelativePath="..\src\docx\xlsx_merge_cells.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_num_format_context.cpp"
+					RelativePath="..\src\docx\xlsx_num_format_context.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_num_format_context.h"
+					RelativePath="..\src\docx\xlsx_num_format_context.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_numFmts.cpp"
+					RelativePath="..\src\docx\xlsx_numFmts.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_numFmts.h"
+					RelativePath="..\src\docx\xlsx_numFmts.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_output_xml.cpp"
+					RelativePath="..\src\docx\xlsx_output_xml.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_output_xml.h"
+					RelativePath="..\src\docx\xlsx_output_xml.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_package.cpp"
+					RelativePath="..\src\docx\xlsx_package.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_package.h"
+					RelativePath="..\src\docx\xlsx_package.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_protection.cpp"
+					RelativePath="..\src\docx\xlsx_protection.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_protection.h"
+					RelativePath="..\src\docx\xlsx_protection.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_row_spanned.h"
+					RelativePath="..\src\docx\xlsx_row_spanned.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_sharedstrings.cpp"
+					RelativePath="..\src\docx\xlsx_sharedstrings.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_sharedstrings.h"
+					RelativePath="..\src\docx\xlsx_sharedstrings.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_styles.cpp"
+					RelativePath="..\src\docx\xlsx_styles.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_styles.h"
+					RelativePath="..\src\docx\xlsx_styles.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_table_metrics.cpp"
+					RelativePath="..\src\docx\xlsx_table_metrics.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_table_metrics.h"
+					RelativePath="..\src\docx\xlsx_table_metrics.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_table_position.h"
+					RelativePath="..\src\docx\xlsx_table_position.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_table_state.cpp"
+					RelativePath="..\src\docx\xlsx_table_state.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_table_state.h"
+					RelativePath="..\src\docx\xlsx_table_state.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_tablecontext.cpp"
+					RelativePath="..\src\docx\xlsx_tablecontext.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_tablecontext.h"
+					RelativePath="..\src\docx\xlsx_tablecontext.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_textcontext.cpp"
+					RelativePath="..\src\docx\xlsx_textcontext.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_textcontext.h"
+					RelativePath="..\src\docx\xlsx_textcontext.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_utils.cpp"
+					RelativePath="..\src\docx\xlsx_utils.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_utils.h"
+					RelativePath="..\src\docx\xlsx_utils.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_xf.cpp"
+					RelativePath="..\src\docx\xlsx_xf.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsx_xf.h"
+					RelativePath="..\src\docx\xlsx_xf.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsxconversioncontext.cpp"
+					RelativePath="..\src\docx\xlsxconversioncontext.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\xlsxconversioncontext.h"
+					RelativePath="..\src\docx\xlsxconversioncontext.h"
 					>
 				</File>
 			</Filter>
@@ -1683,162 +1675,162 @@
 				Name="oox"
 				>
 				<File
-					RelativePath=".\src\conversionelement.cpp"
+					RelativePath="..\src\conversionelement.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\conversionelement.h"
+					RelativePath="..\src\conversionelement.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\drawing_object_description.h"
+					RelativePath="..\src\docx\drawing_object_description.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\measuredigits.cpp"
+					RelativePath="..\src\docx\measuredigits.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\measuredigits.h"
+					RelativePath="..\src\docx\measuredigits.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\mediaitems.cpp"
+					RelativePath="..\src\docx\mediaitems.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\mediaitems.h"
+					RelativePath="..\src\docx\mediaitems.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\mediaitems_utils.cpp"
+					RelativePath="..\src\docx\mediaitems_utils.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\mediaitems_utils.h"
+					RelativePath="..\src\docx\mediaitems_utils.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\oox_conversion_context.cpp"
+					RelativePath="..\src\docx\oox_conversion_context.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\oox_conversion_context.h"
+					RelativePath="..\src\docx\oox_conversion_context.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\oox_drawing.cpp"
+					RelativePath="..\src\docx\oox_drawing.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\oox_drawing.h"
+					RelativePath="..\src\docx\oox_drawing.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\oox_drawing_fills.cpp"
+					RelativePath="..\src\docx\oox_drawing_fills.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\oox_drawing_fills.h"
+					RelativePath="..\src\docx\oox_drawing_fills.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\oox_package.cpp"
+					RelativePath="..\src\docx\oox_package.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\oox_package.h"
+					RelativePath="..\src\docx\oox_package.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\ooxtablerowspanned.h"
+					RelativePath="..\src\docx\ooxtablerowspanned.h"
 					>
 				</File>
 				<Filter
 					Name="chart"
 					>
 					<File
-						RelativePath=".\src\docx\oox_chart_axis.cpp"
+						RelativePath="..\src\docx\oox_chart_axis.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_chart_axis.h"
+						RelativePath="..\src\docx\oox_chart_axis.h"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_chart_context.cpp"
+						RelativePath="..\src\docx\oox_chart_context.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_chart_context.h"
+						RelativePath="..\src\docx\oox_chart_context.h"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_chart_legend.cpp"
+						RelativePath="..\src\docx\oox_chart_legend.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_chart_legend.h"
+						RelativePath="..\src\docx\oox_chart_legend.h"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_chart_series.cpp"
+						RelativePath="..\src\docx\oox_chart_series.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_chart_series.h"
+						RelativePath="..\src\docx\oox_chart_series.h"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_chart_shape.cpp"
+						RelativePath="..\src\docx\oox_chart_shape.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_chart_shape.h"
+						RelativePath="..\src\docx\oox_chart_shape.h"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_chart_values.h"
+						RelativePath="..\src\docx\oox_chart_values.h"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_data_labels.cpp"
+						RelativePath="..\src\docx\oox_data_labels.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_data_labels.h"
+						RelativePath="..\src\docx\oox_data_labels.h"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_layout.cpp"
+						RelativePath="..\src\docx\oox_layout.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_layout.h"
+						RelativePath="..\src\docx\oox_layout.h"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_plot_area.cpp"
+						RelativePath="..\src\docx\oox_plot_area.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_plot_area.h"
+						RelativePath="..\src\docx\oox_plot_area.h"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_title.cpp"
+						RelativePath="..\src\docx\oox_title.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_title.h"
+						RelativePath="..\src\docx\oox_title.h"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_types_chart.cpp"
+						RelativePath="..\src\docx\oox_types_chart.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\src\docx\oox_types_chart.h"
+						RelativePath="..\src\docx\oox_types_chart.h"
 						>
 					</File>
 				</Filter>
@@ -1847,233 +1839,233 @@
 				Name="pptx"
 				>
 				<File
-					RelativePath=".\src\docx\pptx_comments.cpp"
+					RelativePath="..\src\docx\pptx_comments.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_comments.h"
+					RelativePath="..\src\docx\pptx_comments.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_comments_context.cpp"
+					RelativePath="..\src\docx\pptx_comments_context.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_comments_context.h"
+					RelativePath="..\src\docx\pptx_comments_context.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_conversion_context.cpp"
+					RelativePath="..\src\docx\pptx_conversion_context.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_conversion_context.h"
+					RelativePath="..\src\docx\pptx_conversion_context.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_default_serializes.h"
+					RelativePath="..\src\docx\pptx_default_serializes.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_drawing.cpp"
+					RelativePath="..\src\docx\pptx_drawing.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_drawing.h"
+					RelativePath="..\src\docx\pptx_drawing.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_drawings.cpp"
+					RelativePath="..\src\docx\pptx_drawings.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_drawings.h"
+					RelativePath="..\src\docx\pptx_drawings.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_output_xml.cpp"
+					RelativePath="..\src\docx\pptx_output_xml.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_output_xml.h"
+					RelativePath="..\src\docx\pptx_output_xml.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_package.cpp"
+					RelativePath="..\src\docx\pptx_package.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_package.h"
+					RelativePath="..\src\docx\pptx_package.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_slide_context.cpp"
+					RelativePath="..\src\docx\pptx_slide_context.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_slide_context.h"
+					RelativePath="..\src\docx\pptx_slide_context.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_table_context.cpp"
+					RelativePath="..\src\docx\pptx_table_context.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_table_context.h"
+					RelativePath="..\src\docx\pptx_table_context.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_text_context.cpp"
+					RelativePath="..\src\docx\pptx_text_context.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\docx\pptx_text_context.h"
+					RelativePath="..\src\docx\pptx_text_context.h"
 					>
 				</File>
 			</Filter>
 		</Filter>
 		<File
-			RelativePath=".\src\odf\all_elements.h"
+			RelativePath="..\src\odf\all_elements.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\anim_elements.cpp"
+			RelativePath="..\src\odf\anim_elements.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\anim_elements.h"
+			RelativePath="..\src\odf\anim_elements.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\chart_build_oox.cpp"
+			RelativePath="..\src\odf\chart_build_oox.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\chart_build_oox.h"
+			RelativePath="..\src\odf\chart_build_oox.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\chart_objects.h"
+			RelativePath="..\src\odf\chart_objects.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\datatypes\custom_shape_types_convert.h"
+			RelativePath="..\src\odf\datatypes\custom_shape_types_convert.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\documentcontext.cpp"
+			RelativePath="..\src\odf\documentcontext.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\documentcontext.h"
+			RelativePath="..\src\odf\documentcontext.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\draw_common.cpp"
+			RelativePath="..\src\odf\draw_common.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\draw_common.h"
+			RelativePath="..\src\odf\draw_common.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\draw_frame.cpp"
+			RelativePath="..\src\odf\draw_frame.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\draw_frame.h"
+			RelativePath="..\src\odf\draw_frame.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\draw_frame_docx.cpp"
+			RelativePath="..\src\odf\draw_frame_docx.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\draw_frame_pptx.cpp"
+			RelativePath="..\src\odf\draw_frame_pptx.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\draw_frame_xlsx.cpp"
+			RelativePath="..\src\odf\draw_frame_xlsx.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\draw_page.cpp"
+			RelativePath="..\src\odf\draw_page.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\draw_page.h"
+			RelativePath="..\src\odf\draw_page.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\draw_shapes.cpp"
+			RelativePath="..\src\odf\draw_shapes.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\draw_shapes.h"
+			RelativePath="..\src\odf\draw_shapes.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\draw_shapes_docx.cpp"
+			RelativePath="..\src\odf\draw_shapes_docx.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\draw_shapes_pptx.cpp"
+			RelativePath="..\src\odf\draw_shapes_pptx.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\draw_shapes_xlsx.cpp"
+			RelativePath="..\src\odf\draw_shapes_xlsx.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\font_face.cpp"
+			RelativePath="..\src\odf\font_face.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\font_face.h"
+			RelativePath="..\src\odf\font_face.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\list.cpp"
+			RelativePath="..\src\odf\list.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\list.h"
+			RelativePath="..\src\odf\list.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\namespaces.cpp"
+			RelativePath="..\src\odf\namespaces.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\namespaces.h"
+			RelativePath="..\src\odf\namespaces.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\note.cpp"
+			RelativePath="..\src\odf\note.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\note.h"
+			RelativePath="..\src\odf\note.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\number_style.cpp"
+			RelativePath="..\src\odf\number_style.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\number_style.h"
+			RelativePath="..\src\odf\number_style.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\odf_content_xml.cpp"
+			RelativePath="..\src\odf\odf_content_xml.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\odf_content_xml.h"
+			RelativePath="..\src\odf\odf_content_xml.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\odf_document.cpp"
+			RelativePath="..\src\odf\odf_document.cpp"
 			>
 		</File>
 		<File
@@ -2081,215 +2073,215 @@
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\odf_document_impl.cpp"
+			RelativePath="..\src\odf\odf_document_impl.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\odf_document_impl.h"
+			RelativePath="..\src\odf\odf_document_impl.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\odfcontext.cpp"
+			RelativePath="..\src\odf\odfcontext.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\odfcontext.h"
+			RelativePath="..\src\odf\odfcontext.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_annotation.cpp"
+			RelativePath="..\src\odf\office_annotation.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_annotation.h"
+			RelativePath="..\src\odf\office_annotation.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_binary_data.cpp"
+			RelativePath="..\src\odf\office_binary_data.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_binary_data.h"
+			RelativePath="..\src\odf\office_binary_data.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_body.cpp"
+			RelativePath="..\src\odf\office_body.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_body.h"
+			RelativePath="..\src\odf\office_body.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_chart.cpp"
+			RelativePath="..\src\odf\office_chart.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_chart.h"
+			RelativePath="..\src\odf\office_chart.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_document.cpp"
+			RelativePath="..\src\odf\office_document.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_document.h"
+			RelativePath="..\src\odf\office_document.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_elements.h"
+			RelativePath="..\src\odf\office_elements.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_elements_type.h"
+			RelativePath="..\src\odf\office_elements_type.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_event_listeners.cpp"
+			RelativePath="..\src\odf\office_event_listeners.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_event_listeners.h"
+			RelativePath="..\src\odf\office_event_listeners.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_presentation.cpp"
+			RelativePath="..\src\odf\office_presentation.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_presentation.h"
+			RelativePath="..\src\odf\office_presentation.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_scripts.cpp"
+			RelativePath="..\src\odf\office_scripts.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_scripts.h"
+			RelativePath="..\src\odf\office_scripts.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_settings.cpp"
+			RelativePath="..\src\odf\office_settings.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_settings.h"
+			RelativePath="..\src\odf\office_settings.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_spreadsheet.cpp"
+			RelativePath="..\src\odf\office_spreadsheet.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_spreadsheet.h"
+			RelativePath="..\src\odf\office_spreadsheet.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_text.cpp"
+			RelativePath="..\src\odf\office_text.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\office_text.h"
+			RelativePath="..\src\odf\office_text.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\paragraph_content.h"
+			RelativePath="..\src\odf\paragraph_content.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\paragraph_elements.cpp"
+			RelativePath="..\src\odf\paragraph_elements.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\paragraph_elements.h"
+			RelativePath="..\src\odf\paragraph_elements.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\ruby.cpp"
+			RelativePath="..\src\odf\ruby.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\ruby.h"
+			RelativePath="..\src\odf\ruby.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\search_table_cell.cpp"
+			RelativePath="..\src\odf\search_table_cell.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\search_table_cell.h"
+			RelativePath="..\src\odf\search_table_cell.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\skipelement.cpp"
+			RelativePath="..\src\odf\skipelement.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\skipelement.h"
+			RelativePath="..\src\odf\skipelement.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\style_regions.cpp"
+			RelativePath="..\src\odf\style_regions.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\style_regions.h"
+			RelativePath="..\src\odf\style_regions.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\table.cpp"
+			RelativePath="..\src\odf\table.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\table.h"
+			RelativePath="..\src\odf\table.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\table_calculation_settings.cpp"
+			RelativePath="..\src\odf\table_calculation_settings.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\table_calculation_settings.h"
+			RelativePath="..\src\odf\table_calculation_settings.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\table_docx.cpp"
+			RelativePath="..\src\odf\table_docx.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\table_named_expressions.cpp"
+			RelativePath="..\src\odf\table_named_expressions.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\table_named_expressions.h"
+			RelativePath="..\src\odf\table_named_expressions.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\table_pptx.cpp"
+			RelativePath="..\src\odf\table_pptx.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\table_xlsx.cpp"
+			RelativePath="..\src\odf\table_xlsx.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\text_content.cpp"
+			RelativePath="..\src\odf\text_content.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\text_content.h"
+			RelativePath="..\src\odf\text_content.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\text_elements.cpp"
+			RelativePath="..\src\odf\text_elements.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\text_elements.h"
+			RelativePath="..\src\odf\text_elements.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\odf\visitor.h"
+			RelativePath="..\src\odf\visitor.h"
 			>
 		</File>
 	</Files>
diff --git a/ASCOfficeOdfFile/win32/cpxml.vcproj b/ASCOfficeOdfFile/win32/cpxml.vcproj
index e9deb58fe2..1bbb744dee 100644
--- a/ASCOfficeOdfFile/win32/cpxml.vcproj
+++ b/ASCOfficeOdfFile/win32/cpxml.vcproj
@@ -290,7 +290,7 @@
 			Name="xmllite"
 			>
 			<File
-				RelativePath=".\src\xml\sax_win32_xmllite.cpp"
+				RelativePath="..\src\xml\sax_win32_xmllite.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -302,7 +302,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\src\xml\sax_win32_xmllite.h"
+				RelativePath="..\src\xml\sax_win32_xmllite.h"
 				>
 			</File>
 		</Filter>
@@ -310,44 +310,44 @@
 			Name="include"
 			>
 			<File
-				RelativePath=".\include\cpdoccore\xml\attributes.h"
+				RelativePath="..\include\cpdoccore\xml\attributes.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\cpdoccore\xml\nodetype.h"
+				RelativePath="..\include\cpdoccore\xml\nodetype.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\cpdoccore\xml\sax.h"
+				RelativePath="..\include\cpdoccore\xml\sax.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\cpdoccore\xml\serialize.h"
+				RelativePath="..\include\cpdoccore\xml\serialize.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\cpdoccore\xml\serialize_attributes.h"
+				RelativePath="..\include\cpdoccore\xml\serialize_attributes.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\cpdoccore\xml\simple_xml_writer.h"
+				RelativePath="..\include\cpdoccore\xml\simple_xml_writer.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\cpdoccore\xml\xmlchar.h"
+				RelativePath="..\include\cpdoccore\xml\xmlchar.h"
 				>
 			</File>
 			<File
-				RelativePath=".\include\cpdoccore\xml\xmlelement.h"
+				RelativePath="..\include\cpdoccore\xml\xmlelement.h"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath=".\src\xml\attributes.cpp"
+			RelativePath="..\src\xml\attributes.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\src\xml\precompiled_cpxml.cpp"
+			RelativePath="..\src\xml\precompiled_cpxml.cpp"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -383,11 +383,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath=".\src\xml\precompiled_cpxml.h"
+			RelativePath="..\src\xml\precompiled_cpxml.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\xml\sax.cpp"
+			RelativePath="..\src\xml\sax.cpp"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -399,7 +399,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath=".\src\xml\serialize_attributes.cpp"
+			RelativePath="..\src\xml\serialize_attributes.cpp"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -411,7 +411,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath=".\src\xml\utils.cpp"
+			RelativePath="..\src\xml\utils.cpp"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -423,11 +423,11 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath=".\include\cpdoccore\xml\utils.h"
+			RelativePath="..\include\cpdoccore\xml\utils.h"
 			>
 		</File>
 		<File
-			RelativePath=".\src\xml\xmlchar.cpp"
+			RelativePath="..\src\xml\xmlchar.cpp"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
@@ -439,7 +439,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath=".\src\xml\xmlelement.cpp"
+			RelativePath="..\src\xml\xmlelement.cpp"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
diff --git a/ASCOfficeOdfFile/win32/formulasconvert.vcproj b/ASCOfficeOdfFile/win32/formulasconvert.vcproj
index 57ce386a3e..e081650d19 100644
--- a/ASCOfficeOdfFile/win32/formulasconvert.vcproj
+++ b/ASCOfficeOdfFile/win32/formulasconvert.vcproj
@@ -19,8 +19,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)bin/Debug"
-			IntermediateDirectory="$(SolutionDir)output/$(ConfigurationName)/$(ProjectName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
 			>
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)include&quot;;..\include;..\3dparty\gtest\include\;..\dparty\utf8cpp\include"
+				AdditionalIncludeDirectories=""
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -106,7 +106,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)include&quot;;..\include;..\3dparty\gtest\include\;..\dparty\utf8cpp\include"
+				AdditionalIncludeDirectories=""
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -146,8 +146,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)bin/Release"
-			IntermediateDirectory="$(SolutionDir)output/$(ConfigurationName)/$(ProjectName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
@@ -169,7 +169,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)include&quot;;..\include;..\3dparty\gtest\include\;..\3dparty\utf8cpp\include"
+				AdditionalIncludeDirectories=""
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -231,7 +231,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)include&quot;;..\include;..\3dparty\gtest\include\;..\3dparty\utf8cpp\include"
+				AdditionalIncludeDirectories=""
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -277,11 +277,11 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\src\formulasconvert_odf.cpp"
+				RelativePath="..\formulasconvert\src\formulasconvert_odf.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\src\formulasconvert_oox.cpp"
+				RelativePath="..\formulasconvert\src\formulasconvert_oox.cpp"
 				>
 			</File>
 		</Filter>
@@ -291,7 +291,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\include\cpdoccore\formulasconvert.h"
+				RelativePath="..\formulasconvert\include\cpdoccore\formulasconvert.h"
 				>
 			</File>
 		</Filter>
diff --git a/ASCOfficeOdfFileW/ASCOfficeOdfFileW.h b/ASCOfficeOdfFileW/ASCOfficeOdfFileW.h
index abf6e0cf66..2c0cfdcf2b 100644
--- a/ASCOfficeOdfFileW/ASCOfficeOdfFileW.h
+++ b/ASCOfficeOdfFileW/ASCOfficeOdfFileW.h
@@ -3,12 +3,12 @@
 /* this ALWAYS GENERATED file contains the definitions for the interfaces */
 
 
- /* File created by MIDL compiler version 7.00.0500 */
-/* at Mon Dec 01 19:58:58 2014
+ /* File created by MIDL compiler version 6.00.0366 */
+/* at Wed Apr 08 12:10:42 2015
  */
 /* Compiler settings for .\ASCOfficeOdfFileW.idl:
-    Oicf, W1, Zp8, env=Win32 (32b run)
-    protocol : dce , ms_ext, c_ext
+    Oicf, W1, Zp8, env=Win64 (32b run)
+    protocol : dce , ms_ext, c_ext, robust
     error checks: allocation ref bounds_check enum stub_data 
     VC __declspec() decoration level: 
          __declspec(uuid()), __declspec(selectany), __declspec(novtable)
@@ -21,12 +21,17 @@
 
 /* verify that the <rpcndr.h> version is high enough to compile this file*/
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
-#define __REQUIRED_RPCNDR_H_VERSION__ 440
+#define __REQUIRED_RPCNDR_H_VERSION__ 475
 #endif
 
 #include "rpc.h"
 #include "rpcndr.h"
 
+#ifndef __RPCNDR_H_VERSION__
+#error this stub requires an updated version of <rpcndr.h>
+#endif // __RPCNDR_H_VERSION__
+
+
 #ifndef __ASCOfficeOdfFileW_h__
 #define __ASCOfficeOdfFileW_h__
 
@@ -44,6 +49,8 @@
 extern "C"{
 #endif 
 
+void * __RPC_USER MIDL_user_allocate(size_t);
+void __RPC_USER MIDL_user_free( void * ); 
 
 
 #ifndef __ASCOfficeOdfFileWLib_LIBRARY_DEFINED__
diff --git a/ASCOfficeOdfFileW/ASCOfficeOdfFileW.sln b/ASCOfficeOdfFileW/ASCOfficeOdfFileW.sln
index 15414fc720..5fdebe97e4 100644
--- a/ASCOfficeOdfFileW/ASCOfficeOdfFileW.sln
+++ b/ASCOfficeOdfFileW/ASCOfficeOdfFileW.sln
@@ -9,99 +9,166 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Oox2OdfConverter", "source\Oox2OdfConverter.vcproj", "{BEE01B53-244A-44E6-8947-ED9342D9247E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD} = {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
+		{94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A}
 		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFileWTest", "ASCOfficeOdfFileWTest\ASCOfficeOdfFileWTest.vcproj", "{FBA8446A-150F-4A10-B4DA-1022048D6473}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpformulasconvert", "..\ASCOfficeOdfFile\formulasconvert\formulasconvert.vcproj", "{94954A67-A853-43B1-A727-6EF2774C5A6A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\Common\DocxFormat\Projects\DocxFormat2005.vcproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFileW", "ASCOfficeOdfFileW.vcproj", "{6258296E-ABCE-4BC6-9F4A-8522CD615603}"
 	ProjectSection(ProjectDependencies) = postProject
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
-		{BEE01B53-244A-44E6-8947-ED9342D9247E} = {BEE01B53-244A-44E6-8947-ED9342D9247E}
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
+		{BEE01B53-244A-44E6-8947-ED9342D9247E} = {BEE01B53-244A-44E6-8947-ED9342D9247E}
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\..\branches\Docx2DoctConverter\ServerComponents\Common\DocxFormat\Source\XML\libxml2\win_build\libxml2.vcproj", "{21663823-DE45-479B-91D0-B4FEF4916EF0}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeUtilsLib", "..\..\..\branches\Docx2DoctConverter\ServerComponents\ASCOfficeUtils\ASCOfficeUtilsLib\Win\ASCOfficeUtilsLib.vcproj", "{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FormulasConvert", "..\ASCOfficeOdfFile\win32\formulasconvert.vcproj", "{94954A67-A853-43B1-A727-6EF2774C5A6A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 		ReleaseASC|Win32 = ReleaseASC|Win32
+		ReleaseASC|x64 = ReleaseASC|x64
 		ReleaseOpenSource|Win32 = ReleaseOpenSource|Win32
+		ReleaseOpenSource|x64 = ReleaseOpenSource|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Debug|Win32.Build.0 = Debug|Win32
+		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Debug|x64.ActiveCfg = Debug|x64
+		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Debug|x64.Build.0 = Debug|x64
 		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Release|Win32.ActiveCfg = Release|Win32
 		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Release|Win32.Build.0 = Release|Win32
+		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Release|x64.ActiveCfg = Release|x64
+		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Release|x64.Build.0 = Release|x64
 		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.ReleaseASC|Win32.ActiveCfg = Release|Win32
 		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.ReleaseASC|Win32.Build.0 = Release|Win32
+		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.ReleaseASC|x64.ActiveCfg = Release|Win32
+		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.ReleaseASC|x64.Build.0 = Release|Win32
 		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
 		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
+		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
+		{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.ReleaseOpenSource|x64.Build.0 = Release|Win32
 		{BEE01B53-244A-44E6-8947-ED9342D9247E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BEE01B53-244A-44E6-8947-ED9342D9247E}.Debug|Win32.Build.0 = Debug|Win32
+		{BEE01B53-244A-44E6-8947-ED9342D9247E}.Debug|x64.ActiveCfg = Debug|x64
+		{BEE01B53-244A-44E6-8947-ED9342D9247E}.Debug|x64.Build.0 = Debug|x64
 		{BEE01B53-244A-44E6-8947-ED9342D9247E}.Release|Win32.ActiveCfg = Release|Win32
 		{BEE01B53-244A-44E6-8947-ED9342D9247E}.Release|Win32.Build.0 = Release|Win32
+		{BEE01B53-244A-44E6-8947-ED9342D9247E}.Release|x64.ActiveCfg = Release|x64
+		{BEE01B53-244A-44E6-8947-ED9342D9247E}.Release|x64.Build.0 = Release|x64
 		{BEE01B53-244A-44E6-8947-ED9342D9247E}.ReleaseASC|Win32.ActiveCfg = Release|Win32
 		{BEE01B53-244A-44E6-8947-ED9342D9247E}.ReleaseASC|Win32.Build.0 = Release|Win32
+		{BEE01B53-244A-44E6-8947-ED9342D9247E}.ReleaseASC|x64.ActiveCfg = Release|Win32
+		{BEE01B53-244A-44E6-8947-ED9342D9247E}.ReleaseASC|x64.Build.0 = Release|Win32
 		{BEE01B53-244A-44E6-8947-ED9342D9247E}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
 		{BEE01B53-244A-44E6-8947-ED9342D9247E}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
+		{BEE01B53-244A-44E6-8947-ED9342D9247E}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
+		{BEE01B53-244A-44E6-8947-ED9342D9247E}.ReleaseOpenSource|x64.Build.0 = Release|Win32
 		{FBA8446A-150F-4A10-B4DA-1022048D6473}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FBA8446A-150F-4A10-B4DA-1022048D6473}.Debug|Win32.Build.0 = Debug|Win32
+		{FBA8446A-150F-4A10-B4DA-1022048D6473}.Debug|x64.ActiveCfg = Debug|x64
+		{FBA8446A-150F-4A10-B4DA-1022048D6473}.Debug|x64.Build.0 = Debug|x64
 		{FBA8446A-150F-4A10-B4DA-1022048D6473}.Release|Win32.ActiveCfg = Release|Win32
 		{FBA8446A-150F-4A10-B4DA-1022048D6473}.Release|Win32.Build.0 = Release|Win32
+		{FBA8446A-150F-4A10-B4DA-1022048D6473}.Release|x64.ActiveCfg = Release|x64
+		{FBA8446A-150F-4A10-B4DA-1022048D6473}.Release|x64.Build.0 = Release|x64
 		{FBA8446A-150F-4A10-B4DA-1022048D6473}.ReleaseASC|Win32.ActiveCfg = Release|Win32
 		{FBA8446A-150F-4A10-B4DA-1022048D6473}.ReleaseASC|Win32.Build.0 = Release|Win32
+		{FBA8446A-150F-4A10-B4DA-1022048D6473}.ReleaseASC|x64.ActiveCfg = Release|Win32
+		{FBA8446A-150F-4A10-B4DA-1022048D6473}.ReleaseASC|x64.Build.0 = Release|Win32
 		{FBA8446A-150F-4A10-B4DA-1022048D6473}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
 		{FBA8446A-150F-4A10-B4DA-1022048D6473}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{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}.Release|Win32.ActiveCfg = Release|Win32
-		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|Win32.Build.0 = Release|Win32
-		{94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseASC|Win32.ActiveCfg = Release|Win32
-		{94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseASC|Win32.Build.0 = Release|Win32
-		{94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
+		{FBA8446A-150F-4A10-B4DA-1022048D6473}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
+		{FBA8446A-150F-4A10-B4DA-1022048D6473}.ReleaseOpenSource|x64.Build.0 = Release|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.Build.0 = Debug|Win32
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|x64.ActiveCfg = Debug|x64
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|x64.Build.0 = Debug|x64
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Win32.ActiveCfg = Release|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Win32.Build.0 = Release|Win32
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|x64.ActiveCfg = Release|x64
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|x64.Build.0 = Release|x64
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseASC|Win32.ActiveCfg = ReleaseOpenSource|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseASC|Win32.Build.0 = ReleaseOpenSource|Win32
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseASC|x64.ActiveCfg = ReleaseOpenSource|Win32
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseASC|x64.Build.0 = ReleaseOpenSource|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}.ReleaseOpenSource|x64.Build.0 = ReleaseOpenSource|Win32
 		{6258296E-ABCE-4BC6-9F4A-8522CD615603}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6258296E-ABCE-4BC6-9F4A-8522CD615603}.Debug|Win32.Build.0 = Debug|Win32
+		{6258296E-ABCE-4BC6-9F4A-8522CD615603}.Debug|x64.ActiveCfg = Debug|x64
+		{6258296E-ABCE-4BC6-9F4A-8522CD615603}.Debug|x64.Build.0 = Debug|x64
 		{6258296E-ABCE-4BC6-9F4A-8522CD615603}.Release|Win32.ActiveCfg = Release|Win32
 		{6258296E-ABCE-4BC6-9F4A-8522CD615603}.Release|Win32.Build.0 = Release|Win32
+		{6258296E-ABCE-4BC6-9F4A-8522CD615603}.Release|x64.ActiveCfg = Release|x64
+		{6258296E-ABCE-4BC6-9F4A-8522CD615603}.Release|x64.Build.0 = Release|x64
 		{6258296E-ABCE-4BC6-9F4A-8522CD615603}.ReleaseASC|Win32.ActiveCfg = Release|Win32
 		{6258296E-ABCE-4BC6-9F4A-8522CD615603}.ReleaseASC|Win32.Build.0 = Release|Win32
+		{6258296E-ABCE-4BC6-9F4A-8522CD615603}.ReleaseASC|x64.ActiveCfg = Release|Win32
+		{6258296E-ABCE-4BC6-9F4A-8522CD615603}.ReleaseASC|x64.Build.0 = Release|Win32
 		{6258296E-ABCE-4BC6-9F4A-8522CD615603}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
 		{6258296E-ABCE-4BC6-9F4A-8522CD615603}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
+		{6258296E-ABCE-4BC6-9F4A-8522CD615603}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
+		{6258296E-ABCE-4BC6-9F4A-8522CD615603}.ReleaseOpenSource|x64.Build.0 = 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
+		{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
 		{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseASC|Win32.ActiveCfg = Release|Win32
 		{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseASC|Win32.Build.0 = Release|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseASC|x64.ActiveCfg = Release|Win32
+		{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseASC|x64.Build.0 = 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}.ReleaseOpenSource|x64.Build.0 = Release|Win32
 		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.Build.0 = Debug|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|x64.ActiveCfg = Debug|x64
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|x64.Build.0 = Debug|x64
 		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Win32.ActiveCfg = Release|Win32
 		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Win32.Build.0 = Release|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|x64.ActiveCfg = Release|x64
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|x64.Build.0 = Release|x64
 		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseASC|Win32.ActiveCfg = Release|Win32
 		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseASC|Win32.Build.0 = Release|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseASC|x64.ActiveCfg = Release|Win32
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseASC|x64.Build.0 = 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}.ReleaseOpenSource|x64.Build.0 = Release|Win32
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|Win32.Build.0 = Debug|Win32
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|x64.ActiveCfg = Debug|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|x64.Build.0 = Debug|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|Win32.ActiveCfg = Release|Win32
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|Win32.Build.0 = Release|Win32
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|x64.ActiveCfg = Release|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|x64.Build.0 = Release|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseASC|Win32.ActiveCfg = Release|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseASC|x64.ActiveCfg = Release|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseASC|x64.Build.0 = Release|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
+		{94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseOpenSource|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/ASCOfficeOdfFileW/ASCOfficeOdfFileW.vcproj b/ASCOfficeOdfFileW/ASCOfficeOdfFileW.vcproj
index f33cec79d6..59bf1176a2 100644
--- a/ASCOfficeOdfFileW/ASCOfficeOdfFileW.vcproj
+++ b/ASCOfficeOdfFileW/ASCOfficeOdfFileW.vcproj
@@ -11,13 +11,16 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			UseOfATL="2"
@@ -111,14 +114,108 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			UseOfATL="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
 			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="false"
+				TargetEnvironment="3"
+				GenerateStublessProxies="true"
+				TypeLibraryName="$(IntDir)/ASCOfficeOdfFileW.tlb"
+				HeaderFileName="ASCOfficeOdfFileW.h"
+				DLLDataFileName=""
+				InterfaceIdentifierFileName="ASCOfficeOdfFileW_i.c"
+				ProxyFileName="ASCOfficeOdfFileW_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\ASCOfficeOdfFile\include"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;LIBXML_READER_ENABLED;_USE_XMLLITE_READER_;USE_XMLLITE_READER;_USE_LIBXML2_READER_;STANDALONE_USE=1"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="$(IntDir)"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				RegisterOutput="true"
+				IgnoreImportLibrary="true"
+				LinkIncremental="2"
+				ModuleDefinitionFile=""
+				MergedIDLBaseFileName="_ASCOfficeOdfFileW.idl"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			UseOfATL="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine="..\Redist\VersionControl.exe $(ProjectDir)\version.h"
@@ -149,7 +246,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="..\ASCOfficeOdfFile\include"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;LIBXML_READER_ENABLED;_USE_XMLLITE_READER_;USE_XMLLITE_READER;_USE_LIBXML2_READER_;STANDALONE_USE=0"
+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;BUILD_CONFIG_FULL_VERSION;STANDALONE_USE=0"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
@@ -207,6 +304,102 @@
 				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;../Redist&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			UseOfATL="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="..\Redist\VersionControl.exe $(ProjectDir)\version.h"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="false"
+				TargetEnvironment="3"
+				GenerateStublessProxies="true"
+				TypeLibraryName="$(IntDir)/ASCOfficeOdfFileW.tlb"
+				HeaderFileName="ASCOfficeOdfFileW.h"
+				DLLDataFileName=""
+				InterfaceIdentifierFileName="ASCOfficeOdfFileW_i.c"
+				ProxyFileName="ASCOfficeOdfFileW_p.c"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\ASCOfficeOdfFile\include"
+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;BUILD_CONFIG_FULL_VERSION;STANDALONE_USE=0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="$(IntDir)"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				RegisterOutput="true"
+				IgnoreImportLibrary="true"
+				LinkIncremental="1"
+				ModuleDefinitionFile=""
+				MergedIDLBaseFileName="_ASCOfficeOdfFileW.idl"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;../Redist/x64&quot;&#x0D;&#x0A;"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -239,6 +432,14 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
@@ -247,6 +448,14 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
diff --git a/ASCOfficeOdfFileW/ASCOfficeOdfFileWTest/ASCOfficeOdfFileWTest.vcproj b/ASCOfficeOdfFileW/ASCOfficeOdfFileWTest/ASCOfficeOdfFileWTest.vcproj
index ce86fcba99..7439cb1161 100644
--- a/ASCOfficeOdfFileW/ASCOfficeOdfFileWTest/ASCOfficeOdfFileWTest.vcproj
+++ b/ASCOfficeOdfFileW/ASCOfficeOdfFileWTest/ASCOfficeOdfFileWTest.vcproj
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -165,6 +168,158 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -197,6 +352,22 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
diff --git a/ASCOfficeOdfFileW/source/OdfFormat.vcproj b/ASCOfficeOdfFileW/source/OdfFormat.vcproj
index 4873a29a34..d5bf3ac96d 100644
--- a/ASCOfficeOdfFileW/source/OdfFormat.vcproj
+++ b/ASCOfficeOdfFileW/source/OdfFormat.vcproj
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -144,6 +147,137 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\ASCOfficeOdfFile\include;..\..\ASCOfficeOdfFile\3dparty\utf8cpp\include;..\..\ASCOfficeOdfFile\src\odf\datatypes;.\OdfFormat;..\..\ASCOfficeOdfFile\formulasconvert\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="precompiled_cpodf.h"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\ASCOfficeOdfFile\include;..\..\ASCOfficeOdfFile\3dparty\utf8cpp\include;..\..\ASCOfficeOdfFile\src\odf\datatypes;.\OdfFormat;..\..\ASCOfficeOdfFile\formulasconvert\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="precompiled_cpodf.h"
+				PrecompiledHeaderFile=""
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
diff --git a/ASCOfficeOdfFileW/source/Oox2OdfConverter.vcproj b/ASCOfficeOdfFileW/source/Oox2OdfConverter.vcproj
index d02acd41ac..a7f7b6b905 100644
--- a/ASCOfficeOdfFileW/source/Oox2OdfConverter.vcproj
+++ b/ASCOfficeOdfFileW/source/Oox2OdfConverter.vcproj
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -41,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../ASCOfficeOdfFile/src/odf/datatypes;./OdfFormat;./Oox2OdfConverter;../../Common/DocxFormat/Source;../../Common/DocxFormat/Source/XML;../../ASCOfficeOdfFile\include;../../ASCOfficeOdfFile/3dparty/utf8cpp/include;../../ASCOfficePPTXFile/PPTXFormat/;../Common/DocxFormat/Source/XML/libxml2/XML/include;../"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LIBXML_READER_ENABLED;_USE_XMLLITE_READER_;USE_XMLLITE_READER;_USE_LIBXML2_READER_;_DOCWRAPPER_"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_USE_XMLLITE_READER_;USE_LITE_READER;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;BUILD_CONFIG_FULL_VERSION"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -78,6 +81,70 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../ASCOfficeOdfFile/src/odf/datatypes;./OdfFormat;./Oox2OdfConverter;../../Common/DocxFormat/Source;../../Common/DocxFormat/Source/XML;../../ASCOfficeOdfFile\include;../../ASCOfficeOdfFile/3dparty/utf8cpp/include;../../ASCOfficePPTXFile/PPTXFormat/;../Common/DocxFormat/Source/XML/libxml2/XML/include;../"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_USE_XMLLITE_READER_;USE_LITE_READER;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;BUILD_CONFIG_FULL_VERSION"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
@@ -104,7 +171,69 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="../../ASCOfficeOdfFile/src/odf/datatypes;./OdfFormat;./Oox2OdfConverter;../../Common/DocxFormat/Source;../../Common/DocxFormat/Source/XML;../../ASCOfficeOdfFile\include;../../ASCOfficeOdfFile/3dparty/utf8cpp/include;../../ASCOfficePPTXFile/PPTXFormat/;../Common/DocxFormat/Source/XML/libxml2/XML/include;../"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LIBXML_READER_ENABLED;_USE_XMLLITE_READER_;USE_XMLLITE_READER;_USE_LIBXML2_READER_"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_USE_XMLLITE_READER_;USE_LITE_READER;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;BUILD_CONFIG_FULL_VERSION"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../ASCOfficeOdfFile/src/odf/datatypes;./OdfFormat;./Oox2OdfConverter;../../Common/DocxFormat/Source;../../Common/DocxFormat/Source/XML;../../ASCOfficeOdfFile\include;../../ASCOfficeOdfFile/3dparty/utf8cpp/include;../../ASCOfficePPTXFile/PPTXFormat/;../Common/DocxFormat/Source/XML/libxml2/XML/include;../"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_USE_XMLLITE_READER_;USE_LITE_READER;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;BUILD_CONFIG_FULL_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
@@ -179,6 +308,14 @@
 						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
@@ -187,6 +324,14 @@
 						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\Oox2OdfConverter\stdafx.cpp"
@@ -199,6 +344,14 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
@@ -207,6 +360,14 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\Oox2OdfConverter\VmlShapeTypes2Oox.h"
diff --git a/ASCOfficeOdfFileW/source/Oox2OdfConverter/Converter.h b/ASCOfficeOdfFileW/source/Oox2OdfConverter/Converter.h
index f9a5a985a4..0ad2378d33 100644
--- a/ASCOfficeOdfFileW/source/Oox2OdfConverter/Converter.h
+++ b/ASCOfficeOdfFileW/source/Oox2OdfConverter/Converter.h
@@ -3,11 +3,15 @@
 #include <boost/lexical_cast.hpp>
 #include <cpdoccore/CPOptional.h>
 
-#include <atlcoll.h>
-
-#include "..\..\..\Common\boost_filesystem_version.h"
-#include "..\progressCallback.h"
+#include "../../../Common/boost_filesystem_version.h"
+#include "../progressCallback.h"
 
+#if defined(_WIN32) || defined (_WIN64)
+	#include <atlbase.h>
+	#include <atlstr.h>
+#else
+	#include "../../../Common/DocxFormat/Source/Base/ASCString.h"
+#endif
 
 namespace cpdoccore
 {
diff --git a/ASCOfficeOdfFileW/source/Oox2OdfConverter/stdafx.h b/ASCOfficeOdfFileW/source/Oox2OdfConverter/stdafx.h
index e9a95ed868..34535e173a 100644
--- a/ASCOfficeOdfFileW/source/Oox2OdfConverter/stdafx.h
+++ b/ASCOfficeOdfFileW/source/Oox2OdfConverter/stdafx.h
@@ -12,6 +12,5 @@
 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
 
 #include <atlbase.h>
-#include <atlstr.h>
 
 
diff --git a/ASCOfficeOdfFileW/version.h b/ASCOfficeOdfFileW/version.h
index 27250c6c67..de3bc658b6 100644
--- a/ASCOfficeOdfFileW/version.h
+++ b/ASCOfficeOdfFileW/version.h
@@ -2,6 +2,6 @@
 //1
 //2
 //0
-//176
-#define INTVER 1,2,0,176
-#define STRVER "1,2,0,176\0"
+//187
+#define INTVER 1,2,0,187
+#define STRVER "1,2,0,187\0"