[ios] обновлены проекты для сборки конвертера

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

Common/3dParty/curl/projects/Mac/libcurl.xcodeproj/project.pbxproj

@@ -1262,7 +1262,7 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"/Volumes/trunk/ServerComponents/Common/3dParty/curl/include/**",
+					"$(PROJECT_DIR)/../../**",
 				);
 				OTHER_CFLAGS = (
 					"-DHAVE_CONFIG_H",
@@ -1285,7 +1285,7 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"/Volumes/trunk/ServerComponents/Common/3dParty/curl/include/**",
+					"$(PROJECT_DIR)/../../**",
 				);
 				OTHER_CFLAGS = (
 					"-DHAVE_CONFIG_H",

DesktopEditor/mac_build/metafile/metafile.xcodeproj/project.pbxproj

@@ -1015,7 +1015,7 @@
 		17A762B21B0F35320046BC0B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0630;
+				LastUpgradeCheck = 0640;
 				ORGANIZATIONNAME = "Ascensio System SIA";
 				TargetAttributes = {
 					17A762B91B0F35320046BC0B = {
@@ -1472,6 +1472,7 @@
 		17A762CF1B0F35320046BC0B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -1488,6 +1489,7 @@
 		17A762D01B0F35320046BC0B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,

XlsxSerializerCom/Reader/BinaryWriter.h

@@ -3354,7 +3354,11 @@ namespace BinXlsxRW {
 				int nBinBufferLen = oBufferedStream.GetPosition();
 				int nBase64BufferLen = Base64::Base64EncodeGetRequiredLength(nBinBufferLen, Base64::B64_BASE64_FLAG_NOCRLF);
 				BYTE* pbBase64Buffer = new BYTE[nBase64BufferLen];
+#ifdef _IOS
+                if(true == Base64_1::Base64Encode(pbBinBuffer, nBinBufferLen, pbBase64Buffer, &nBase64BufferLen))
+#else
                 if(true == Base64::Base64Encode(pbBinBuffer, nBinBufferLen, (LPSTR)pbBase64Buffer, &nBase64BufferLen, Base64::B64_BASE64_FLAG_NOCRLF))
+#endif
 				{
 					CFile oFile;
 					oFile.CreateFile(sFileDst);
@@ -3503,7 +3507,11 @@ namespace BinXlsxRW {
 		{
 			int nBase64BufferLen = Base64::Base64EncodeGetRequiredLength(nLength, Base64::B64_BASE64_FLAG_NOCRLF);
 			BYTE* pbBase64Buffer = new BYTE[nBase64BufferLen];
+#ifdef _IOS
+            if(true == Base64_1::Base64Encode(pData, nLength, pbBase64Buffer, &nBase64BufferLen))
+#else
             if(true == Base64::Base64Encode(pData, nLength, (LPSTR)pbBase64Buffer, &nBase64BufferLen, Base64::B64_BASE64_FLAG_NOCRLF))
+#endif
 			{
 				CFile oFile;
 				oFile.CreateFile(sFileOutput);
@@ -3688,7 +3696,11 @@ namespace BinXlsxRW {
 			int nBinBufferLen = oBufferedStream.GetPosition();
 			int nBase64BufferLen = Base64::Base64EncodeGetRequiredLength(nBinBufferLen, Base64::B64_BASE64_FLAG_NOCRLF);
 			BYTE* pbBase64Buffer = new BYTE[nBase64BufferLen];
-            if (true == Base64::Base64Encode(pbBinBuffer, nBinBufferLen, (LPSTR)pbBase64Buffer, &nBase64BufferLen, Base64::B64_BASE64_FLAG_NOCRLF))
+#ifdef _IOS
+            if(true == Base64_1::Base64Encode(pbBinBuffer, nBinBufferLen, pbBase64Buffer, &nBase64BufferLen))
+#else
+            if(true == Base64::Base64Encode(pbBinBuffer, nBinBufferLen, (LPSTR)pbBase64Buffer, &nBase64BufferLen, Base64::B64_BASE64_FLAG_NOCRLF))
+#endif
 			{
 				CFile oFile;
 				oFile.CreateFile(sFileOutput);
@@ -3745,7 +3757,11 @@ namespace BinXlsxRW {
 			int nBinBufferLen = oBufferedStream.GetPosition();
 			int nBase64BufferLen = Base64::Base64EncodeGetRequiredLength(nBinBufferLen, Base64::B64_BASE64_FLAG_NOCRLF);
 			BYTE* pbBase64Buffer = new BYTE[nBase64BufferLen];
+#ifdef _IOS
+            if(true == Base64_1::Base64Encode(pbBinBuffer, nBinBufferLen, pbBase64Buffer, &nBase64BufferLen))
+#else
             if(true == Base64::Base64Encode(pbBinBuffer, nBinBufferLen, (LPSTR)pbBase64Buffer, &nBase64BufferLen, Base64::B64_BASE64_FLAG_NOCRLF))
+#endif
 			{
 				CFile oFile;
 				oFile.CreateFile(sFileOutput);