Skip to content

O
onlyoffice_core
Commit ce590a4a authored by Alexey.Musinov's avatar Alexey.Musinov
Browse files
Options

fixed converter for iOS

parent e8996474
Show whitespace changes
Inline Side-by-side
Showing with 985 additions and 129 deletions
ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.h
View file @ ce590a4a
......@@ -40,6 +40,7 @@
#include <vector>
#include <map>
#include <string>
#define MAX_STACK_SIZE 1024
......
ASCOfficePPTXFile/PPTXFormat/Logic/Colors/SrgbClr.h
View file @ ce590a4a
......@@ -49,9 +49,13 @@ namespace PPTX
virtual void fromXML(XmlUtils::CXmlNode& node)
{
std::wstring val = node.GetAttribute(_T("val"));
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);
......
Common/DocxFormat/Mac/DocxFormatLib.xcodeproj/project.pbxproj
View file @ ce590a4a
......@@ -22,14 +22,12 @@
17C1FB9F1ACC4250006B99B3 /* Index.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E69FFE1AC4262700F28F8B /* Index.cpp */; };
17C1FBA01ACC4250006B99B3 /* TxtFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A1461AC4262800F28F8B /* TxtFile.cpp */; };
17C1FBA11ACC4250006B99B3 /* SectionProperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A06F1AC4262700F28F8B /* SectionProperty.cpp */; };
17C1FBA21ACC4250006B99B3 /* libxml2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A1931AC4262800F28F8B /* libxml2.cpp */; };
17C1FBA31ACC4250006B99B3 /* Color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E69FF91AC4262700F28F8B /* Color.cpp */; };
17C1FBA41ACC4250006B99B3 /* Docx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0271AC4262700F28F8B /* Docx.cpp */; };
17C1FBA51ACC4250006B99B3 /* ZIndex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0121AC4262700F28F8B /* ZIndex.cpp */; };
17C1FBA61ACC4250006B99B3 /* ParagraphProperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0661AC4262700F28F8B /* ParagraphProperty.cpp */; };
17C1FBA71ACC4250006B99B3 /* NumFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0001AC4262700F28F8B /* NumFormat.cpp */; };
17C1FBA81ACC4250006B99B3 /* SystemUtility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A13D1AC4262800F28F8B /* SystemUtility.cpp */; };
17C1FBA91ACC4250006B99B3 /* FilePosix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A12B1AC4262800F28F8B /* FilePosix.cpp */; };
17C1FBAA1ACC4250006B99B3 /* Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A00E1AC4262700F28F8B /* Utils.cpp */; };
17C1FBAB1ACC4250006B99B3 /* FileFactory_Spreadsheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A1631AC4262800F28F8B /* FileFactory_Spreadsheet.cpp */; };
17C1FBAC1ACC4250006B99B3 /* AlternateContent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0561AC4262700F28F8B /* AlternateContent.cpp */; };
......@@ -41,7 +39,6 @@
17C1FBB21ACC4250006B99B3 /* Vml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0781AC4262700F28F8B /* Vml.cpp */; };
17C1FBB31ACC4250006B99B3 /* unicode_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E69FF31AC4262700F28F8B /* unicode_util.cpp */; };
17C1FBB41ACC4250006B99B3 /* FldSimple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0601AC4262700F28F8B /* FldSimple.cpp */; };
17C1FBB61ACC4250006B99B3 /* DirectoryPosix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A1281AC4262800F28F8B /* DirectoryPosix.cpp */; };
17C1FBB91ACC4250006B99B3 /* Paragraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0641AC4262700F28F8B /* Paragraph.cpp */; };
17C1FBBA1ACC4250006B99B3 /* SimpleTypes_Word.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A00A1AC4262700F28F8B /* SimpleTypes_Word.cpp */; };
17C1FBBB1ACC4250006B99B3 /* MathEquation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A1161AC4262800F28F8B /* MathEquation.cpp */; };
......@@ -86,7 +83,6 @@
17C1FBF01ACC4250006B99B3 /* StringWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6B1EE1AC4263900F28F8B /* StringWriter.h */; };
17C1FBF11ACC4250006B99B3 /* SimpleTypes_OMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A0071AC4262700F28F8B /* SimpleTypes_OMath.h */; };
17C1FBF21ACC4250006B99B3 /* StringOutput.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A1211AC4262800F28F8B /* StringOutput.h */; };
17C1FBF31ACC4250006B99B3 /* libxml2.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A1941AC4262800F28F8B /* libxml2.h */; };
17C1FBF41ACC4250006B99B3 /* Image.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A0861AC4262700F28F8B /* Image.h */; };
17C1FBF51ACC4250006B99B3 /* Dir.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A05E1AC4262700F28F8B /* Dir.h */; };
17C1FBF61ACC4250006B99B3 /* HyperLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A0471AC4262700F28F8B /* HyperLink.h */; };
......@@ -177,7 +173,6 @@
17C1FC5C1ACC4250006B99B3 /* RId.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A08E1AC4262700F28F8B /* RId.h */; };
17C1FC5E1ACC4250006B99B3 /* Shape.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A0711AC4262700F28F8B /* Shape.h */; };
17C1FC5F1ACC4250006B99B3 /* IFileContainer_Spreadsheet.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A1671AC4262800F28F8B /* IFileContainer_Spreadsheet.h */; };
17C1FC601ACC4250006B99B3 /* xmlutils.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6B1F11AC4263900F28F8B /* xmlutils.h */; };
17C1FC611ACC4250006B99B3 /* Image.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A15C1AC4262800F28F8B /* Image.h */; };
17C1FC621ACC4250006B99B3 /* Rels.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A08D1AC4262700F28F8B /* Rels.h */; };
17C1FC631ACC4250006B99B3 /* ASCString.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E69FED1AC4262700F28F8B /* ASCString.h */; };
......@@ -399,9 +394,7 @@
17E6A1221AC4262800F28F8B /* Types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Types.h; sourceTree = "<group>"; };
17E6A1241AC4262800F28F8B /* File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = File.h; sourceTree = "<group>"; };
17E6A1271AC4262800F28F8B /* Directory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Directory.h; sourceTree = "<group>"; };
17E6A1281AC4262800F28F8B /* DirectoryPosix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryPosix.cpp; sourceTree = "<group>"; };
17E6A12A1AC4262800F28F8B /* File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = File.h; sourceTree = "<group>"; };
17E6A12B1AC4262800F28F8B /* FilePosix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FilePosix.cpp; sourceTree = "<group>"; };
17E6A12C1AC4262800F28F8B /* FileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSystem.h; sourceTree = "<group>"; };
17E6A12D1AC4262800F28F8B /* Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Settings.h; sourceTree = "<group>"; };
17E6A13D1AC4262800F28F8B /* SystemUtility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemUtility.cpp; sourceTree = "<group>"; };
......@@ -474,12 +467,9 @@
17E6A18E1AC4262800F28F8B /* WorksheetChildOther.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorksheetChildOther.h; sourceTree = "<group>"; };
17E6A18F1AC4262800F28F8B /* WritingElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WritingElement.h; sourceTree = "<group>"; };
17E6A1901AC4262800F28F8B /* Xlsx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Xlsx.h; sourceTree = "<group>"; };
17E6A1931AC4262800F28F8B /* libxml2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = libxml2.cpp; sourceTree = "<group>"; };
17E6A1941AC4262800F28F8B /* libxml2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libxml2.h; sourceTree = "<group>"; };
17E6B1EE1AC4263900F28F8B /* StringWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringWriter.h; sourceTree = "<group>"; };
17E6B1EF1AC4263900F28F8B /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = "<group>"; };
17E6B1F01AC4263900F28F8B /* XmlSimple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XmlSimple.h; sourceTree = "<group>"; };
17E6B1F11AC4263900F28F8B /* xmlutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlutils.h; sourceTree = "<group>"; };
17E6B3BB1AC4298500F28F8B /* Array.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Array.h; sourceTree = "<group>"; };
17E6B3BC1AC4298500F28F8B /* ASCVariant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASCVariant.h; sourceTree = "<group>"; };
17E6B3BD1AC4298500F28F8B /* Base64.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
......@@ -845,9 +835,7 @@
isa = PBXGroup;
children = (
17E6A1271AC4262800F28F8B /* Directory.h */,
17E6A1281AC4262800F28F8B /* DirectoryPosix.cpp */,
17E6A12A1AC4262800F28F8B /* File.h */,
17E6A12B1AC4262800F28F8B /* FilePosix.cpp */,
17E6A12C1AC4262800F28F8B /* FileSystem.h */,
17E6A12D1AC4262800F28F8B /* Settings.h */,
);
......@@ -1019,24 +1007,13 @@
17E6A1911AC4262800F28F8B /* XML */ = {
isa = PBXGroup;
children = (
17E6A1921AC4262800F28F8B /* libxml2 */,
17E6B1EE1AC4263900F28F8B /* StringWriter.h */,
17E6B1EF1AC4263900F28F8B /* Utils.h */,
17E6B1F01AC4263900F28F8B /* XmlSimple.h */,
17E6B1F11AC4263900F28F8B /* xmlutils.h */,
);
path = XML;
sourceTree = "<group>";
};
17E6A1921AC4262800F28F8B /* libxml2 */ = {
isa = PBXGroup;
children = (
17E6A1931AC4262800F28F8B /* libxml2.cpp */,
17E6A1941AC4262800F28F8B /* libxml2.h */,
);
path = libxml2;
sourceTree = "<group>";
};
17E6B3BA1AC4298500F28F8B /* common */ = {
isa = PBXGroup;
children = (
......@@ -1099,7 +1076,6 @@
17C1FBF01ACC4250006B99B3 /* StringWriter.h in Headers */,
17C1FBF11ACC4250006B99B3 /* SimpleTypes_OMath.h in Headers */,
17C1FBF21ACC4250006B99B3 /* StringOutput.h in Headers */,
17C1FBF31ACC4250006B99B3 /* libxml2.h in Headers */,
17C1FBF41ACC4250006B99B3 /* Image.h in Headers */,
17C1FBF51ACC4250006B99B3 /* Dir.h in Headers */,
17C1FBF61ACC4250006B99B3 /* HyperLink.h in Headers */,
......@@ -1202,7 +1178,6 @@
17C1FC5E1ACC4250006B99B3 /* Shape.h in Headers */,
17C1FC5F1ACC4250006B99B3 /* IFileContainer_Spreadsheet.h in Headers */,
69415F4D1CB51D9E003E771B /* DrawingColors.h in Headers */,
17C1FC601ACC4250006B99B3 /* xmlutils.h in Headers */,
17C1FC611ACC4250006B99B3 /* Image.h in Headers */,
69415F5C1CB51D9E003E771B /* DrawingStyles.h in Headers */,
69415F4B1CB51D9E003E771B /* Drawing3D.h in Headers */,
......@@ -1327,14 +1302,12 @@
17C1FB9F1ACC4250006B99B3 /* Index.cpp in Sources */,
17C1FBA01ACC4250006B99B3 /* TxtFile.cpp in Sources */,
17C1FBA11ACC4250006B99B3 /* SectionProperty.cpp in Sources */,
17C1FBA21ACC4250006B99B3 /* libxml2.cpp in Sources */,
17C1FBA31ACC4250006B99B3 /* Color.cpp in Sources */,
17C1FBA41ACC4250006B99B3 /* Docx.cpp in Sources */,
17C1FBA51ACC4250006B99B3 /* ZIndex.cpp in Sources */,
17C1FBA61ACC4250006B99B3 /* ParagraphProperty.cpp in Sources */,
17C1FBA71ACC4250006B99B3 /* NumFormat.cpp in Sources */,
17C1FBA81ACC4250006B99B3 /* SystemUtility.cpp in Sources */,
17C1FBA91ACC4250006B99B3 /* FilePosix.cpp in Sources */,
17C1FBAA1ACC4250006B99B3 /* Utils.cpp in Sources */,
69415F4E1CB51D9E003E771B /* DrawingCoreInfo.cpp in Sources */,
69415F521CB51D9E003E771B /* DrawingExt.cpp in Sources */,
......@@ -1349,7 +1322,6 @@
17C1FBB21ACC4250006B99B3 /* Vml.cpp in Sources */,
17C1FBB31ACC4250006B99B3 /* unicode_util.cpp in Sources */,
17C1FBB41ACC4250006B99B3 /* FldSimple.cpp in Sources */,
17C1FBB61ACC4250006B99B3 /* DirectoryPosix.cpp in Sources */,
17C1FBB91ACC4250006B99B3 /* Paragraph.cpp in Sources */,
17C1FBBA1ACC4250006B99B3 /* SimpleTypes_Word.cpp in Sources */,
17C1FBBB1ACC4250006B99B3 /* MathEquation.cpp in Sources */,
......
DesktopEditor/xml/mac/libxml2.xcodeproj/project.pbxproj 0 → 100644
View file @ ce590a4a
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
69967F6B1E2F861500B620CD /* xmldom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69967F681E2F861500B620CD /* xmldom.cpp */; };
69967F6C1E2F861500B620CD /* xmllight.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69967F691E2F861500B620CD /* xmllight.cpp */; };
69968FB41E2F862E00B620CD /* buf.c in Sources */ = {isa = PBXBuildFile; fileRef = 69967F751E2F862100B620CD /* buf.c */; };
69968FB51E2F862E00B620CD /* c14n.c in Sources */ = {isa = PBXBuildFile; fileRef = 69967F781E2F862100B620CD /* c14n.c */; };
69968FB61E2F862E00B620CD /* catalog.c in Sources */ = {isa = PBXBuildFile; fileRef = 69967F791E2F862100B620CD /* catalog.c */; };
69968FB71E2F862E00B620CD /* chvalid.c in Sources */ = {isa = PBXBuildFile; fileRef = 69967F801E2F862100B620CD /* chvalid.c */; };
69968FB81E2F862E00B620CD /* debugXML.c in Sources */ = {isa = PBXBuildFile; fileRef = 69967F861E2F862100B620CD /* debugXML.c */; };
69968FB91E2F862E00B620CD /* dict.c in Sources */ = {isa = PBXBuildFile; fileRef = 69967F871E2F862100B620CD /* dict.c */; };
69968FCF1E2F862E00B620CD /* DOCBparser.c in Sources */ = {isa = PBXBuildFile; fileRef = 699680CE1E2F862100B620CD /* DOCBparser.c */; };
69968FD01E2F862E00B620CD /* encoding.c in Sources */ = {isa = PBXBuildFile; fileRef = 699680D11E2F862100B620CD /* encoding.c */; };
69968FD11E2F862E00B620CD /* entities.c in Sources */ = {isa = PBXBuildFile; fileRef = 699680D21E2F862100B620CD /* entities.c */; };
69968FD21E2F862E00B620CD /* error.c in Sources */ = {isa = PBXBuildFile; fileRef = 699680D31E2F862100B620CD /* error.c */; };
69968FD41E2F862E00B620CD /* globals.c in Sources */ = {isa = PBXBuildFile; fileRef = 699680DC1E2F862100B620CD /* globals.c */; };
69968FD51E2F862E00B620CD /* hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 699680DE1E2F862100B620CD /* hash.c */; };
69968FD61E2F862E00B620CD /* HTMLparser.c in Sources */ = {isa = PBXBuildFile; fileRef = 699680DF1E2F862100B620CD /* HTMLparser.c */; };
69968FD71E2F862E00B620CD /* HTMLtree.c in Sources */ = {isa = PBXBuildFile; fileRef = 699680E01E2F862100B620CD /* HTMLtree.c */; };
69968FD81E2F862E00B620CD /* legacy.c in Sources */ = {isa = PBXBuildFile; fileRef = 699681191E2F862100B620CD /* legacy.c */; };
69968FD91E2F862E00B620CD /* list.c in Sources */ = {isa = PBXBuildFile; fileRef = 699681221E2F862100B620CD /* list.c */; };
69968FDE1E2F862E00B620CD /* parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 699681371E2F862100B620CD /* parser.c */; };
69968FDF1E2F862E00B620CD /* parserInternals.c in Sources */ = {isa = PBXBuildFile; fileRef = 699681381E2F862100B620CD /* parserInternals.c */; };
69968FE01E2F862E00B620CD /* pattern.c in Sources */ = {isa = PBXBuildFile; fileRef = 699681391E2F862100B620CD /* pattern.c */; };
69968FE31E2F862E00B620CD /* relaxng.c in Sources */ = {isa = PBXBuildFile; fileRef = 699681811E2F862200B620CD /* relaxng.c */; };
69968FE81E2F862F00B620CD /* SAX.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968A351E2F862900B620CD /* SAX.c */; };
69968FE91E2F862F00B620CD /* SAX2.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968A361E2F862A00B620CD /* SAX2.c */; };
699690031E2F862F00B620CD /* threads.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968F661E2F862D00B620CD /* threads.c */; };
699690081E2F862F00B620CD /* uri.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968F731E2F862D00B620CD /* uri.c */; };
699690091E2F862F00B620CD /* valid.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968F741E2F862D00B620CD /* valid.c */; };
6996900B1E2F862F00B620CD /* xinclude.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968F991E2F862D00B620CD /* xinclude.c */; };
6996900C1E2F862F00B620CD /* xlink.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968F9A1E2F862D00B620CD /* xlink.c */; };
6996900E1E2F862F00B620CD /* xmlIO.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968F9F1E2F862E00B620CD /* xmlIO.c */; };
699690101E2F862F00B620CD /* xmlmemory.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968FA11E2F862E00B620CD /* xmlmemory.c */; };
699690111E2F862F00B620CD /* xmlmodule.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968FA21E2F862E00B620CD /* xmlmodule.c */; };
699690131E2F862F00B620CD /* xmlregexp.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968FA41E2F862E00B620CD /* xmlregexp.c */; };
699690141E2F862F00B620CD /* xmlsave.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968FA51E2F862E00B620CD /* xmlsave.c */; };
699690151E2F862F00B620CD /* xmlschemas.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968FA61E2F862E00B620CD /* xmlschemas.c */; };
699690161E2F862F00B620CD /* xmlschemastypes.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968FA71E2F862E00B620CD /* xmlschemastypes.c */; };
699690171E2F862F00B620CD /* xmlstring.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968FA81E2F862E00B620CD /* xmlstring.c */; };
699690181E2F862F00B620CD /* xmlunicode.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968FA91E2F862E00B620CD /* xmlunicode.c */; };
699690191E2F862F00B620CD /* xmlwriter.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968FAA1E2F862E00B620CD /* xmlwriter.c */; };
6996901A1E2F862F00B620CD /* xpath.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968FAB1E2F862E00B620CD /* xpath.c */; };
6996901B1E2F862F00B620CD /* xpointer.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968FAC1E2F862E00B620CD /* xpointer.c */; };
6996901C1E2F862F00B620CD /* xzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 69968FB21E2F862E00B620CD /* xzlib.c */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
69967F561E2F84F100B620CD /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "include/$(PRODUCT_NAME)";
dstSubfolderSpec = 16;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
69967F581E2F84F100B620CD /* liblibxml2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblibxml2.a; sourceTree = BUILT_PRODUCTS_DIR; };
69967F641E2F859D00B620CD /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
69967F661E2F861000B620CD /* xmlutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlutils.h; sourceTree = "<group>"; };
69967F681E2F861500B620CD /* xmldom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xmldom.cpp; sourceTree = "<group>"; };
69967F691E2F861500B620CD /* xmllight.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xmllight.cpp; sourceTree = "<group>"; };
69967F751E2F862100B620CD /* buf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = buf.c; sourceTree = "<group>"; };
69967F761E2F862100B620CD /* buf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = buf.h; sourceTree = "<group>"; };
69967F781E2F862100B620CD /* c14n.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = c14n.c; sourceTree = "<group>"; };
69967F791E2F862100B620CD /* catalog.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = catalog.c; sourceTree = "<group>"; };
69967F801E2F862100B620CD /* chvalid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = chvalid.c; sourceTree = "<group>"; };
69967F861E2F862100B620CD /* debugXML.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = debugXML.c; sourceTree = "<group>"; };
69967F871E2F862100B620CD /* dict.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dict.c; sourceTree = "<group>"; };
699680CE1E2F862100B620CD /* DOCBparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = DOCBparser.c; sourceTree = "<group>"; };
699680CF1E2F862100B620CD /* elfgcchack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = elfgcchack.h; sourceTree = "<group>"; };
699680D01E2F862100B620CD /* enc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = enc.h; sourceTree = "<group>"; };
699680D11E2F862100B620CD /* encoding.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = encoding.c; sourceTree = "<group>"; };
699680D21E2F862100B620CD /* entities.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = entities.c; sourceTree = "<group>"; };
699680D31E2F862100B620CD /* error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = error.c; sourceTree = "<group>"; };
699680DC1E2F862100B620CD /* globals.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = globals.c; sourceTree = "<group>"; };
699680DE1E2F862100B620CD /* hash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hash.c; sourceTree = "<group>"; };
699680DF1E2F862100B620CD /* HTMLparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = HTMLparser.c; sourceTree = "<group>"; };
699680E01E2F862100B620CD /* HTMLtree.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = HTMLtree.c; sourceTree = "<group>"; };
699680E31E2F862100B620CD /* c14n.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c14n.h; sourceTree = "<group>"; };
699680E41E2F862100B620CD /* catalog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = catalog.h; sourceTree = "<group>"; };
699680E51E2F862100B620CD /* chvalid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chvalid.h; sourceTree = "<group>"; };
699680E61E2F862100B620CD /* debugXML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugXML.h; sourceTree = "<group>"; };
699680E71E2F862100B620CD /* dict.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dict.h; sourceTree = "<group>"; };
699680E81E2F862100B620CD /* DOCBparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOCBparser.h; sourceTree = "<group>"; };
699680E91E2F862100B620CD /* encoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = encoding.h; sourceTree = "<group>"; };
699680EA1E2F862100B620CD /* entities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = entities.h; sourceTree = "<group>"; };
699680EB1E2F862100B620CD /* globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = globals.h; sourceTree = "<group>"; };
699680EC1E2F862100B620CD /* hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hash.h; sourceTree = "<group>"; };
699680ED1E2F862100B620CD /* HTMLparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLparser.h; sourceTree = "<group>"; };
699680EE1E2F862100B620CD /* HTMLtree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLtree.h; sourceTree = "<group>"; };
699680EF1E2F862100B620CD /* list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = list.h; sourceTree = "<group>"; };
699680F31E2F862100B620CD /* parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parser.h; sourceTree = "<group>"; };
699680F41E2F862100B620CD /* parserInternals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parserInternals.h; sourceTree = "<group>"; };
699680F51E2F862100B620CD /* pattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pattern.h; sourceTree = "<group>"; };
699680F61E2F862100B620CD /* relaxng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = relaxng.h; sourceTree = "<group>"; };
699680F71E2F862100B620CD /* SAX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAX.h; sourceTree = "<group>"; };
699680F81E2F862100B620CD /* SAX2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAX2.h; sourceTree = "<group>"; };
699680F91E2F862100B620CD /* schemasInternals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = schemasInternals.h; sourceTree = "<group>"; };
699680FB1E2F862100B620CD /* threads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = threads.h; sourceTree = "<group>"; };
699680FC1E2F862100B620CD /* tree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tree.h; sourceTree = "<group>"; };
699680FD1E2F862100B620CD /* uri.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uri.h; sourceTree = "<group>"; };
699680FE1E2F862100B620CD /* valid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = valid.h; sourceTree = "<group>"; };
699680FF1E2F862100B620CD /* xinclude.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xinclude.h; sourceTree = "<group>"; };
699681001E2F862100B620CD /* xlink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xlink.h; sourceTree = "<group>"; };
699681011E2F862100B620CD /* xmlautomata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlautomata.h; sourceTree = "<group>"; };
699681021E2F862100B620CD /* xmlerror.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlerror.h; sourceTree = "<group>"; };
699681031E2F862100B620CD /* xmlexports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlexports.h; sourceTree = "<group>"; };
699681041E2F862100B620CD /* xmlIO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlIO.h; sourceTree = "<group>"; };
699681051E2F862100B620CD /* xmlmemory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlmemory.h; sourceTree = "<group>"; };
699681061E2F862100B620CD /* xmlmodule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlmodule.h; sourceTree = "<group>"; };
699681071E2F862100B620CD /* xmlreader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlreader.h; sourceTree = "<group>"; };
699681081E2F862100B620CD /* xmlregexp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlregexp.h; sourceTree = "<group>"; };
699681091E2F862100B620CD /* xmlsave.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlsave.h; sourceTree = "<group>"; };
6996810A1E2F862100B620CD /* xmlschemas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlschemas.h; sourceTree = "<group>"; };
6996810B1E2F862100B620CD /* xmlschemastypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlschemastypes.h; sourceTree = "<group>"; };
6996810C1E2F862100B620CD /* xmlstring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlstring.h; sourceTree = "<group>"; };
6996810D1E2F862100B620CD /* xmlunicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlunicode.h; sourceTree = "<group>"; };
6996810E1E2F862100B620CD /* xmlversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlversion.h; sourceTree = "<group>"; };
699681111E2F862100B620CD /* xmlwriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlwriter.h; sourceTree = "<group>"; };
699681121E2F862100B620CD /* xpath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xpath.h; sourceTree = "<group>"; };
699681131E2F862100B620CD /* xpathInternals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xpathInternals.h; sourceTree = "<group>"; };
699681141E2F862100B620CD /* xpointer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xpointer.h; sourceTree = "<group>"; };
699681191E2F862100B620CD /* legacy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = legacy.c; sourceTree = "<group>"; };
6996811D1E2F862100B620CD /* libxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libxml.h; sourceTree = "<group>"; };
699681221E2F862100B620CD /* list.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = list.c; sourceTree = "<group>"; };
699681371E2F862100B620CD /* parser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parser.c; sourceTree = "<group>"; };
699681381E2F862100B620CD /* parserInternals.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parserInternals.c; sourceTree = "<group>"; };
699681391E2F862100B620CD /* pattern.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pattern.c; sourceTree = "<group>"; };
699681811E2F862200B620CD /* relaxng.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = relaxng.c; sourceTree = "<group>"; };
69968A341E2F862900B620CD /* save.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = save.h; sourceTree = "<group>"; };
69968A351E2F862900B620CD /* SAX.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SAX.c; sourceTree = "<group>"; };
69968A361E2F862A00B620CD /* SAX2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SAX2.c; sourceTree = "<group>"; };
69968F661E2F862D00B620CD /* threads.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = threads.c; sourceTree = "<group>"; };
69968F731E2F862D00B620CD /* uri.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uri.c; sourceTree = "<group>"; };
69968F741E2F862D00B620CD /* valid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = valid.c; sourceTree = "<group>"; };
69968F991E2F862D00B620CD /* xinclude.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xinclude.c; sourceTree = "<group>"; };
69968F9A1E2F862D00B620CD /* xlink.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xlink.c; sourceTree = "<group>"; };
69968F9F1E2F862E00B620CD /* xmlIO.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xmlIO.c; sourceTree = "<group>"; };
69968FA11E2F862E00B620CD /* xmlmemory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xmlmemory.c; sourceTree = "<group>"; };
69968FA21E2F862E00B620CD /* xmlmodule.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xmlmodule.c; sourceTree = "<group>"; };
69968FA41E2F862E00B620CD /* xmlregexp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xmlregexp.c; sourceTree = "<group>"; };
69968FA51E2F862E00B620CD /* xmlsave.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xmlsave.c; sourceTree = "<group>"; };
69968FA61E2F862E00B620CD /* xmlschemas.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xmlschemas.c; sourceTree = "<group>"; };
69968FA71E2F862E00B620CD /* xmlschemastypes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xmlschemastypes.c; sourceTree = "<group>"; };
69968FA81E2F862E00B620CD /* xmlstring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xmlstring.c; sourceTree = "<group>"; };
69968FA91E2F862E00B620CD /* xmlunicode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xmlunicode.c; sourceTree = "<group>"; };
69968FAA1E2F862E00B620CD /* xmlwriter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xmlwriter.c; sourceTree = "<group>"; };
69968FAB1E2F862E00B620CD /* xpath.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xpath.c; sourceTree = "<group>"; };
69968FAC1E2F862E00B620CD /* xpointer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xpointer.c; sourceTree = "<group>"; };
69968FB21E2F862E00B620CD /* xzlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xzlib.c; sourceTree = "<group>"; };
69968FB31E2F862E00B620CD /* xzlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xzlib.h; sourceTree = "<group>"; };
699690521E2F8CA200B620CD /* xmllight_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmllight_private.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
69967F551E2F84F100B620CD /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
69967F4F1E2F84F100B620CD = {
isa = PBXGroup;
children = (
69967F5A1E2F84F100B620CD /* libxml2 */,
69967F591E2F84F100B620CD /* Products */,
);
sourceTree = "<group>";
};
69967F591E2F84F100B620CD /* Products */ = {
isa = PBXGroup;
children = (
69967F581E2F84F100B620CD /* liblibxml2.a */,
);
name = Products;
sourceTree = "<group>";
};
69967F5A1E2F84F100B620CD /* libxml2 */ = {
isa = PBXGroup;
children = (
69967F641E2F859D00B620CD /* config.h */,
69967F6D1E2F862100B620CD /* libxml2 */,
69967F651E2F861000B620CD /* include */,
69967F671E2F861500B620CD /* src */,
);
path = libxml2;
sourceTree = "<group>";
};
69967F651E2F861000B620CD /* include */ = {
isa = PBXGroup;
children = (
69967F661E2F861000B620CD /* xmlutils.h */,
);
name = include;
path = ../../include;
sourceTree = "<group>";
};
69967F671E2F861500B620CD /* src */ = {
isa = PBXGroup;
children = (
69967F681E2F861500B620CD /* xmldom.cpp */,
69967F691E2F861500B620CD /* xmllight.cpp */,
699690521E2F8CA200B620CD /* xmllight_private.h */,
);
name = src;
path = ../../src;
sourceTree = "<group>";
};
69967F6D1E2F862100B620CD /* libxml2 */ = {
isa = PBXGroup;
children = (
699680E11E2F862100B620CD /* include */,
69967F751E2F862100B620CD /* buf.c */,
69967F761E2F862100B620CD /* buf.h */,
69967F781E2F862100B620CD /* c14n.c */,
69967F791E2F862100B620CD /* catalog.c */,
69967F801E2F862100B620CD /* chvalid.c */,
69967F861E2F862100B620CD /* debugXML.c */,
69967F871E2F862100B620CD /* dict.c */,
699680CE1E2F862100B620CD /* DOCBparser.c */,
699680CF1E2F862100B620CD /* elfgcchack.h */,
699680D01E2F862100B620CD /* enc.h */,
699680D11E2F862100B620CD /* encoding.c */,
699680D21E2F862100B620CD /* entities.c */,
699680D31E2F862100B620CD /* error.c */,
699680DC1E2F862100B620CD /* globals.c */,
699680DE1E2F862100B620CD /* hash.c */,
699680DF1E2F862100B620CD /* HTMLparser.c */,
699680E01E2F862100B620CD /* HTMLtree.c */,
699681191E2F862100B620CD /* legacy.c */,
6996811D1E2F862100B620CD /* libxml.h */,
699681221E2F862100B620CD /* list.c */,
699681371E2F862100B620CD /* parser.c */,
699681381E2F862100B620CD /* parserInternals.c */,
699681391E2F862100B620CD /* pattern.c */,
699681811E2F862200B620CD /* relaxng.c */,
69968A341E2F862900B620CD /* save.h */,
69968A351E2F862900B620CD /* SAX.c */,
69968A361E2F862A00B620CD /* SAX2.c */,
69968F661E2F862D00B620CD /* threads.c */,
69968F731E2F862D00B620CD /* uri.c */,
69968F741E2F862D00B620CD /* valid.c */,
69968F991E2F862D00B620CD /* xinclude.c */,
69968F9A1E2F862D00B620CD /* xlink.c */,
69968F9F1E2F862E00B620CD /* xmlIO.c */,
69968FA11E2F862E00B620CD /* xmlmemory.c */,
69968FA21E2F862E00B620CD /* xmlmodule.c */,
69968FA41E2F862E00B620CD /* xmlregexp.c */,
69968FA51E2F862E00B620CD /* xmlsave.c */,
69968FA61E2F862E00B620CD /* xmlschemas.c */,
69968FA71E2F862E00B620CD /* xmlschemastypes.c */,
69968FA81E2F862E00B620CD /* xmlstring.c */,
69968FA91E2F862E00B620CD /* xmlunicode.c */,
69968FAA1E2F862E00B620CD /* xmlwriter.c */,
69968FAB1E2F862E00B620CD /* xpath.c */,
69968FAC1E2F862E00B620CD /* xpointer.c */,
69968FB21E2F862E00B620CD /* xzlib.c */,
69968FB31E2F862E00B620CD /* xzlib.h */,
);
name = libxml2;
path = ../../libxml2;
sourceTree = "<group>";
};
699680E11E2F862100B620CD /* include */ = {
isa = PBXGroup;
children = (
699680E21E2F862100B620CD /* libxml */,
);
path = include;
sourceTree = "<group>";
};
699680E21E2F862100B620CD /* libxml */ = {
isa = PBXGroup;
children = (
699680E31E2F862100B620CD /* c14n.h */,
699680E41E2F862100B620CD /* catalog.h */,
699680E51E2F862100B620CD /* chvalid.h */,
699680E61E2F862100B620CD /* debugXML.h */,
699680E71E2F862100B620CD /* dict.h */,
699680E81E2F862100B620CD /* DOCBparser.h */,
699680E91E2F862100B620CD /* encoding.h */,
699680EA1E2F862100B620CD /* entities.h */,
699680EB1E2F862100B620CD /* globals.h */,
699680EC1E2F862100B620CD /* hash.h */,
699680ED1E2F862100B620CD /* HTMLparser.h */,
699680EE1E2F862100B620CD /* HTMLtree.h */,
699680EF1E2F862100B620CD /* list.h */,
699680F31E2F862100B620CD /* parser.h */,
699680F41E2F862100B620CD /* parserInternals.h */,
699680F51E2F862100B620CD /* pattern.h */,
699680F61E2F862100B620CD /* relaxng.h */,
699680F71E2F862100B620CD /* SAX.h */,
699680F81E2F862100B620CD /* SAX2.h */,
699680F91E2F862100B620CD /* schemasInternals.h */,
699680FB1E2F862100B620CD /* threads.h */,
699680FC1E2F862100B620CD /* tree.h */,
699680FD1E2F862100B620CD /* uri.h */,
699680FE1E2F862100B620CD /* valid.h */,
699680FF1E2F862100B620CD /* xinclude.h */,
699681001E2F862100B620CD /* xlink.h */,
699681011E2F862100B620CD /* xmlautomata.h */,
699681021E2F862100B620CD /* xmlerror.h */,
699681031E2F862100B620CD /* xmlexports.h */,
699681041E2F862100B620CD /* xmlIO.h */,
699681051E2F862100B620CD /* xmlmemory.h */,
699681061E2F862100B620CD /* xmlmodule.h */,
699681071E2F862100B620CD /* xmlreader.h */,
699681081E2F862100B620CD /* xmlregexp.h */,
699681091E2F862100B620CD /* xmlsave.h */,
6996810A1E2F862100B620CD /* xmlschemas.h */,
6996810B1E2F862100B620CD /* xmlschemastypes.h */,
6996810C1E2F862100B620CD /* xmlstring.h */,
6996810D1E2F862100B620CD /* xmlunicode.h */,
6996810E1E2F862100B620CD /* xmlversion.h */,
699681111E2F862100B620CD /* xmlwriter.h */,
699681121E2F862100B620CD /* xpath.h */,
699681131E2F862100B620CD /* xpathInternals.h */,
699681141E2F862100B620CD /* xpointer.h */,
);
path = libxml;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
69967F571E2F84F100B620CD /* libxml2 */ = {
isa = PBXNativeTarget;
buildConfigurationList = 69967F611E2F84F100B620CD /* Build configuration list for PBXNativeTarget "libxml2" */;
buildPhases = (
69967F541E2F84F100B620CD /* Sources */,
69967F551E2F84F100B620CD /* Frameworks */,
69967F561E2F84F100B620CD /* CopyFiles */,
);
buildRules = (
);
dependencies = (
);
name = libxml2;
productName = libxml2;
productReference = 69967F581E2F84F100B620CD /* liblibxml2.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
69967F501E2F84F100B620CD /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0820;
ORGANIZATIONNAME = OnlyOffce;
TargetAttributes = {
69967F571E2F84F100B620CD = {
CreatedOnToolsVersion = 8.2;
DevelopmentTeam = 2WH24U26GJ;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = 69967F531E2F84F100B620CD /* Build configuration list for PBXProject "libxml2" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
en,
);
mainGroup = 69967F4F1E2F84F100B620CD;
productRefGroup = 69967F591E2F84F100B620CD /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
69967F571E2F84F100B620CD /* libxml2 */,
);
};
/* End PBXProject section */
/* Begin PBXSourcesBuildPhase section */
69967F541E2F84F100B620CD /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
6996900E1E2F862F00B620CD /* xmlIO.c in Sources */,
6996901C1E2F862F00B620CD /* xzlib.c in Sources */,
69968FD11E2F862E00B620CD /* entities.c in Sources */,
6996901B1E2F862F00B620CD /* xpointer.c in Sources */,
69968FD61E2F862E00B620CD /* HTMLparser.c in Sources */,
699690181E2F862F00B620CD /* xmlunicode.c in Sources */,
69968FD21E2F862E00B620CD /* error.c in Sources */,
69968FD51E2F862E00B620CD /* hash.c in Sources */,
699690101E2F862F00B620CD /* xmlmemory.c in Sources */,
69968FDE1E2F862E00B620CD /* parser.c in Sources */,
69968FB41E2F862E00B620CD /* buf.c in Sources */,
69968FE31E2F862E00B620CD /* relaxng.c in Sources */,
6996900C1E2F862F00B620CD /* xlink.c in Sources */,
69968FB61E2F862E00B620CD /* catalog.c in Sources */,
699690191E2F862F00B620CD /* xmlwriter.c in Sources */,
69968FE01E2F862E00B620CD /* pattern.c in Sources */,
69968FB51E2F862E00B620CD /* c14n.c in Sources */,
699690141E2F862F00B620CD /* xmlsave.c in Sources */,
69968FB91E2F862E00B620CD /* dict.c in Sources */,
6996900B1E2F862F00B620CD /* xinclude.c in Sources */,
699690151E2F862F00B620CD /* xmlschemas.c in Sources */,
699690091E2F862F00B620CD /* valid.c in Sources */,
69968FCF1E2F862E00B620CD /* DOCBparser.c in Sources */,
69968FB71E2F862E00B620CD /* chvalid.c in Sources */,
69968FD41E2F862E00B620CD /* globals.c in Sources */,
699690031E2F862F00B620CD /* threads.c in Sources */,
69967F6C1E2F861500B620CD /* xmllight.cpp in Sources */,
69968FE81E2F862F00B620CD /* SAX.c in Sources */,
69968FB81E2F862E00B620CD /* debugXML.c in Sources */,
69968FDF1E2F862E00B620CD /* parserInternals.c in Sources */,
699690131E2F862F00B620CD /* xmlregexp.c in Sources */,
69968FD81E2F862E00B620CD /* legacy.c in Sources */,
69967F6B1E2F861500B620CD /* xmldom.cpp in Sources */,
69968FD01E2F862E00B620CD /* encoding.c in Sources */,
69968FD91E2F862E00B620CD /* list.c in Sources */,
699690111E2F862F00B620CD /* xmlmodule.c in Sources */,
699690161E2F862F00B620CD /* xmlschemastypes.c in Sources */,
69968FD71E2F862E00B620CD /* HTMLtree.c in Sources */,
699690171E2F862F00B620CD /* xmlstring.c in Sources */,
69968FE91E2F862F00B620CD /* SAX2.c in Sources */,
6996901A1E2F862F00B620CD /* xpath.c in Sources */,
699690081E2F862F00B620CD /* uri.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin XCBuildConfiguration section */
69967F5F1E2F84F100B620CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
UNICODE,
_UNICODE,
USE_LITE_READER,
_USE_LIBXML2_READER_,
_USE_XMLLITE_READER_,
LINUX,
MAC,
_IOS,
LIBXML_READER_ENABLED,
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(PROJECT_DIR)/../libxml2/include",
"$(PROJECT_DIR)/../libxml2/include/libxml",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64";
};
name = Debug;
};
69967F601E2F84F100B620CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
UNICODE,
_UNICODE,
USE_LITE_READER,
_USE_LIBXML2_READER_,
_USE_XMLLITE_READER_,
LINUX,
MAC,
_IOS,
LIBXML_READER_ENABLED,
);
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(PROJECT_DIR)/../../libxml2/include",
"$(PROJECT_DIR)/../../libxml2/include/libxml",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64";
};
name = Release;
};
69967F621E2F84F100B620CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEVELOPMENT_TEAM = 2WH24U26GJ;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(PROJECT_DIR)/../libxml2/include",
"$(PROJECT_DIR)/../libxml2/include/libxml",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
};
name = Debug;
};
69967F631E2F84F100B620CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEVELOPMENT_TEAM = 2WH24U26GJ;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
"$(PROJECT_DIR)/../libxml2/include",
"$(PROJECT_DIR)/../libxml2/include/libxml",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
69967F531E2F84F100B620CD /* Build configuration list for PBXProject "libxml2" */ = {
isa = XCConfigurationList;
buildConfigurations = (
69967F5F1E2F84F100B620CD /* Debug */,
69967F601E2F84F100B620CD /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
69967F611E2F84F100B620CD /* Build configuration list for PBXNativeTarget "libxml2" */ = {
isa = XCConfigurationList;
buildConfigurations = (
69967F621E2F84F100B620CD /* Debug */,
69967F631E2F84F100B620CD /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 69967F501E2F84F100B620CD /* Project object */;
}
DesktopEditor/xml/mac/libxml2.xcodeproj/project.xcworkspace/contents.xcworkspacedata 0 → 100644
View file @ ce590a4a
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:libxml2.xcodeproj">
</FileRef>
</Workspace>
DesktopEditor/xml/mac/libxml2/config.h 0 → 100644
View file @ ce590a4a
/* 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
View file @ ce590a4a
......@@ -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/src/ASCConverters_ios.cpp
View file @ ce590a4a
......@@ -82,7 +82,7 @@ namespace NExtractTools
// Extract docx to temp directory
std::wstring sTempUnpackedDOCX = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked";
FileSystem::Directory::CreateDirectory(sTempUnpackedDOCX);
NSDirectory::CreateDirectory(sTempUnpackedDOCX);
COfficeUtils oCOfficeUtils(NULL);
if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedDOCX, NULL, 0))
......@@ -122,7 +122,7 @@ namespace NExtractTools
std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked";
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sResultDoctDir);
NSDirectory::CreateDirectory(sResultDoctDir);
int nRes = docx2doct_bin(sFrom, sResultDoctFileEditor, sTemp, params);
......@@ -141,7 +141,7 @@ namespace NExtractTools
int nRes = 0;
std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked";
FileSystem::Directory::CreateDirectory(sResultDocxDir);
NSDirectory::CreateDirectory(sResultDocxDir);
nRes = doct_bin2docx_dir(sFrom, sTo, sResultDocxDir, bFromChanges, sThemeDir, params);
......@@ -167,12 +167,12 @@ namespace NExtractTools
m_oCDocxSerializer.setFontDir(params.getFontPath());
CString sXmlOptions;
CString sThemePath; // will be filled by 'CreateDocxFolders' method
CString sMediaPath; // will be filled by 'CreateDocxFolders' method
CString sEmbedPath; // will be filled by 'CreateDocxFolders' method
std::wstring sXmlOptions;
std::wstring sThemePath; // will be filled by 'CreateDocxFolders' method
std::wstring sMediaPath; // will be filled by 'CreateDocxFolders' method
std::wstring sEmbedPath; // will be filled by 'CreateDocxFolders' method
CString sToDir2 = sTo;
std::wstring sToDir2 = sTo;
m_oCDocxSerializer.CreateDocxFolders (sToDir2, sThemePath, sMediaPath, sEmbedPath);
if (SUCCEEDED_X2T(nRes))
......@@ -192,7 +192,7 @@ namespace NExtractTools
std::wstring sTempUnpackedDOCT = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked";
std::wstring sTempDoctFileEditor = sTempUnpackedDOCT + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sTempUnpackedDOCT);
NSDirectory::CreateDirectory(sTempUnpackedDOCT);
// unzip doct to folder
COfficeUtils oCOfficeUtils(NULL);
......@@ -208,7 +208,7 @@ namespace NExtractTools
// Extract xlsx to temp directory
std::wstring sTempUnpackedXLSX = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked";
FileSystem::Directory::CreateDirectory(sTempUnpackedXLSX);
NSDirectory::CreateDirectory(sTempUnpackedXLSX);
COfficeUtils oCOfficeUtils(NULL);
if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedXLSX, NULL, 0))
......@@ -245,7 +245,7 @@ namespace NExtractTools
std::wstring sResultXlstDir = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked";
std::wstring sResultXlstFileEditor = sResultXlstDir + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sResultXlstDir);
NSDirectory::CreateDirectory(sResultXlstDir);
int nRes = xlsx2xlst_bin(sFrom, sResultXlstFileEditor, sTemp, params);
if (SUCCEEDED_X2T(nRes))
......@@ -264,7 +264,7 @@ namespace NExtractTools
// Extract xlsx to temp directory
std::wstring sResultXlsxDir = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked";
FileSystem::Directory::CreateDirectory(sResultXlsxDir);
NSDirectory::CreateDirectory(sResultXlsxDir);
nRes = xlst_bin2xlsx_dir(sFrom, sTo, sResultXlsxDir, bFromChanges, sThemeDir, params);
if (SUCCEEDED_X2T(nRes))
......@@ -289,9 +289,9 @@ namespace NExtractTools
m_oCXlsxSerializer.setFontDir(params.getFontPath());
CString sXmlOptions;
CString sMediaPath; // will be filled by 'CreateXlsxFolders' method
CString sEmbedPath; // will be filled by 'CreateXlsxFolders' method
std::wstring sXmlOptions;
std::wstring sMediaPath; // will be filled by 'CreateXlsxFolders' method
std::wstring sEmbedPath; // will be filled by 'CreateXlsxFolders' method
m_oCXlsxSerializer.CreateXlsxFolders (sXmlOptions, sTo, sMediaPath, sEmbedPath);
......@@ -312,7 +312,7 @@ namespace NExtractTools
std::wstring sTempUnpackedXLST = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked";
std::wstring sTempXlstFileEditor = sTempUnpackedXLST + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sTempUnpackedXLST);
NSDirectory::CreateDirectory(sTempUnpackedXLST);
// unzip xlst to folder
COfficeUtils oCOfficeUtils(NULL);
......@@ -327,7 +327,7 @@ namespace NExtractTools
// unzip pptx to temp folder
std::wstring sTempUnpackedPPTX = sTemp + FILE_SEPARATOR_STR + L"pptx_unpacked" + FILE_SEPARATOR_STR; // leading slash is very important!
FileSystem::Directory::CreateDirectory(sTempUnpackedPPTX);
NSDirectory::CreateDirectory(sTempUnpackedPPTX);
// unzip pptx to folder
COfficeUtils oCOfficeUtils(NULL);
......@@ -381,7 +381,7 @@ namespace NExtractTools
std::wstring sResultPpttDir = sTemp + FILE_SEPARATOR_STR + L"pptt_unpacked";
std::wstring sTempPpttFileEditor = sResultPpttDir + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sResultPpttDir);
NSDirectory::CreateDirectory(sResultPpttDir);
int nRes = pptx2pptt_bin(sFrom, sTempPpttFileEditor, sTemp, params);
if (SUCCEEDED_X2T(nRes))
......@@ -399,7 +399,7 @@ namespace NExtractTools
int nRes = 0;
std::wstring sResultPptxDir = sTemp + FILE_SEPARATOR_STR + L"pptx_unpacked";
FileSystem::Directory::CreateDirectory(sResultPptxDir);
NSDirectory::CreateDirectory(sResultPptxDir);
nRes = pptt_bin2pptx_dir(sFrom, sTo, sResultPptxDir, bFromChanges, sThemeDir, params);
if (!SUCCEEDED_X2T(nRes))
......@@ -445,7 +445,7 @@ namespace NExtractTools
std::wstring sTempUnpackedPPTT = sTemp + FILE_SEPARATOR_STR + L"pptt_unpacked";
std::wstring sTempPpttFileEditor = sTempUnpackedPPTT + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sTempUnpackedPPTT);
NSDirectory::CreateDirectory(sTempUnpackedPPTT);
// unzip pptt to folder
COfficeUtils oCOfficeUtils(NULL);
......@@ -471,11 +471,11 @@ namespace NExtractTools
// csv -> xslt
int csv2xlst (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params)
{
CString sCSV = sFrom;
std::wstring sCSV = sFrom;
std::wstring sResultXlstDir = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked";
std::wstring sResultXlstFileEditor = sResultXlstDir + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sResultXlstDir);
NSDirectory::CreateDirectory(sResultXlstDir);
COfficeUtils oCOfficeUtils(NULL);
// Save to file (from temp dir)
......@@ -495,13 +495,13 @@ namespace NExtractTools
// csv -> xslx
int csv2xlsx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params)
{
CString sCSV = sFrom;
std::wstring sCSV = sFrom;
std::wstring sTempUnpackedXLSX = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked";
std::wstring sResultXlstDir = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked";
std::wstring sResultXlstFileEditor = sResultXlstDir + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sTempUnpackedXLSX);
FileSystem::Directory::CreateDirectory(sResultXlstDir);
NSDirectory::CreateDirectory(sTempUnpackedXLSX);
NSDirectory::CreateDirectory(sResultXlstDir);
// Save to file (from temp dir)
BinXlsxRW::CXlsxSerializer m_oCXlsxSerializer;
......@@ -510,8 +510,8 @@ namespace NExtractTools
COfficeUtils oCOfficeUtils(NULL);
CString sMediaPath;
CString sEmbedPath;
std::wstring sMediaPath;
std::wstring sEmbedPath;
int nRes = m_oCXlsxSerializer.saveToFile (sResultXlstFileEditor, sCSV, params.getXmlOptions()) ? 0 : AVS_FILEUTILS_ERROR_CONVERT;
if (SUCCEEDED_X2T(nRes))
......@@ -540,7 +540,7 @@ namespace NExtractTools
std::wstring sTempUnpackedXLST = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked";
std::wstring sTempXlstFileEditor = sTempUnpackedXLST + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sTempUnpackedXLST);
NSDirectory::CreateDirectory(sTempUnpackedXLST);
// unzip xlst to folder
COfficeUtils oCOfficeUtils(NULL);
......@@ -552,8 +552,8 @@ namespace NExtractTools
m_oCXlsxSerializer.setFontDir(params.getFontPath());
CString sMediaPath;
CString sEmbedPath;
std::wstring sMediaPath;
std::wstring sEmbedPath;
return m_oCXlsxSerializer.loadFromFile (sTempXlstFileEditor, sTo, params.getXmlOptions(), sMediaPath, sEmbedPath) ? 0 : AVS_FILEUTILS_ERROR_CONVERT;
}
......@@ -564,8 +564,8 @@ namespace NExtractTools
std::wstring sResultXlstDir = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked";
std::wstring sResultXlstFileEditor = sResultXlstDir + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sTempUnpackedXLSX);
FileSystem::Directory::CreateDirectory(sResultXlstDir);
NSDirectory::CreateDirectory(sTempUnpackedXLSX);
NSDirectory::CreateDirectory(sResultXlstDir);
COfficeUtils oCOfficeUtils(NULL);
if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedXLSX, NULL, 0))
......@@ -576,12 +576,12 @@ namespace NExtractTools
m_oCXlsxSerializer.setFontDir(params.getFontPath());
CString sXMLOptions;
std::wstring sXMLOptions;
int nRes = m_oCXlsxSerializer.saveToFile (sResultXlstFileEditor, sTempUnpackedXLSX, sXMLOptions) ? 0 : AVS_FILEUTILS_ERROR_CONVERT;
if (SUCCEEDED_X2T(nRes))
{
CString sMediaPath;
CString sEmbedPath;
std::wstring sMediaPath;
std::wstring sEmbedPath;
nRes = m_oCXlsxSerializer.loadFromFile (sResultXlstDir, sTo, sXMLOptions, sMediaPath, sEmbedPath) ? nRes : AVS_FILEUTILS_ERROR_CONVERT;
}
......@@ -607,9 +607,9 @@ namespace NExtractTools
m_oCXlsxSerializer.setFontDir(params.getFontPath());
std::wstring sToTemp = sTemp + FILE_SEPARATOR_STR + L"output.csv";
CString sMediaPath; // will be filled by 'CreateXlsxFolders' method
CString sEmbedPath; // will be filled by 'CreateXlsxFolders' method
CString sXmlOptions = params.getXmlOptions();
std::wstring sMediaPath; // will be filled by 'CreateXlsxFolders' method
std::wstring sEmbedPath; // will be filled by 'CreateXlsxFolders' method
std::wstring sXmlOptions = params.getXmlOptions();
m_oCXlsxSerializer.CreateXlsxFolders (sXmlOptions, sTemp, sMediaPath, sEmbedPath);
......@@ -640,7 +640,7 @@ namespace NExtractTools
int nRes = 0;
// NSDoctRenderer::DoctRendererFormat::FormatFile eToType = NSDoctRenderer::DoctRendererFormat::FormatFile::PDF;
//
// std::wstring sTFileDir = FileSystem::Directory::GetFolderPath(sFrom);
// std::wstring sTFileDir = NSDirectory::GetFolderPath(sFrom);
//
// std::wstring sImagesDirectory = sTFileDir + FILE_SEPARATOR_STR + L"media";
// std::wstring sPdfBinFile = sTFileDir + FILE_SEPARATOR_STR + L"pdf.bin";
......@@ -695,7 +695,7 @@ namespace NExtractTools
int nRes = 0;
// NSDoctRenderer::DoctRendererFormat::FormatFile eToType = NSDoctRenderer::DoctRendererFormat::FormatFile::PDF;
//
// std::wstring sTFileDir = FileSystem::Directory::GetFolderPath(sFrom);
// std::wstring sTFileDir = NSDirectory::GetFolderPath(sFrom);
//
// std::wstring sImagesDirectory = sTFileDir + FILE_SEPARATOR_STR + L"media";
// std::wstring sPdfBinFile = sTFileDir + FILE_SEPARATOR_STR + L"pdf.bin";
......@@ -750,7 +750,7 @@ namespace NExtractTools
// else
// {
// sThumbnailDir = sTemp + FILE_SEPARATOR_STR + L"thumbnails";
// FileSystem::Directory::CreateDirectory(sThumbnailDir);
// NSDirectory::CreateDirectory(sThumbnailDir);
// imageWriter.m_sFileName = sThumbnailDir + FILE_SEPARATOR_STR + L"image" + getExtentionByRasterFormat(imageWriter.m_nRasterFormat);
// }
// BYTE* pData;
......@@ -770,7 +770,7 @@ namespace NExtractTools
int ppsx2pptx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params)
{
std::wstring sTempUnpackedPPSX = sTemp + FILE_SEPARATOR_STR + L"ppsx_unpacked";
FileSystem::Directory::CreateDirectory(sTempUnpackedPPSX);
NSDirectory::CreateDirectory(sTempUnpackedPPSX);
int nRes = ppsx2pptx_dir(sFrom, sTempUnpackedPPSX, params);
if(SUCCEEDED_X2T(nRes))
......@@ -812,7 +812,7 @@ namespace NExtractTools
{
std::wstring sResultPptxDir = sTemp + FILE_SEPARATOR_STR + L"pptx_unpacked";
FileSystem::Directory::CreateDirectory(sResultPptxDir);
NSDirectory::CreateDirectory(sResultPptxDir);
int nRes = ppt2pptx_dir(sFrom, sResultPptxDir, sTemp, params);
if(SUCCEEDED_X2T(nRes))
......@@ -836,7 +836,7 @@ namespace NExtractTools
std::wstring sResultPpttDir = sTemp + FILE_SEPARATOR_STR + L"pptt_unpacked";
std::wstring sTempPpttFileEditor = sResultPpttDir + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sResultPpttDir);
NSDirectory::CreateDirectory(sResultPpttDir);
int nRes = ppt2pptt_bin(sFrom, sTempPpttFileEditor, sTemp, params);
if (SUCCEEDED_X2T(nRes))
......@@ -853,7 +853,7 @@ namespace NExtractTools
// unzip pptx to temp folder
std::wstring sTempUnpackedPPTX = sTemp + FILE_SEPARATOR_STR + L"pptx_unpacked"+ FILE_SEPARATOR_STR; // leading slash is very important!
FileSystem::Directory::CreateDirectory(sTempUnpackedPPTX);
NSDirectory::CreateDirectory(sTempUnpackedPPTX);
COfficePPTFile pptFile;
......@@ -894,7 +894,7 @@ namespace NExtractTools
{
std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked";
FileSystem::Directory::CreateDirectory(sResultDocxDir);
NSDirectory::CreateDirectory(sResultDocxDir);
int nRes = rtf2docx_dir(sFrom, sResultDocxDir, sTemp, params);
if(SUCCEEDED_X2T(nRes))
{
......@@ -918,7 +918,7 @@ namespace NExtractTools
std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked";
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sResultDoctDir);
NSDirectory::CreateDirectory(sResultDoctDir);
int nRes = rtf2doct_bin(sFrom, sResultDoctFileEditor, sTemp, params);
......@@ -936,7 +936,7 @@ namespace NExtractTools
{
std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked";
FileSystem::Directory::CreateDirectory(sResultDocxDir);
NSDirectory::CreateDirectory(sResultDocxDir);
RtfConvertationManager rtfConvert;
rtfConvert.m_sTempFolder = sTemp;
......@@ -947,7 +947,7 @@ namespace NExtractTools
m_oCDocxSerializer.setFontDir(params.getFontPath());
CString sXmlOptions;
std::wstring sXmlOptions;
int res = m_oCDocxSerializer.saveToFile (sTo, sResultDocxDir, sXmlOptions) ? 0 : AVS_FILEUTILS_ERROR_CONVERT;
return res;
......@@ -960,7 +960,7 @@ namespace NExtractTools
int docx2rtf (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params)
{
std::wstring sTempUnpackedDOCX = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked";
FileSystem::Directory::CreateDirectory(sTempUnpackedDOCX);
NSDirectory::CreateDirectory(sTempUnpackedDOCX);
COfficeUtils oCOfficeUtils(NULL);
if (S_OK == oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedDOCX, NULL, 0))
......@@ -986,7 +986,7 @@ namespace NExtractTools
{
std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked";
FileSystem::Directory::CreateDirectory(sResultDocxDir);
NSDirectory::CreateDirectory(sResultDocxDir);
long hRes = doc2docx_dir(sFrom, sResultDocxDir, sTemp, params);
if(SUCCEEDED_X2T(hRes))
......@@ -1037,7 +1037,7 @@ namespace NExtractTools
std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked";
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sResultDoctDir);
NSDirectory::CreateDirectory(sResultDoctDir);
long nRes = doc2doct_bin(sFrom, sResultDoctFileEditor, sTemp, params);
......@@ -1055,7 +1055,7 @@ namespace NExtractTools
{
// std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked";
//
// FileSystem::Directory::CreateDirectory(sResultDocxDir);
// NSDirectory::CreateDirectory(sResultDocxDir);
//
// COfficeDocFile docFile;
// docFile.m_sTempFolder = sTemp;
......@@ -1102,7 +1102,7 @@ namespace NExtractTools
std::wstring sTempUnpackedDOCT = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked";
std::wstring sTempDoctFileEditor = sTempUnpackedDOCT + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sTempUnpackedDOCT);
NSDirectory::CreateDirectory(sTempUnpackedDOCT);
// unzip doct to folder
COfficeUtils oCOfficeUtils(NULL);
......@@ -1118,7 +1118,7 @@ namespace NExtractTools
int nRes = 0;
std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked";
FileSystem::Directory::CreateDirectory(sResultDocxDir);
NSDirectory::CreateDirectory(sResultDocxDir);
std::wstring sTargetBin;
//if(bFromChanges)
......@@ -1130,10 +1130,10 @@ namespace NExtractTools
m_oCDocxSerializer.setFontDir(params.getFontPath());
CString sXmlOptions;
CString sThemePath; // will be filled by 'CreateDocxFolders' method
CString sMediaPath; // will be filled by 'CreateDocxFolders' method
CString sEmbedPath; // will be filled by 'CreateDocxFolders' method
std::wstring sXmlOptions;
std::wstring sThemePath; // will be filled by 'CreateDocxFolders' method
std::wstring sMediaPath; // will be filled by 'CreateDocxFolders' method
std::wstring sEmbedPath; // will be filled by 'CreateDocxFolders' method
m_oCDocxSerializer.CreateDocxFolders (sResultDocxDir, sThemePath, sMediaPath, sEmbedPath);
......@@ -1161,7 +1161,7 @@ namespace NExtractTools
{
std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked";
FileSystem::Directory::CreateDirectory(sResultDocxDir);
NSDirectory::CreateDirectory(sResultDocxDir);
int nRes = txt2docx_dir(sFrom, sResultDocxDir, sTemp, params);
if(SUCCEEDED_X2T(nRes))
{
......@@ -1185,7 +1185,7 @@ namespace NExtractTools
std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked";
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sResultDoctDir);
NSDirectory::CreateDirectory(sResultDoctDir);
int nRes = txt2doct_bin(sFrom, sResultDoctFileEditor, sTemp, params);
......@@ -1203,7 +1203,7 @@ namespace NExtractTools
{
std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked";
FileSystem::Directory::CreateDirectory(sResultDocxDir);
NSDirectory::CreateDirectory(sResultDocxDir);
CTxtXmlFile txtFile;
......@@ -1234,7 +1234,7 @@ namespace NExtractTools
std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked";
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sResultDoctDir);
NSDirectory::CreateDirectory(sResultDoctDir);
int nRes = odf2oot_bin(sFrom, sResultDoctFileEditor, sTemp, params);
......@@ -1252,13 +1252,13 @@ namespace NExtractTools
// std::wstring sTempUnpackedOdf = sTemp + FILE_SEPARATOR_STR + L"odf_unpacked";
// std::wstring sTempUnpackedOox = sTemp + FILE_SEPARATOR_STR + L"oox_unpacked";
//
// FileSystem::Directory::CreateDirectory(sTempUnpackedOdf);
// NSDirectory::CreateDirectory(sTempUnpackedOdf);
//
// COfficeUtils oCOfficeUtils(NULL);
// if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedOdf, NULL, 0))
// return -3;
//
// FileSystem::Directory::CreateDirectory(sTempUnpackedOox);
// NSDirectory::CreateDirectory(sTempUnpackedOox);
//
// if (S_OK == ConvertOO2OOX(sTempUnpackedOdf, sTempUnpackedOox, params.getFontPath(), false, NULL))
// {
......@@ -1277,7 +1277,7 @@ namespace NExtractTools
int odf2oox(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
{
// std::wstring sTempUnpackedOox = sTemp + FILE_SEPARATOR_STR + L"oox_unpacked";
// FileSystem::Directory::CreateDirectory(sTempUnpackedOox);
// NSDirectory::CreateDirectory(sTempUnpackedOox);
//
// int nRes = odf2oox_dir(sFrom, sTempUnpackedOox, sTemp, params);
// if(SUCCEEDED_X2T(nRes))
......@@ -1291,7 +1291,7 @@ namespace NExtractTools
int odf2oox_dir(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
{
// std::wstring sTempUnpackedOdf = sTemp + FILE_SEPARATOR_STR + L"odf_unpacked";
// FileSystem::Directory::CreateDirectory(sTempUnpackedOdf);
// NSDirectory::CreateDirectory(sTempUnpackedOdf);
//
// COfficeUtils oCOfficeUtils(NULL);
// if (S_OK != oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedOdf, NULL, 0))
......@@ -1304,7 +1304,7 @@ namespace NExtractTools
int docx2odt (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params )
{
// std::wstring sTempUnpackedDOCX = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked";
// FileSystem::Directory::CreateDirectory(sTempUnpackedDOCX);
// NSDirectory::CreateDirectory(sTempUnpackedDOCX);
//
// COfficeUtils oCOfficeUtils(NULL);
// if (S_OK == oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedDOCX, NULL, 0))
......@@ -1318,7 +1318,7 @@ namespace NExtractTools
int docx_dir2odt (const std::wstring &sDocxDir, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params )
{
// std::wstring sTempUnpackedODT = sTemp + FILE_SEPARATOR_STR + L"odt_unpacked";
// FileSystem::Directory::CreateDirectory(sTempUnpackedODT);
// NSDirectory::CreateDirectory(sTempUnpackedODT);
//
// Oox2Odf::Converter converter(sDocxDir, L"text", params.getFontPath(), NULL);
//
......@@ -1342,7 +1342,7 @@ namespace NExtractTools
{
// std::wstring sTempUnpackedXLSX = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked";
//
// FileSystem::Directory::CreateDirectory(sTempUnpackedXLSX);
// NSDirectory::CreateDirectory(sTempUnpackedXLSX);
//
// COfficeUtils oCOfficeUtils(NULL);
// if (S_OK == oCOfficeUtils.ExtractToDirectory(sFrom, sTempUnpackedXLSX, NULL, 0))
......@@ -1355,7 +1355,7 @@ namespace NExtractTools
int xlsx_dir2ods (const std::wstring &sXlsxDir, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params)
{
// std::wstring sTempUnpackedODS = sTemp + FILE_SEPARATOR_STR + L"ods_unpacked";
// FileSystem::Directory::CreateDirectory(sTempUnpackedODS);
// NSDirectory::CreateDirectory(sTempUnpackedODS);
//
// try
// {
......@@ -1379,7 +1379,7 @@ namespace NExtractTools
// std::wstring sResultOotDir = sTemp + FILE_SEPARATOR_STR + L"oot_unpacked";
// std::wstring sResultOotFileEditor = sResultOotDir + FILE_SEPARATOR_STR + L"Editor.bin";
//
// FileSystem::Directory::CreateDirectory(sResultOotDir);
// NSDirectory::CreateDirectory(sResultOotDir);
//
// int nRes = mscrypt2oot_bin(sFrom, sResultOotFileEditor, sTemp, params);
// if (SUCCEEDED_X2T(nRes))
......@@ -1516,7 +1516,7 @@ namespace NExtractTools
int epub2doct_dir (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params)
{
// std::wstring sEpubDir = sTemp + FILE_SEPARATOR_STR + L"epub_unpacked";
// FileSystem::Directory::CreateDirectory(sEpubDir);
// NSDirectory::CreateDirectory(sEpubDir);
// int nRes = zip2dir(sFrom, sEpubDir);
// if(SUCCEEDED_X2T(nRes))
// {
......@@ -1585,16 +1585,16 @@ namespace NExtractTools
// sFilePathOut += L".docx";
//
// std::wstring sTempDocx = sTemp + FILE_SEPARATOR_STR + wsFilePathInFilename + L"_DOCX";
// FileSystem::Directory::CreateDirectory(sTempDocx);
// NSDirectory::CreateDirectory(sTempDocx);
//
// BinDocxRW::CDocxSerializer m_oCDocxSerializer;
//
// m_oCDocxSerializer.setFontDir(params.getFontPath());
//
// CString sXmlOptions = L"";
// CString sThemePath; // will be filled by 'CreateDocxFolders' method
// CString sMediaPath; // will be filled by 'CreateDocxFolders' method
// CString sEmbedPath; // will be filled by 'CreateDocxFolders' method
// std::wstring sXmlOptions = L"";
// std::wstring sThemePath; // will be filled by 'CreateDocxFolders' method
// std::wstring sMediaPath; // will be filled by 'CreateDocxFolders' method
// std::wstring sEmbedPath; // will be filled by 'CreateDocxFolders' method
//
// m_oCDocxSerializer.CreateDocxFolders (sTempDocx, sThemePath, sMediaPath, sEmbedPath);
// nRes = m_oCDocxSerializer.loadFromFile (sFilePathIn, sTempDocx, sXmlOptions, sThemePath, sMediaPath, sEmbedPath) ? 0 : AVS_FILEUTILS_ERROR_CONVERT;
......@@ -1775,7 +1775,7 @@ namespace NExtractTools
// if (!bIsOnlyFirst)
// {
// sThumbnailDir = sTemp + FILE_SEPARATOR_STR + L"thumbnails";
// FileSystem::Directory::CreateDirectory(sThumbnailDir);
// NSDirectory::CreateDirectory(sThumbnailDir);
// sFileToExt = getExtentionByRasterFormat(nRasterFormat);
// }
// int nPagesCount = pReader->GetPagesCount();
......@@ -1882,7 +1882,7 @@ namespace NExtractTools
std::wstring sDoctDir = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked";
std::wstring sTFile = sDoctDir + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sDoctDir);
NSDirectory::CreateDirectory(sDoctDir);
nRes = docx_dir2doct_bin(sFrom, sTFile, params);
......@@ -1898,7 +1898,7 @@ namespace NExtractTools
int nRes = 0;
if(AVS_OFFICESTUDIO_FILE_TEAMLAB_DOCY == nFormatTo)
{
std::wstring sFromDir = FileSystem::Directory::GetFolderPath(sFrom);
std::wstring sFromDir = NSDirectory::GetFolderPath(sFrom);
nRes = dir2zip(sFromDir, sTo);
}
else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatTo)
......@@ -1949,7 +1949,7 @@ namespace NExtractTools
{
if(AVS_OFFICESTUDIO_FILE_CANVAS_WORD == nFormatTo)
{
std::wstring sDoctDir = FileSystem::Directory::GetFolderPath(sTo);
std::wstring sDoctDir = NSDirectory::GetFolderPath(sTo);
if(AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML == nFormatFrom)
nRes = html2doct_dir(sFrom, sDoctDir, sTemp, params);
......@@ -1965,7 +1965,7 @@ namespace NExtractTools
std::wstring sDoctDir = sTemp + FILE_SEPARATOR_STR + L"doct_unpacked";
std::wstring sTFile = sDoctDir + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sDoctDir);
NSDirectory::CreateDirectory(sDoctDir);
if(AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML == nFormatFrom)
nRes = html2doct_dir(sFrom, sDoctDir, sTemp, params);
......@@ -1985,7 +1985,7 @@ namespace NExtractTools
else
{
std::wstring sDocxDir = sTemp + FILE_SEPARATOR_STR + L"docx_unpacked";
FileSystem::Directory::CreateDirectory(sDocxDir);
NSDirectory::CreateDirectory(sDocxDir);
if(AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX == nFormatFrom)
{
nRes = zip2dir(sFrom, sDocxDir);
......@@ -2044,7 +2044,7 @@ namespace NExtractTools
else
{
std::wstring sXlstDir = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked";
FileSystem::Directory::CreateDirectory(sXlstDir);
NSDirectory::CreateDirectory(sXlstDir);
std::wstring sTFile = sXlstDir + FILE_SEPARATOR_STR + L"Editor.bin";
if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV == nFormatTo)
nRes = xlsx_dir2xlst_bin(sFrom, sTFile, params);
......@@ -2062,7 +2062,7 @@ namespace NExtractTools
int nRes = 0;
if(AVS_OFFICESTUDIO_FILE_TEAMLAB_XLSY == nFormatTo)
{
std::wstring sFromDir = FileSystem::Directory::GetFolderPath(sFrom);
std::wstring sFromDir = NSDirectory::GetFolderPath(sFrom);
nRes = dir2zip(sFromDir, sTo);
}
else if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV == nFormatTo)
......@@ -2123,7 +2123,7 @@ namespace NExtractTools
{
std::wstring sXlstDir = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked";
std::wstring sTFile = sXlstDir + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sXlstDir);
NSDirectory::CreateDirectory(sXlstDir);
nRes = csv2xlst_bin(sFrom, sTFile, params);
if(SUCCEEDED_X2T(nRes))
{
......@@ -2135,7 +2135,7 @@ namespace NExtractTools
else
{
std::wstring sXlsxDir = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked";
FileSystem::Directory::CreateDirectory(sXlsxDir);
NSDirectory::CreateDirectory(sXlsxDir);
if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX == nFormatFrom)
{
nRes = zip2dir(sFrom, sXlsxDir);
......@@ -2179,7 +2179,7 @@ namespace NExtractTools
else
{
std::wstring sPpttDir = sTemp + FILE_SEPARATOR_STR + L"pptt_unpacked";
FileSystem::Directory::CreateDirectory(sPpttDir);
NSDirectory::CreateDirectory(sPpttDir);
std::wstring sTFile = sPpttDir + FILE_SEPARATOR_STR + L"Editor.bin";
nRes = pptx_dir2pptt_bin(sFrom, sTFile, params);
......@@ -2195,7 +2195,7 @@ namespace NExtractTools
int nRes = 0;
if(AVS_OFFICESTUDIO_FILE_TEAMLAB_PPTY == nFormatTo)
{
std::wstring sFromDir = FileSystem::Directory::GetFolderPath(sFrom);
std::wstring sFromDir = NSDirectory::GetFolderPath(sFrom);
nRes = dir2zip(sFromDir, sTo);
}
else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatTo)
......@@ -2243,7 +2243,7 @@ namespace NExtractTools
int nRes = 0;
std::wstring sPptxDir = sTemp + FILE_SEPARATOR_STR + L"pptx_unpacked";
FileSystem::Directory::CreateDirectory(sPptxDir);
NSDirectory::CreateDirectory(sPptxDir);
if(AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX == nFormatFrom)
{
nRes = zip2dir(sFrom, sPptxDir);
......@@ -2274,7 +2274,7 @@ namespace NExtractTools
int nRes = 0;
if(0 != (AVS_OFFICESTUDIO_FILE_CANVAS & nFormatTo))
{
std::wstring sTDir = FileSystem::Directory::GetFolderPath(sTo);
std::wstring sTDir = NSDirectory::GetFolderPath(sTo);
nRes = zip2dir(sFrom, sTDir);
}
else
......@@ -2364,7 +2364,7 @@ namespace NExtractTools
{
std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked";
FileSystem::Directory::CreateDirectory(sResultDocxDir);
NSDirectory::CreateDirectory(sResultDocxDir);
int nRes = xls2xlsx_dir(sFrom, sResultDocxDir, sTemp, params);
if(SUCCEEDED_X2T(nRes))
......@@ -2401,7 +2401,7 @@ namespace NExtractTools
std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + L"xlst_unpacked";
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + L"Editor.bin";
FileSystem::Directory::CreateDirectory(sResultDoctDir);
NSDirectory::CreateDirectory(sResultDoctDir);
int nRes = xls2xlst_bin(sFrom, sResultDoctFileEditor, sTemp, params);
......@@ -2419,7 +2419,7 @@ namespace NExtractTools
{
// std::wstring sResultXlsxDir = sTemp + FILE_SEPARATOR_STR + L"xlsx_unpacked";
//
// FileSystem::Directory::CreateDirectory(sResultXlsxDir);
// NSDirectory::CreateDirectory(sResultXlsxDir);
//
// if (ConvertXls2Xlsx( sFrom, sResultXlsxDir, params.getPassword(), params.getFontPath(), NULL)== S_OK)
// {
......@@ -2490,7 +2490,7 @@ namespace NExtractTools
if(NULL != oInputParams.m_oMailMergeSend)
oMailMerge = oInputParams.m_oMailMergeSend;
std::wstring sTempDir = FileSystem::Directory::GetFolderPath(sFileFrom) + FILE_SEPARATOR_STR + L"Temp";
std::wstring sTempDir = NSDirectory::GetFolderPath(sFileFrom) + FILE_SEPARATOR_STR + L"Temp";
NSDirectory::CreateDirectory(sTempDir);
if (sTempDir.empty())
......@@ -2580,11 +2580,11 @@ namespace NExtractTools
}break;
case TCD_BIN2T:
{
result = dir2zip (FileSystem::Directory::GetFolderPath(sFileFrom), sFileTo);
result = dir2zip (NSDirectory::GetFolderPath(sFileFrom), sFileTo);
}break;
case TCD_T2BIN:
{
result = zip2dir (sFileFrom, FileSystem::Directory::GetFolderPath(sFileTo));
result = zip2dir (sFileFrom, NSDirectory::GetFolderPath(sFileTo));
}break;
case TCD_PPSX2PPTX:
{
......
X2tConverter/test/iosTest/iosTest.xcodeproj/project.pbxproj
View file @ ce590a4a
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7