stable iOS converter

ASCOfficeDocFile/Common/FormatUtils.h

@@ -505,6 +505,7 @@ namespace DocFormatUtils
 			{
 				STLCollection->push_back(result[i]);
 			}
+            return true;
 		}
 
 		template<class T> static bool GetSTLCollectionFromUtf8( T *STLCollection, unsigned char *bytes, int size)

ASCOfficeDocFile/DocFormatLib/Mac/DocFormatLib.xcodeproj/project.xcworkspace/contents.xcworkspacedata

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

ASCOfficeDocFile/DocFormatLib/Mac/DocFormatLib/NOTE.txt

+DO NOT REMOVE FOLDER FOR XCODE
\ No newline at end of file

ASCOfficeXlsFile2/source/Mac/XlsFormat.xcodeproj/project.xcworkspace/contents.xcworkspacedata

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

ASCOfficeXlsFile2/source/Mac/XlsFormat/NOTE.txt

+DO NOT REMOVE FOLDER FOR XCODE
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Bes.cpp

@@ -82,6 +82,8 @@ const std::wstring Bes::toString()
 	{
 		return Boolean<unsigned char>(bBoolErr);
 	}
+    
+    return L""; // TODO: need fixed
 }
 
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BitMarkedStructs.h

@@ -188,6 +188,8 @@ struct BErr : public BiffStructure_NoVtbl
 			// EXCEPT::RT::WrongBiffRecord("Unsupported type of BErr.", "unknown");
 			break;
 		}
+        
+        return L""; // TODO: need fixed
 	}
 };
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/SerAr.cpp

@@ -66,7 +66,8 @@ SerArPtr SerAr::createSerAr(const unsigned char type)
 		// EXCEPT::RT::WrongBiffRecord("Unsupported type of SerAr.", "SerAr container");
 		break;
 	}
-
+    
+    return NULL; // TODO: need fixed
 }
 
 

HtmlFile/Mac/HtmlFile/HtmlFile.xcodeproj/project.pbxproj

@@ -58,12 +58,20 @@
 		6967B0BF1E27A22E00A129E2 /* HtmlFile */ = {
 			isa = PBXGroup;
 			children = (
-				6967B0C91E27A25D00A129E2 /* HtmlFile.cpp */,
+				6967B1111E27A6E800A129E2 /* xmlutils */,
 				6967B0CA1E27A25D00A129E2 /* HtmlFile.h */,
+				6967B0C91E27A25D00A129E2 /* HtmlFile.cpp */,
 			);
 			path = HtmlFile;
 			sourceTree = "<group>";
 		};
+		6967B1111E27A6E800A129E2 /* xmlutils */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = xmlutils;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -222,8 +230,16 @@
 			buildSettings = {
 				DEVELOPMENT_TEAM = 2WH24U26GJ;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					NOMINMAX,
+					UNICODE,
+					_UNICODE,
+					_USE_LIBXML2_READER_,
+					_USE_XMLLITE_READER_,
+					USE_LITE_READER,
+					LIBXML_READER_ENABLED,
+					MAC,
+					unix,
 					_IOS,
+					NOMINMAX,
 					LINUX,
 				);
 				HEADER_SEARCH_PATHS = (
@@ -243,8 +259,16 @@
 			buildSettings = {
 				DEVELOPMENT_TEAM = 2WH24U26GJ;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					NOMINMAX,
+					UNICODE,
+					_UNICODE,
+					_USE_LIBXML2_READER_,
+					_USE_XMLLITE_READER_,
+					USE_LITE_READER,
+					LIBXML_READER_ENABLED,
+					MAC,
+					unix,
 					_IOS,
+					NOMINMAX,
 					LINUX,
 				);
 				HEADER_SEARCH_PATHS = (

HtmlRenderer/Mac/HtmlRenderer.xcodeproj/project.xcworkspace/contents.xcworkspacedata

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

HtmlRenderer/Mac/HtmlRenderer/NOTE.txt

+DO NOT REMOVE FOLDER FOR XCODE
\ No newline at end of file

HtmlRenderer/src/Document.h

@@ -842,15 +842,15 @@ namespace NSHtmlRenderer
 	// additiaonal params ----------------------------------------------------------------------
         inline HRESULT CommandLong(const LONG& lType, const LONG& lCommand)
         {
-            m_pRenderer->CommandLong(lType, lCommand);
+            return m_pRenderer->CommandLong(lType, lCommand);
         }
         inline HRESULT CommandDouble(const LONG& lType, const double& dCommand)
         {
-            m_pRenderer->CommandDouble(lType, dCommand);
+            return m_pRenderer->CommandDouble(lType, dCommand);
         }
         inline HRESULT CommandString(const LONG& lType, const std::wstring& sCommand)
         {
-            m_pRenderer->CommandString(lType, sCommand);
+            return m_pRenderer->CommandString(lType, sCommand);
         }
 
 	};

HtmlRenderer/src/FontManagerBase.h

@@ -391,13 +391,11 @@ namespace NSHtmlRenderer
                         return sFamilyName.substr(7);
                     }
                 }
