fixed converter for iOS

ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.h

@@ -40,6 +40,7 @@
 
 #include <vector>
 #include <map>
+#include <string>
 
 #define MAX_STACK_SIZE 1024
 

ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SrgbClr.h

@@ -49,9 +49,13 @@ namespace PPTX
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				std::wstring val = node.GetAttribute(_T("val"));
-				red		= HexString2Int(val.substr(0, 2));
-				green	= HexString2Int(val.substr(2, 2));
-				blue	= HexString2Int(val.substr(4, 2));
+               
+                if (6 == val.length())
+                {
+                    red		= HexString2Int(val.substr(0, 2));
+                    green	= HexString2Int(val.substr(2, 2));
+                    blue	= HexString2Int(val.substr(4, 2));
+                }
 
 				Modifiers.clear();
 				node.LoadArray(_T("*"), Modifiers);

DesktopEditor/xml/mac/libxml2.xcodeproj/project.xcworkspace/contents.xcworkspacedata

+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:libxml2.xcodeproj">
+   </FileRef>
+</Workspace>

DesktopEditor/xml/mac/libxml2/config.h

+/* config.h generated manually for macos.  */
+
+/* Define if you have the strftime function.  */
+#define HAVE_STRFTIME
+
+/* Define if you have the ANSI C header files.  */
+#define STDC_HEADERS
+
+#define PACKAGE
+#define VERSION
+
+#undef HAVE_LIBZ
+#undef HAVE_LIBM
+#undef HAVE_ISINF
+#undef HAVE_ISNAN
+#undef HAVE_LIBHISTORY
+#undef HAVE_LIBREADLINE
+
+#define XML_SOCKLEN_T socklen_t
+#define HAVE_LIBPTHREAD
+#define HAVE_PTHREAD_H
+#define LIBXML_THREAD_ENABLED
+
+/* Define if you have the _stat function.  */
+#define HAVE__STAT
+
+/* Define if you have the class function.  */
+#undef HAVE_CLASS
+
+/* Define if you have the finite function.  */
+#undef HAVE_FINITE
+
+/* Define if you have the fp_class function.  */
+#undef HAVE_FP_CLASS
+
+/* Define if you have the fpclass function.  */
+#undef HAVE_FPCLASS
+
+/* Define if you have the fprintf function.  */
+#define HAVE_FPRINTF
+
+/* Define if you have the isnand function.  */
+#undef HAVE_ISNAND
+
+/* Define if you have the localtime function.  */
+#define HAVE_LOCALTIME
+
+/* Define if you have the printf function.  */
+#define HAVE_PRINTF
+
+/* Define if you have the signal function.  */
+#define HAVE_SIGNAL
+
+/* Define if you have the snprintf function.  */
+#define HAVE_SNPRINTF
+
+/* Define if you have the sprintf function.  */
+#define HAVE_SPRINTF
+
+/* Define if you have the sscanf function.  */
+#define HAVE_SSCANF
+
+/* Define if you have the stat function.  */
+#define HAVE_STAT
+
+/* Define if you have the strdup function.  */
+#define HAVE_STRDUP
+
+/* Define if you have the strerror function.  */
+#define HAVE_STRERROR
+
+/* Define if you have the strftime function.  */
+#define HAVE_STRFTIME
+
+/* Define if you have the strndup function.  */
+#define HAVE_STRNDUP
+
+/* Define if you have the vfprintf function.  */
+#define HAVE_VFPRINTF
+
+/* Define if you have the vsnprintf function.  */
+#define HAVE_VSNPRINTF
+
+/* Define if you have the vsprintf function.  */
+#define HAVE_VSPRINTF
+
+/* Define if you have the <ansidecl.h> header file.  */
+#define HAVE_ANSIDECL_H
+
+/* Define if you have the <arpa/inet.h> header file.  */
+#define HAVE_ARPA_INET_H
+
+/* Define if you have the <ctype.h> header file.  */
+#define HAVE_CTYPE_H
+
+/* Define if you have the <dirent.h> header file.  */
+#define HAVE_DIRENT_H
+
+/* Define if you have the <dlfcn.h> header file.  */
+#define HAVE_DLFCN_H
+
+/* Define if you have the <errno.h> header file.  */
+#define HAVE_ERRNO_H
+
+/* Define if you have the <fcntl.h> header file.  */
+#define HAVE_FCNTL_H
+
+/* Define if you have the <float.h> header file.  */
+#define HAVE_FLOAT_H
+
+/* Define if you have the <fp_class.h> header file.  */
+#define HAVE_FP_CLASS_H
+
+/* Define if you have the <ieeefp.h> header file.  */
+#define HAVE_IEEEFP_H
+
+/* Define if you have the <malloc.h> header file.  */
+#undef HAVE_MALLOC_H
+
+/* Define if you have the <math.h> header file.  */
+#define HAVE_MATH_H
+
+/* Define if you have the <nan.h> header file.  */
+#define HAVE_NAN_H
+
+/* Define if you have the <ndir.h> header file.  */
+#define HAVE_NDIR_H
+
+/* Define if you have the <netdb.h> header file.  */
+#define HAVE_NETDB_H
+
+/* Define if you have the <netinet/in.h> header file.  */
+#define HAVE_NETINET_IN_H
+
+/* Define if you have the <signal.h> header file.  */
+#define HAVE_SIGNAL_H
+
+/* Define if you have the <stdarg.h> header file.  */
+#define HAVE_STDARG_H
+
+/* Define if you have the <stdlib.h> header file.  */
+#define HAVE_STDLIB_H
+
+/* Define if you have the <string.h> header file.  */
+#define HAVE_STRING_H
+
+/* Define if you have the <sys/dir.h> header file.  */
+#define HAVE_SYS_DIR_H
+
+/* Define if you have the <sys/mman.h> header file.  */
+#undef HAVE_SYS_MMAN_H
+
+/* Define if you have the <sys/ndir.h> header file.  */
+#undef HAVE_SYS_NDIR_H
+
+/* Define if you have the <sys/select.h> header file.  */
+#define HAVE_SYS_SELECT_H
+
+/* Define if you have the <sys/socket.h> header file.  */
+#define HAVE_SYS_SOCKET_H
+
+/* Define if you have the <sys/stat.h> header file.  */
+#define HAVE_SYS_STAT_H
+
+/* Define if you have the <sys/time.h> header file.  */
+#define HAVE_SYS_TIME_H
+
+/* Define if you have the <sys/types.h> header file.  */
+#define HAVE_SYS_TYPES_H
+
+/* Define if you have the <time.h> header file.  */
+#define HAVE_TIME_H
+
+/* Define if you have the <unistd.h> header file.  */
+#define HAVE_UNISTD_H
+
+/* Define if you have the <zlib.h> header file.  */
+#undef HAVE_ZLIB_H
+
+/* Name of package */
+#define PACKAGE
+
+/* Version number of package */
+#define VERSION
+
+/* Define if compiler has function prototypes */
+#define PROTOTYPES
+
+#include <libxml/xmlversion.h>
+#include <sys/types.h>
+//#include <extra/stricmp.h>
+//#include <extra/strdup.h>

X2tConverter/build/Mac/X2tConverter/X2tConverter.xcodeproj/project.pbxproj

@@ -24,6 +24,7 @@
 		177C43321AD7C0EF00055DD7 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 177C432F1AD7C0D100055DD7 /* libcurl.a */; };
 		17C8DEC71ACD696100902C85 /* X2tConverter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 17C27A191AC2DB3D00E1D003 /* X2tConverter.mm */; };
 		17C8DECC1ACD696100902C85 /* X2tConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17C27A171AC2DB3D00E1D003 /* X2tConverter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		691A8BD31E2FA68F00DCB54A /* liblibxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 691A8BD01E2FA67E00DCB54A /* liblibxml2.a */; };
 		69415F271CB51C37003E771B /* libOfficeUtils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 69415F241CB51C2A003E771B /* libOfficeUtils.a */; };
 		69415F311CB51D41003E771B /* libASCOfficeDocxFile2Lib_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17E17F5B1AC457CD00BEA2EA /* libASCOfficeDocxFile2Lib_ios.a */; };
 		69415FE01CB52455003E771B /* libmng_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 69415FD41CB5243F003E771B /* libmng_ios.a */; };
@@ -87,6 +88,20 @@
 			remoteGlobalIDString = 17E17EDC1AC453F800BEA2EA;
 			remoteInfo = ASCOfficeDocxFile2Lib;
 		};