-                else
-                {
-                    // Ничего не делаем
-                    return sFamilyName;
-                }
+                
+                // Ничего не делаем
+                return sFamilyName;
             }
-
+            
             void LoadFontParams()
             {
                 // читаем и выставляем все настройки шрифта

PdfReader/Mac/PdfReader.xcodeproj/project.xcworkspace/contents.xcworkspacedata

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

PdfReader/Mac/PdfReader/NOTE.txt

+DO NOT REMOVE FOLDER FOR XCODE
\ No newline at end of file

X2tConverter/build/Mac/X2tConverter/X2tConverter/X2tConverter.h

@@ -29,13 +29,6 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-//
-//  X2tConverter.h
-//  X2tConverter
-//
-//  Created by alexey.musinov on 25.03.15.
-//  Copyright (c) 2015 Ascensio System SIA. All rights reserved.
-//
 
 #import <Foundation/Foundation.h>
 

X2tConverter/src/cextracttools.cpp

@@ -228,6 +228,7 @@ namespace NExtractTools
 
 		return res;
     }
+#ifndef _IOS
     std::wstring getMailMergeXml(const std::wstring& sJsonPath, int nRecordFrom, int nRecordTo, const std::wstring& sField)
     {
         NSStringUtils::CStringBuilder oBuilder;
@@ -369,4 +370,5 @@ namespace NExtractTools
 			sBinTo = sBinFrom;
 		return 0;
     }
+#endif
 }

X2tConverter/src/cextracttools.h

@@ -876,10 +876,12 @@ namespace NExtractTools
 		}
         return true;
 	}
+#ifndef _IOS
     std::wstring getMailMergeXml(const std::wstring& sJsonPath, int nRecordFrom, int nRecordTo, const std::wstring& sField);
     std::wstring getDoctXml(NSDoctRenderer::DoctRendererFormat::FormatFile eFromType, NSDoctRenderer::DoctRendererFormat::FormatFile eToType,
                             const std::wstring& sTFileDir, const std::wstring& sPdfBinFile, const std::wstring& sImagesDirectory,
                             const std::wstring& sThemeDir, int nTopIndex, const std::wstring& sMailMerge, const InputParams& params);
     int apply_changes(const std::wstring &sBinFrom, const std::wstring &sToResult, NSDoctRenderer::DoctRendererFormat::FormatFile eType, const std::wstring &sThemeDir, std::wstring &sBinTo, const InputParams& params);
+#endif
 }
 #endif // CEXTRACTTOOLS_H

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

@@ -17,6 +17,7 @@
 		17DAB6891ACC371F005AF479 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 17DAB6881ACC371F005AF479 /* Images.xcassets */; };
 		17DAB68C1ACC371F005AF479 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17DAB68A1ACC371F005AF479 /* LaunchScreen.xib */; };
 		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 */; };
 /* End PBXBuildFile section */
 
@@ -53,6 +54,7 @@
 		17DAB68B1ACC371F005AF479 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
 		17DAB70D1ACC3B90005AF479 /* Demo-Hayden-Management-v2.docx */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Demo-Hayden-Management-v2.docx"; sourceTree = "<group>"; };
 		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>"; };
 /* End PBXFileReference section */
 
@@ -61,6 +63,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6967BEB31E27D5BE00A129E2 /* libiconv.tbd in Frameworks */,
 				69920A431E016FAB00E7E6EE /* libX2tConverter.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -82,6 +85,7 @@
 				69920A3A1E016F9700E7E6EE /* X2tConverter.xcodeproj */,
 				17DAB67A1ACC371E005AF479 /* iosTest */,
 				17DAB6791ACC371E005AF479 /* Products */,
+				6967BEB11E27D5BE00A129E2 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -131,6 +135,14 @@
 			name = Files;
 			sourceTree = "<group>";
 		};
+		6967BEB11E27D5BE00A129E2 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				6967BEB21E27D5BE00A129E2 /* libiconv.tbd */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		69920A3B1E016F9700E7E6EE /* Products */ = {
 			isa = PBXGroup;
 			children = (

XpsFile/Mac/XpsLib.xcodeproj/project.xcworkspace/contents.xcworkspacedata

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

XpsFile/Mac/XpsLib/NOTE.txt

+DO NOT REMOVE FOLDER FOR XCODE
\ No newline at end of file