+		691A8BCF1E2FA67E00DCB54A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 691A8BCB1E2FA67E00DCB54A /* libxml2.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 69967F581E2F84F100B620CD;
+			remoteInfo = libxml2;
+		};
+		691A8BD11E2FA68900DCB54A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 691A8BCB1E2FA67E00DCB54A /* libxml2.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 69967F571E2F84F100B620CD;
+			remoteInfo = libxml2;
+		};
 		69415F231CB51C2A003E771B /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 69415F1F1CB51C29003E771B /* OfficeUtils.xcodeproj */;
@@ -445,6 +460,7 @@
 		17C27A191AC2DB3D00E1D003 /* X2tConverter.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = X2tConverter.mm; sourceTree = "<group>"; };
 		17C8DED01ACD696100902C85 /* libX2tConverter.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libX2tConverter.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		17E17F561AC457CD00BEA2EA /* ASCOfficeDocxFile2Lib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ASCOfficeDocxFile2Lib.xcodeproj; path = ../../../../ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj; sourceTree = "<group>"; };
+		691A8BCB1E2FA67E00DCB54A /* libxml2.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libxml2.xcodeproj; path = ../../../../DesktopEditor/xml/mac/libxml2.xcodeproj; sourceTree = "<group>"; };
 		69415F1F1CB51C29003E771B /* OfficeUtils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OfficeUtils.xcodeproj; path = ../../../../OfficeUtils/OfficeUtils.xcodeproj; sourceTree = "<group>"; };
 		69415FAE1CB5243F003E771B /* mng.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = mng.xcodeproj; path = ../../../../DesktopEditor/mac_build/cximage/mng/mng.xcodeproj; sourceTree = "<group>"; };
 		69415FB11CB5243F003E771B /* png.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = png.xcodeproj; path = ../../../../DesktopEditor/mac_build/cximage/png/png.xcodeproj; sourceTree = "<group>"; };
@@ -483,6 +499,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				691A8BD31E2FA68F00DCB54A /* liblibxml2.a in Frameworks */,
 				6967B1D11E27B9D700A129E2 /* libRtfFormatLib.a in Frameworks */,
 				6967B10A1E27A41B00A129E2 /* libPdfWriter.a in Frameworks */,
 				6967B0D41E27A36E00A129E2 /* libHtmlFile.a in Frameworks */,
@@ -527,6 +544,7 @@
 		17C27A0B1AC2DB3C00E1D003 = {
 			isa = PBXGroup;
 			children = (
+				691A8BCB1E2FA67E00DCB54A /* libxml2.xcodeproj */,
 				6967B1C91E27B9C400A129E2 /* RtfFormatLib.xcodeproj */,
 				6967B1031E27A41300A129E2 /* PdfWriter.xcodeproj */,
 				6967B0CC1E27A35E00A129E2 /* HtmlFile.xcodeproj */,
@@ -586,6 +604,14 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		691A8BCC1E2FA67E00DCB54A /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				691A8BD01E2FA67E00DCB54A /* liblibxml2.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		69415F201CB51C29003E771B /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -835,6 +861,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				691A8BD21E2FA68900DCB54A /* PBXTargetDependency */,
 				6967B1D01E27B9D000A129E2 /* PBXTargetDependency */,
 				6967B10C1E27A42500A129E2 /* PBXTargetDependency */,
 				6967B0D31E27A36800A129E2 /* PBXTargetDependency */,
@@ -944,6 +971,10 @@
 					ProductGroup = 69415FBB1CB5243F003E771B /* Products */;
 					ProjectRef = 69415FBA1CB5243F003E771B /* libpsd.xcodeproj */;
 				},
+				{
+					ProductGroup = 691A8BCC1E2FA67E00DCB54A /* Products */;
+					ProjectRef = 691A8BCB1E2FA67E00DCB54A /* libxml2.xcodeproj */;
+				},
 				{
 					ProductGroup = 69DA322D1CEE08DC00E10AF0 /* Products */;
 					ProjectRef = 69DA322C1CEE08DC00E10AF0 /* metafile.xcodeproj */;
@@ -1020,6 +1051,13 @@
 			remoteRef = 17E17F5A1AC457CD00BEA2EA /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		691A8BD01E2FA67E00DCB54A /* liblibxml2.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = liblibxml2.a;
+			remoteRef = 691A8BCF1E2FA67E00DCB54A /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		69415F241CB51C2A003E771B /* libOfficeUtils.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1238,6 +1276,11 @@
 			name = ASCOfficeDocxFile2Lib_ios;
 			targetProxy = 17C8DEDB1ACD6A3900902C85 /* PBXContainerItemProxy */;
 		};
+		691A8BD21E2FA68900DCB54A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = libxml2;
+			targetProxy = 691A8BD11E2FA68900DCB54A /* PBXContainerItemProxy */;
+		};
 		69415F261CB51C32003E771B /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = OfficeUtils;
@@ -1488,6 +1531,7 @@
 					/usr/include/libxml2,
 					"$(PROJECT_DIR)/../../../../DesktopEditor/freetype-2.5.2/include",
 					"$(PROJECT_DIR)/../../../../DesktopEditor/agg-2.4/include",
+					"$(PROJECT_DIR)/../../../../Common/3dParty/boost/boost_1_58_0",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1530,6 +1574,7 @@
 					/usr/include/libxml2,
 					"$(PROJECT_DIR)/../../../../DesktopEditor/freetype-2.5.2/include",
 					"$(PROJECT_DIR)/../../../../DesktopEditor/agg-2.4/include",
+					"$(PROJECT_DIR)/../../../../Common/3dParty/boost/boost_1_58_0",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				OTHER_LDFLAGS = "-ObjC";

X2tConverter/test/iosTest/iosTest.xcodeproj/project.pbxproj

@@ -19,6 +19,7 @@
 		17DAB70E1ACC3B96005AF479 /* Demo-Hayden-Management-v2.docx in Resources */ = {isa = PBXBuildFile; fileRef = 17DAB70D1ACC3B90005AF479 /* Demo-Hayden-Management-v2.docx */; };
 		6967BEB31E27D5BE00A129E2 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 6967BEB21E27D5BE00A129E2 /* libiconv.tbd */; };
 		69920A431E016FAB00E7E6EE /* libX2tConverter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 69920A401E016F9700E7E6EE /* libX2tConverter.a */; };
+		699690731E2F925200B620CD /* libc++abi.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 699690721E2F925200B620CD /* libc++abi.tbd */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -56,6 +57,7 @@
 		6905975F1CA137D000000D4D /* X2tConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = X2tConverter.h; path = ../../../build/Mac/X2tConverter/X2tConverter/X2tConverter.h; sourceTree = "<group>"; };
 		6967BEB21E27D5BE00A129E2 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
 		69920A3A1E016F9700E7E6EE /* X2tConverter.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = X2tConverter.xcodeproj; path = ../../build/Mac/X2tConverter/X2tConverter.xcodeproj; sourceTree = "<group>"; };
+		699690721E2F925200B620CD /* libc++abi.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++abi.tbd"; path = "usr/lib/libc++abi.tbd"; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -63,6 +65,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				699690731E2F925200B620CD /* libc++abi.tbd in Frameworks */,
 				6967BEB31E27D5BE00A129E2 /* libiconv.tbd in Frameworks */,
 				69920A431E016FAB00E7E6EE /* libX2tConverter.a in Frameworks */,
 			);
@@ -138,6 +141,7 @@
 		6967BEB11E27D5BE00A129E2 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				699690721E2F925200B620CD /* libc++abi.tbd */,
 				6967BEB21E27D5BE00A129E2 /* libiconv.tbd */,
 			);
 			name = Frameworks;
@@ -318,6 +322,11 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lstdc++",
+					"-lz",
+				);
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -353,6 +362,11 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lstdc++",
+					"-lz",
+				);
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;