From 575fb06458cc9b6c86067ccdb6e914b86510bbab Mon Sep 17 00:00:00 2001 From: Thomas Taschauer Date: Sat, 22 Feb 2020 10:22:35 +0100 Subject: [PATCH 01/10] use latest core --- OpenDocument.core | 2 +- OpenDocumentReader/CoreWrapper.mm | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/OpenDocument.core b/OpenDocument.core index 62d93e6..bd171ac 160000 --- a/OpenDocument.core +++ b/OpenDocument.core @@ -1 +1 @@ -Subproject commit 62d93e6e228c923e61b694d3e515f32a74ce5248 +Subproject commit bd171ac5043a7604a6c4c7822adfbfdb02550483 diff --git a/OpenDocumentReader/CoreWrapper.mm b/OpenDocumentReader/CoreWrapper.mm index 90e2a39..28e5546 100644 --- a/OpenDocumentReader/CoreWrapper.mm +++ b/OpenDocumentReader/CoreWrapper.mm @@ -10,12 +10,12 @@ #import "CoreWrapper.h" -#include "TranslationHelper.h" +#include "OpenDocumentReader.h" #include "TranslationConfig.h" #include "FileMeta.h" @implementation CoreWrapper { - odr::TranslationHelper translator; + odr::OpenDocumentReader translator; bool initialized; } @@ -25,7 +25,7 @@ - (bool)translate:(NSString *)inputPath into:(NSString *)outputPath at:(NSNumber _errorCode = 0; if (!initialized) { - bool opened = translator.openOpenDocument([inputPath cStringUsingEncoding:NSUTF8StringEncoding]); + bool opened = translator.open([inputPath cStringUsingEncoding:NSUTF8StringEncoding]); if (!opened) { _errorCode = @(-1); return false; @@ -33,7 +33,7 @@ - (bool)translate:(NSString *)inputPath into:(NSString *)outputPath at:(NSNumber const auto meta = translator.getMeta(); - bool decrypted = !meta->encrypted; + bool decrypted = !meta.encrypted; if (password != nil) { decrypted = translator.decrypt([password cStringUsingEncoding:NSUTF8StringEncoding]); } @@ -44,10 +44,10 @@ - (bool)translate:(NSString *)inputPath into:(NSString *)outputPath at:(NSNumber } NSMutableArray *pageNames = [[NSMutableArray alloc] init]; - if (meta->type == odr::FileType::OPENDOCUMENT_TEXT) { + if (meta.type == odr::FileType::OPENDOCUMENT_TEXT) { [pageNames addObject:@"Text document"]; } else { - for (auto page = meta->entries.begin(); page != meta->entries.end(); page++) { + for (auto page = meta.entries.begin(); page != meta.entries.end(); page++) { auto pageName = page->name; [pageNames addObject:[NSString stringWithCString:pageName.c_str() encoding:[NSString defaultCStringEncoding]]]; From 0ce5c88fb577f4e749ec64b5f9ae375bddaf1441 Mon Sep 17 00:00:00 2001 From: Thomas Taschauer Date: Sat, 28 Mar 2020 17:34:39 +0100 Subject: [PATCH 02/10] use latest core --- OpenDocument.core | 2 +- OpenDocumentReader.xcodeproj/project.pbxproj | 1176 ++++-------------- OpenDocumentReader/CoreWrapper.mm | 8 +- 3 files changed, 221 insertions(+), 965 deletions(-) diff --git a/OpenDocument.core b/OpenDocument.core index bd171ac..6f9dc44 160000 --- a/OpenDocument.core +++ b/OpenDocument.core @@ -1 +1 @@ -Subproject commit bd171ac5043a7604a6c4c7822adfbfdb02550483 +Subproject commit 6f9dc4442ebfb55d250227281f2b0ebd7439fb5e diff --git a/OpenDocumentReader.xcodeproj/project.pbxproj b/OpenDocumentReader.xcodeproj/project.pbxproj index add9b1e..d57462d 100644 --- a/OpenDocumentReader.xcodeproj/project.pbxproj +++ b/OpenDocumentReader.xcodeproj/project.pbxproj @@ -17,15 +17,21 @@ E22EB71A226B65E300053B86 /* DocumentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB719226B65E300053B86 /* DocumentViewController.swift */; }; E22EB71C226B66B300053B86 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E22EB71B226B66B300053B86 /* Main.storyboard */; }; E23795302274844400BA7238 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E237952F2274844400BA7238 /* AdSupport.framework */; }; - E26C392C2250D926009C484A /* libglog.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E26C39172250D91C009C484A /* libglog.a */; }; - E26C392D2250D926009C484A /* libminiz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E26C391B2250D91C009C484A /* libminiz.a */; }; - E26C392E2250D926009C484A /* libodrlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E26C391D2250D91C009C484A /* libodrlib.a */; }; E26C39392250DC6E009C484A /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E26C39382250DC6E009C484A /* WebKit.framework */; }; + E279ABA6242F9A9700DBA9FA /* libcryptopp-object.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E2CDC4BD226A407500E9FCED /* libcryptopp-object.a */; }; + E279ABAA242F9A9700DBA9FA /* libglogd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E26C39172250D91C009C484A /* libglogd.a */; }; + E279ABAB242F9A9700DBA9FA /* libminiz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E26C391B2250D91C009C484A /* libminiz.a */; }; + E279ABAC242F9A9700DBA9FA /* libodr_access.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E22E2FD42427F6A900E8071C /* libodr_access.a */; }; + E279ABAD242F9A9700DBA9FA /* libodr_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E22E2FD62427F6A900E8071C /* libodr_common.a */; }; + E279ABAE242F9A9700DBA9FA /* libodr_crypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E22E2FD82427F6A900E8071C /* libodr_crypto.a */; }; + E279ABAF242F9A9800DBA9FA /* libodr_odf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E22E2FDA2427F6A900E8071C /* libodr_odf.a */; }; + E279ABB0242F9A9800DBA9FA /* libodr_ooxml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E22E2FDC2427F6A900E8071C /* libodr_ooxml.a */; }; + E279ABB1242F9A9800DBA9FA /* libodr_svm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E22E2FDE2427F6A900E8071C /* libodr_svm.a */; }; + E279ABB2242F9A9800DBA9FA /* libodr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E22E2FD22427F6A900E8071C /* libodr.a */; }; + E279ABB3242F9A9800DBA9FA /* libtinyxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E26C39292250D91C009C484A /* libtinyxml2.a */; }; E29E4077225A4672002C06E6 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = E29E4076225A4672002C06E6 /* GoogleService-Info.plist */; }; - E2A3EE742259FA3100511BD2 /* libtinyxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E26C39292250D91C009C484A /* libtinyxml2.a */; }; E2C008FA220F1CF80097C594 /* CoreWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = E2C008F9220F1CF80097C594 /* CoreWrapper.mm */; }; E2D0B3D9226D945400534FCC /* StoreReviewHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2D0B3D8226D945400534FCC /* StoreReviewHelper.swift */; }; - E2D920F0226B1C7D0042A774 /* libcryptopp-object.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E2CDC4BD226A407500E9FCED /* libcryptopp-object.a */; }; E2F7ED53220B54D600D63515 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F7ED52220B54D600D63515 /* AppDelegate.swift */; }; E2F7ED55220B54D600D63515 /* DocumentBrowserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F7ED54220B54D600D63515 /* DocumentBrowserViewController.swift */; }; E2F7ED5E220B54D700D63515 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2F7ED5D220B54D700D63515 /* Assets.xcassets */; }; @@ -33,173 +39,173 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - E26C39082250D91C009C484A /* PBXContainerItemProxy */ = { + E22E2FCF2427F6A900E8071C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 6E2B12CED9D64BEC93339963; - remoteInfo = demangle_unittest; + remoteGlobalIDString = D731DD15B7154BD18E35E076; + remoteInfo = back_translate; }; - E26C390A2250D91C009C484A /* PBXContainerItemProxy */ = { + E22E2FD12427F6A900E8071C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 7382D125EC9E4E4BA0173192; - remoteInfo = example1; + remoteGlobalIDString = 56E24BEDA81F4B3D90783E15; + remoteInfo = odr; }; - E26C390C2250D91C009C484A /* PBXContainerItemProxy */ = { + E22E2FD32427F6A900E8071C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 9E8CC868858E41E08B023864; - remoteInfo = example2; + remoteGlobalIDString = CAB030939EE14DB2ABC2DB2C; + remoteInfo = odr_access; }; - E26C390E2250D91C009C484A /* PBXContainerItemProxy */ = { + E22E2FD52427F6A900E8071C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 2; - remoteGlobalIDString = D1AEFA16B50F45F9B9187431; - remoteInfo = example3; + remoteGlobalIDString = 3742244A680B45B79E591660; + remoteInfo = odr_common; }; - E26C39102250D91C009C484A /* PBXContainerItemProxy */ = { + E22E2FD72427F6A900E8071C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 896E476F78FA4E5397CB1A0A; - remoteInfo = example4; + remoteGlobalIDString = 7EAEBDBE9DB64D0888433DEE; + remoteInfo = odr_crypto; }; - E26C39122250D91C009C484A /* PBXContainerItemProxy */ = { + E22E2FD92427F6A900E8071C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 2; - remoteGlobalIDString = D5FF3C71A0E74769816BFA0E; - remoteInfo = example5; + remoteGlobalIDString = C922F101B53A4269998F47D8; + remoteInfo = odr_odf; }; - E26C39142250D91C009C484A /* PBXContainerItemProxy */ = { + E22E2FDB2427F6A900E8071C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 2; - remoteGlobalIDString = AA43423DA5E1400E9281904F; - remoteInfo = example6; + remoteGlobalIDString = 9D3C174D3AC44109BFCC1A30; + remoteInfo = odr_ooxml; }; - E26C39162250D91C009C484A /* PBXContainerItemProxy */ = { + E22E2FDD2427F6A900E8071C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 6ED6444089C4415CB22B29EE; - remoteInfo = glog; + remoteGlobalIDString = 8BD77C986E9943838C90E661; + remoteInfo = odr_svm; }; - E26C39182250D91C009C484A /* PBXContainerItemProxy */ = { + E22E2FDF2427F6A900E8071C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 2; - remoteGlobalIDString = E59F6D56B9934D84999A242C; - remoteInfo = logging_unittest; + remoteGlobalIDString = E2B9C082EAE545A8ABE0ED1D; + remoteInfo = odr_test; }; - E26C391A2250D91C009C484A /* PBXContainerItemProxy */ = { + E22E2FE12427F6A900E8071C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 0AB486F4EB34484CB913AE70; - remoteInfo = miniz; + remoteGlobalIDString = 7DB86CB9CF974084A54B0C78; + remoteInfo = translate; }; - E26C391C2250D91C009C484A /* PBXContainerItemProxy */ = { + E26C39162250D91C009C484A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 345CB4562C8F4C2C95C40A55; - remoteInfo = odrlib; + remoteGlobalIDString = 6ED6444089C4415CB22B29EE; + remoteInfo = glog; }; - E26C391E2250D91C009C484A /* PBXContainerItemProxy */ = { + E26C391A2250D91C009C484A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 1CDA4E65CBCB45B3856CC8A8; - remoteInfo = odrtests; + remoteGlobalIDString = 0AB486F4EB34484CB913AE70; + remoteInfo = miniz; }; - E26C39202250D91C009C484A /* PBXContainerItemProxy */ = { + E26C39282250D91C009C484A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 07B8D6956815411FA61BD170; - remoteInfo = signalhandler_unittest; + remoteGlobalIDString = 6F1EEDA475E54B24980CE6D3; + remoteInfo = tinyxml2; }; - E26C39222250D91C009C484A /* PBXContainerItemProxy */ = { + E279ABBB242F9B3800DBA9FA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EABFC54A50024D76BD804D55; - remoteInfo = stacktrace_unittest; + proxyType = 1; + remoteGlobalIDString = 85ED5DEA8B84412CB6FBE625; + remoteInfo = "cryptopp-object"; }; - E26C39242250D91C009C484A /* PBXContainerItemProxy */ = { + E279ABC1242F9B3800DBA9FA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 7C2779C4F7BE45BA9EDE0112; - remoteInfo = stl_logging_unittest; + proxyType = 1; + remoteGlobalIDString = 36BF18010D474FAE80789FAF; + remoteInfo = glog; }; - E26C39262250D91C009C484A /* PBXContainerItemProxy */ = { + E279ABC3242F9B3800DBA9FA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 0BE92034E1A74B30B2EA7438; - remoteInfo = symbolize_unittest; + proxyType = 1; + remoteGlobalIDString = 744A1C3C86594C9AB74BF486; + remoteInfo = miniz; }; - E26C39282250D91C009C484A /* PBXContainerItemProxy */ = { + E279ABC5242F9B3800DBA9FA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6F1EEDA475E54B24980CE6D3; - remoteInfo = tinyxml2; + proxyType = 1; + remoteGlobalIDString = 23B48782D3844B2EB37EF5EC; + remoteInfo = odr; }; - E26C392A2250D91C009C484A /* PBXContainerItemProxy */ = { + E279ABC7242F9B3800DBA9FA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 2A320678DC854B8DBA5191E6; - remoteInfo = utilities_unittest; + proxyType = 1; + remoteGlobalIDString = DCE717B5B13F4748932F2C79; + remoteInfo = odr_access; }; - E26C39302250D976009C484A /* PBXContainerItemProxy */ = { + E279ABC9242F9B3800DBA9FA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 203F5B58C30A4747B3EA3806; - remoteInfo = glog; + remoteGlobalIDString = D11A92CE9B1648F6903A561E; + remoteInfo = odr_common; }; - E26C39322250D976009C484A /* PBXContainerItemProxy */ = { + E279ABCB242F9B3800DBA9FA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 6AE673E2FD81491E971C570E; - remoteInfo = miniz; + remoteGlobalIDString = 5D431CCEBBCB420588777ACD; + remoteInfo = odr_crypto; }; - E26C39342250D976009C484A /* PBXContainerItemProxy */ = { + E279ABCD242F9B3800DBA9FA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 5BE314B7DF3F42D386FE273C; - remoteInfo = odrlib; + remoteGlobalIDString = 624C104C7473497B800B6697; + remoteInfo = odr_odf; }; - E26C39362250D976009C484A /* PBXContainerItemProxy */ = { + E279ABCF242F9B3800DBA9FA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 2933A9A9810A4C6595AA3978; - remoteInfo = tinyxml2; + remoteGlobalIDString = 8C40221438EA413D8E668139; + remoteInfo = odr_ooxml; }; - E29A02212365EF7800BD6A96 /* PBXContainerItemProxy */ = { + E279ABD1242F9B3800DBA9FA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 48C1E359B46B47C5B2EC8386; - remoteInfo = gmock; + proxyType = 1; + remoteGlobalIDString = F9F8A7612BF7482BB1C0223D; + remoteInfo = odr_svm; }; - E29A02232365EF7800BD6A96 /* PBXContainerItemProxy */ = { + E279ABD3242F9B3800DBA9FA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = C9C0C7A13E604FABAB50807E; - remoteInfo = gmock_main; + proxyType = 1; + remoteGlobalIDString = 8D2029D4C5124408B892010C; + remoteInfo = tinyxml2; }; E29A02252365EF7800BD6A96 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -215,321 +221,6 @@ remoteGlobalIDString = 9A974A6917734F869FAF1CC6; remoteInfo = gtest_main; }; - E29A02292365EF7800BD6A96 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 2A920CCD2EC04ED8BF0FCC37; - remoteInfo = odrmain; - }; - E2B0BC5723C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 64B680137BD743AAA61A4E62; - remoteInfo = doctest_main; - }; - E2B0BC5923C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = E49B9411C17D4FBCA7BAD72D; - remoteInfo = "test-algorithms"; - }; - E2B0BC5B23C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F0DF483AD9934D16997C4749; - remoteInfo = "test-allocator"; - }; - E2B0BC5D23C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = E745F9900E8B4B3B8360944C; - remoteInfo = "test-alt-string"; - }; - E2B0BC5F23C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 14451C02746047288DDADC5A; - remoteInfo = "test-bson"; - }; - E2B0BC6123C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 506532FB0F174D2C90F3929F; - remoteInfo = "test-capacity"; - }; - E2B0BC6323C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A55F219F662B4FD59405E74B; - remoteInfo = "test-cbor"; - }; - E2B0BC6523C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 75DC0EBA3E9A4DC1A688EBB6; - remoteInfo = "test-class_const_iterator"; - }; - E2B0BC6723C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 279DF4E706124BACA2DE7923; - remoteInfo = "test-class_iterator"; - }; - E2B0BC6923C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 2CCD2D8B87B44505893C633D; - remoteInfo = "test-class_lexer"; - }; - E2B0BC6B23C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A4A4F57D22A04C21A51EFCEE; - remoteInfo = "test-class_parser"; - }; - E2B0BC6D23C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 7EDC13DB3CC84DAF995CDB82; - remoteInfo = "test-comparison"; - }; - E2B0BC6F23C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 862ABE4199A140B695FFF1E2; - remoteInfo = "test-concepts"; - }; - E2B0BC7123C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EECAADD1E0F9417884155F28; - remoteInfo = "test-constructor1"; - }; - E2B0BC7323C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 83397FAAF89B4172B28F2C18; - remoteInfo = "test-constructor2"; - }; - E2B0BC7523C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B982AB3A24C54257B179EDE3; - remoteInfo = "test-convenience"; - }; - E2B0BC7723C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 0048902AA3514571815C8C07; - remoteInfo = "test-conversions"; - }; - E2B0BC7923C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = ECDE946CFC724968AA7D5EE0; - remoteInfo = "test-deserialization"; - }; - E2B0BC7B23C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 21880137D5F24479B5F0517B; - remoteInfo = "test-element_access1"; - }; - E2B0BC7D23C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = FB65A02B8EF64F839B60354C; - remoteInfo = "test-element_access2"; - }; - E2B0BC7F23C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 079B5C021CD64A63BA280C23; - remoteInfo = "test-inspection"; - }; - E2B0BC8123C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = AAE1F9B4DA9F4918B705DBAA; - remoteInfo = "test-items"; - }; - E2B0BC8323C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = DFB4AAAE0C3441C4B37CE93A; - remoteInfo = "test-iterators1"; - }; - E2B0BC8523C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 77352534489D4C249A377530; - remoteInfo = "test-iterators2"; - }; - E2B0BC8723C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8BA3C7ECA35C4CD4B34FD85E; - remoteInfo = "test-json_patch"; - }; - E2B0BC8923C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = BB10A33E31FE4C0A80A4DA82; - remoteInfo = "test-json_pointer"; - }; - E2B0BC8B23C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F3550160C4D44F47B70BCFA0; - remoteInfo = "test-large_json"; - }; - E2B0BC8D23C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D7BD1A920A264FC0BBF7B8E9; - remoteInfo = "test-merge_patch"; - }; - E2B0BC8F23C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 30B35EDBB6B448E4BD051461; - remoteInfo = "test-meta"; - }; - E2B0BC9123C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 60EA143D4D334CE4B2697A69; - remoteInfo = "test-modifiers"; - }; - E2B0BC9323C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1695CD466F684A989431A9EB; - remoteInfo = "test-msgpack"; - }; - E2B0BC9523C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EA9E0F6ECB514642BB2A1A81; - remoteInfo = "test-noexcept"; - }; - E2B0BC9723C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B7E4BE6318EF4425AA24F9FE; - remoteInfo = "test-pointer_access"; - }; - E2B0BC9923C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = C6FFD9C8D5D74E39849F9680; - remoteInfo = "test-readme"; - }; - E2B0BC9B23C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6A66B5C8D61B4FAF87DB1BC9; - remoteInfo = "test-reference_access"; - }; - E2B0BC9D23C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1D583FC89CD54AFE9B28603F; - remoteInfo = "test-regression"; - }; - E2B0BC9F23C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 312508608C2D40F08FA3757E; - remoteInfo = "test-serialization"; - }; - E2B0BCA123C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1CE615DD3B86461AA4A09D98; - remoteInfo = "test-testsuites"; - }; - E2B0BCA323C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = E12365F4CB974BE0A0EEF751; - remoteInfo = "test-to_chars"; - }; - E2B0BCA523C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D7B3F4818266470CB6D85BD9; - remoteInfo = "test-ubjson"; - }; - E2B0BCA723C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8B4EFC9D549945698686279E; - remoteInfo = "test-udt"; - }; - E2B0BCA923C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = E39AE34EAE754581A61D45DF; - remoteInfo = "test-unicode"; - }; - E2B0BCAB23C3B4A6007C7960 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D422246B690A4401B5E26EC8; - remoteInfo = "test-wstring"; - }; - E2CDC4BA226A407500E9FCED /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6A32E6F03058423EABB7DA69; - remoteInfo = cryptest; - }; E2CDC4BC226A407500E9FCED /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; @@ -551,13 +242,6 @@ remoteGlobalIDString = 4A280009CAAA4A3CA1C33D3F; remoteInfo = "cryptopp-static"; }; - E2D920CF226B1C4C0042A774 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 9CE00313BA304394B8CA6A91; - remoteInfo = "cryptopp-object"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -594,14 +278,20 @@ buildActionMask = 2147483647; files = ( E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */, + E279ABAF242F9A9800DBA9FA /* libodr_odf.a in Frameworks */, + E279ABA6242F9A9700DBA9FA /* libcryptopp-object.a in Frameworks */, + E279ABB2242F9A9800DBA9FA /* libodr.a in Frameworks */, + E279ABB3242F9A9800DBA9FA /* libtinyxml2.a in Frameworks */, + E279ABAB242F9A9700DBA9FA /* libminiz.a in Frameworks */, E23795302274844400BA7238 /* AdSupport.framework in Frameworks */, - E2D920F0226B1C7D0042A774 /* libcryptopp-object.a in Frameworks */, - E2A3EE742259FA3100511BD2 /* libtinyxml2.a in Frameworks */, + E279ABB0242F9A9800DBA9FA /* libodr_ooxml.a in Frameworks */, E26C39392250DC6E009C484A /* WebKit.framework in Frameworks */, - E26C392C2250D926009C484A /* libglog.a in Frameworks */, - E26C392D2250D926009C484A /* libminiz.a in Frameworks */, - E26C392E2250D926009C484A /* libodrlib.a in Frameworks */, + E279ABAE242F9A9700DBA9FA /* libodr_crypto.a in Frameworks */, + E279ABAD242F9A9700DBA9FA /* libodr_common.a in Frameworks */, + E279ABAA242F9A9700DBA9FA /* libglogd.a in Frameworks */, 21E6C5303C9ED8A9A9317BEC /* Pods_OpenDocumentReader.framework in Frameworks */, + E279ABAC242F9A9700DBA9FA /* libodr_access.a in Frameworks */, + E279ABB1242F9A9800DBA9FA /* libodr_svm.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -620,76 +310,24 @@ E26C38EB2250D91C009C484A /* Products */ = { isa = PBXGroup; children = ( - E2CDC4BB226A407500E9FCED /* cryptest.exe */, + E22E2FD02427F6A900E8071C /* back_translate */, E2CDC4BD226A407500E9FCED /* libcryptopp-object.a */, E2CDC4BF226A407500E9FCED /* libcryptopp.dylib */, E2CDC4C1226A407500E9FCED /* libcryptopp.a */, - E26C39092250D91C009C484A /* demangle_unittest */, - E2B0BC5823C3B4A6007C7960 /* libdoctest_main.a */, - E26C390B2250D91C009C484A /* example1 */, - E26C390D2250D91C009C484A /* example2 */, - E26C390F2250D91C009C484A /* example3 */, - E26C39112250D91C009C484A /* example4 */, - E26C39132250D91C009C484A /* example5 */, - E26C39152250D91C009C484A /* example6 */, - E26C39172250D91C009C484A /* libglog.a */, - E29A02222365EF7800BD6A96 /* libgmockd.a */, - E29A02242365EF7800BD6A96 /* libgmock_maind.a */, + E26C39172250D91C009C484A /* libglogd.a */, E29A02262365EF7800BD6A96 /* libgtestd.a */, E29A02282365EF7800BD6A96 /* libgtest_maind.a */, - E26C39192250D91C009C484A /* logging_unittest */, E26C391B2250D91C009C484A /* libminiz.a */, - E26C391D2250D91C009C484A /* libodrlib.a */, - E29A022A2365EF7800BD6A96 /* odrmain */, - E26C391F2250D91C009C484A /* odrtests */, - E26C39212250D91C009C484A /* signalhandler_unittest */, - E26C39232250D91C009C484A /* stacktrace_unittest */, - E26C39252250D91C009C484A /* stl_logging_unittest */, - E26C39272250D91C009C484A /* symbolize_unittest */, - E2B0BC5A23C3B4A6007C7960 /* test-algorithms */, - E2B0BC5C23C3B4A6007C7960 /* test-allocator */, - E2B0BC5E23C3B4A6007C7960 /* test-alt-string */, - E2B0BC6023C3B4A6007C7960 /* test-bson */, - E2B0BC6223C3B4A6007C7960 /* test-capacity */, - E2B0BC6423C3B4A6007C7960 /* test-cbor */, - E2B0BC6623C3B4A6007C7960 /* test-class_const_iterator */, - E2B0BC6823C3B4A6007C7960 /* test-class_iterator */, - E2B0BC6A23C3B4A6007C7960 /* test-class_lexer */, - E2B0BC6C23C3B4A6007C7960 /* test-class_parser */, - E2B0BC6E23C3B4A6007C7960 /* test-comparison */, - E2B0BC7023C3B4A6007C7960 /* test-concepts */, - E2B0BC7223C3B4A6007C7960 /* test-constructor1 */, - E2B0BC7423C3B4A6007C7960 /* test-constructor2 */, - E2B0BC7623C3B4A6007C7960 /* test-convenience */, - E2B0BC7823C3B4A6007C7960 /* test-conversions */, - E2B0BC7A23C3B4A6007C7960 /* test-deserialization */, - E2B0BC7C23C3B4A6007C7960 /* test-element_access1 */, - E2B0BC7E23C3B4A6007C7960 /* test-element_access2 */, - E2B0BC8023C3B4A6007C7960 /* test-inspection */, - E2B0BC8223C3B4A6007C7960 /* test-items */, - E2B0BC8423C3B4A6007C7960 /* test-iterators1 */, - E2B0BC8623C3B4A6007C7960 /* test-iterators2 */, - E2B0BC8823C3B4A6007C7960 /* test-json_patch */, - E2B0BC8A23C3B4A6007C7960 /* test-json_pointer */, - E2B0BC8C23C3B4A6007C7960 /* test-large_json */, - E2B0BC8E23C3B4A6007C7960 /* test-merge_patch */, - E2B0BC9023C3B4A6007C7960 /* test-meta */, - E2B0BC9223C3B4A6007C7960 /* test-modifiers */, - E2B0BC9423C3B4A6007C7960 /* test-msgpack */, - E2B0BC9623C3B4A6007C7960 /* test-noexcept */, - E2B0BC9823C3B4A6007C7960 /* test-pointer_access */, - E2B0BC9A23C3B4A6007C7960 /* test-readme */, - E2B0BC9C23C3B4A6007C7960 /* test-reference_access */, - E2B0BC9E23C3B4A6007C7960 /* test-regression */, - E2B0BCA023C3B4A6007C7960 /* test-serialization */, - E2B0BCA223C3B4A6007C7960 /* test-testsuites */, - E2B0BCA423C3B4A6007C7960 /* test-to_chars */, - E2B0BCA623C3B4A6007C7960 /* test-ubjson */, - E2B0BCA823C3B4A6007C7960 /* test-udt */, - E2B0BCAA23C3B4A6007C7960 /* test-unicode */, - E2B0BCAC23C3B4A6007C7960 /* test-wstring */, + E22E2FD22427F6A900E8071C /* libodr.a */, + E22E2FD42427F6A900E8071C /* libodr_access.a */, + E22E2FD62427F6A900E8071C /* libodr_common.a */, + E22E2FD82427F6A900E8071C /* libodr_crypto.a */, + E22E2FDA2427F6A900E8071C /* libodr_odf.a */, + E22E2FDC2427F6A900E8071C /* libodr_ooxml.a */, + E22E2FDE2427F6A900E8071C /* libodr_svm.a */, + E22E2FE02427F6A900E8071C /* odr_test */, E26C39292250D91C009C484A /* libtinyxml2.a */, - E26C392B2250D91C009C484A /* utilities_unittest */, + E22E2FE22427F6A900E8071C /* translate */, ); name = Products; sourceTree = ""; @@ -760,16 +398,22 @@ E2F7ED4C220B54D600D63515 /* Frameworks */, E2F7ED4D220B54D600D63515 /* Resources */, F435F37405C0FE5E8503721A /* [CP] Embed Pods Frameworks */, - E2C41D0F226DEF390049EF8E /* ShellScript */, + E2C41D0F226DEF390049EF8E /* Run Script */, ); buildRules = ( ); dependencies = ( - E2D920D0226B1C4C0042A774 /* PBXTargetDependency */, - E26C39312250D976009C484A /* PBXTargetDependency */, - E26C39332250D976009C484A /* PBXTargetDependency */, - E26C39352250D976009C484A /* PBXTargetDependency */, - E26C39372250D976009C484A /* PBXTargetDependency */, + E279ABBC242F9B3800DBA9FA /* PBXTargetDependency */, + E279ABC2242F9B3800DBA9FA /* PBXTargetDependency */, + E279ABC4242F9B3800DBA9FA /* PBXTargetDependency */, + E279ABC6242F9B3800DBA9FA /* PBXTargetDependency */, + E279ABC8242F9B3800DBA9FA /* PBXTargetDependency */, + E279ABCA242F9B3800DBA9FA /* PBXTargetDependency */, + E279ABCC242F9B3800DBA9FA /* PBXTargetDependency */, + E279ABCE242F9B3800DBA9FA /* PBXTargetDependency */, + E279ABD0242F9B3800DBA9FA /* PBXTargetDependency */, + E279ABD2242F9B3800DBA9FA /* PBXTargetDependency */, + E279ABD4242F9B3800DBA9FA /* PBXTargetDependency */, ); name = OpenDocumentReader; productName = "OpenDocument Reader"; @@ -817,129 +461,91 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - E26C39092250D91C009C484A /* demangle_unittest */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = demangle_unittest; - path = demangle_unittest.app; - remoteRef = E26C39082250D91C009C484A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E26C390B2250D91C009C484A /* example1 */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = example1; - path = example1.app; - remoteRef = E26C390A2250D91C009C484A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E26C390D2250D91C009C484A /* example2 */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = example2; - path = example2.app; - remoteRef = E26C390C2250D91C009C484A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E26C390F2250D91C009C484A /* example3 */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = example3; - path = example3.app; - remoteRef = E26C390E2250D91C009C484A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E26C39112250D91C009C484A /* example4 */ = { + E22E2FD02427F6A900E8071C /* back_translate */ = { isa = PBXReferenceProxy; fileType = "compiled.mach-o.executable"; - name = example4; - path = example4.app; - remoteRef = E26C39102250D91C009C484A /* PBXContainerItemProxy */; + name = back_translate; + path = back_translate.app; + remoteRef = E22E2FCF2427F6A900E8071C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E26C39132250D91C009C484A /* example5 */ = { + E22E2FD22427F6A900E8071C /* libodr.a */ = { isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = example5; - path = example5.app; - remoteRef = E26C39122250D91C009C484A /* PBXContainerItemProxy */; + fileType = archive.ar; + path = libodr.a; + remoteRef = E22E2FD12427F6A900E8071C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E26C39152250D91C009C484A /* example6 */ = { + E22E2FD42427F6A900E8071C /* libodr_access.a */ = { isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = example6; - path = example6.app; - remoteRef = E26C39142250D91C009C484A /* PBXContainerItemProxy */; + fileType = archive.ar; + path = libodr_access.a; + remoteRef = E22E2FD32427F6A900E8071C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E26C39172250D91C009C484A /* libglog.a */ = { + E22E2FD62427F6A900E8071C /* libodr_common.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libglog.a; - remoteRef = E26C39162250D91C009C484A /* PBXContainerItemProxy */; + path = libodr_common.a; + remoteRef = E22E2FD52427F6A900E8071C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E26C39192250D91C009C484A /* logging_unittest */ = { + E22E2FD82427F6A900E8071C /* libodr_crypto.a */ = { isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = logging_unittest; - path = logging_unittest.app; - remoteRef = E26C39182250D91C009C484A /* PBXContainerItemProxy */; + fileType = archive.ar; + path = libodr_crypto.a; + remoteRef = E22E2FD72427F6A900E8071C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E26C391B2250D91C009C484A /* libminiz.a */ = { + E22E2FDA2427F6A900E8071C /* libodr_odf.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libminiz.a; - remoteRef = E26C391A2250D91C009C484A /* PBXContainerItemProxy */; + path = libodr_odf.a; + remoteRef = E22E2FD92427F6A900E8071C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E26C391D2250D91C009C484A /* libodrlib.a */ = { + E22E2FDC2427F6A900E8071C /* libodr_ooxml.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libodrlib.a; - remoteRef = E26C391C2250D91C009C484A /* PBXContainerItemProxy */; + path = libodr_ooxml.a; + remoteRef = E22E2FDB2427F6A900E8071C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E26C391F2250D91C009C484A /* odrtests */ = { + E22E2FDE2427F6A900E8071C /* libodr_svm.a */ = { isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = odrtests; - path = odrtests.app; - remoteRef = E26C391E2250D91C009C484A /* PBXContainerItemProxy */; + fileType = archive.ar; + path = libodr_svm.a; + remoteRef = E22E2FDD2427F6A900E8071C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E26C39212250D91C009C484A /* signalhandler_unittest */ = { + E22E2FE02427F6A900E8071C /* odr_test */ = { isa = PBXReferenceProxy; fileType = "compiled.mach-o.executable"; - name = signalhandler_unittest; - path = signalhandler_unittest.app; - remoteRef = E26C39202250D91C009C484A /* PBXContainerItemProxy */; + name = odr_test; + path = odr_test.app; + remoteRef = E22E2FDF2427F6A900E8071C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E26C39232250D91C009C484A /* stacktrace_unittest */ = { + E22E2FE22427F6A900E8071C /* translate */ = { isa = PBXReferenceProxy; fileType = "compiled.mach-o.executable"; - name = stacktrace_unittest; - path = stacktrace_unittest.app; - remoteRef = E26C39222250D91C009C484A /* PBXContainerItemProxy */; + name = translate; + path = translate.app; + remoteRef = E22E2FE12427F6A900E8071C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E26C39252250D91C009C484A /* stl_logging_unittest */ = { + E26C39172250D91C009C484A /* libglogd.a */ = { isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = stl_logging_unittest; - path = stl_logging_unittest.app; - remoteRef = E26C39242250D91C009C484A /* PBXContainerItemProxy */; + fileType = archive.ar; + path = libglogd.a; + remoteRef = E26C39162250D91C009C484A /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E26C39272250D91C009C484A /* symbolize_unittest */ = { + E26C391B2250D91C009C484A /* libminiz.a */ = { isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = symbolize_unittest; - path = symbolize_unittest.app; - remoteRef = E26C39262250D91C009C484A /* PBXContainerItemProxy */; + fileType = archive.ar; + path = libminiz.a; + remoteRef = E26C391A2250D91C009C484A /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; E26C39292250D91C009C484A /* libtinyxml2.a */ = { @@ -949,28 +555,6 @@ remoteRef = E26C39282250D91C009C484A /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E26C392B2250D91C009C484A /* utilities_unittest */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = utilities_unittest; - path = utilities_unittest.app; - remoteRef = E26C392A2250D91C009C484A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E29A02222365EF7800BD6A96 /* libgmockd.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libgmockd.a; - remoteRef = E29A02212365EF7800BD6A96 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E29A02242365EF7800BD6A96 /* libgmock_maind.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libgmock_maind.a; - remoteRef = E29A02232365EF7800BD6A96 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; E29A02262365EF7800BD6A96 /* libgtestd.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -985,365 +569,6 @@ remoteRef = E29A02272365EF7800BD6A96 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E29A022A2365EF7800BD6A96 /* odrmain */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = odrmain; - path = odrmain.app; - remoteRef = E29A02292365EF7800BD6A96 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC5823C3B4A6007C7960 /* libdoctest_main.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libdoctest_main.a; - remoteRef = E2B0BC5723C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC5A23C3B4A6007C7960 /* test-algorithms */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-algorithms"; - path = "test-algorithms.app"; - remoteRef = E2B0BC5923C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC5C23C3B4A6007C7960 /* test-allocator */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-allocator"; - path = "test-allocator.app"; - remoteRef = E2B0BC5B23C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC5E23C3B4A6007C7960 /* test-alt-string */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-alt-string"; - path = "test-alt-string.app"; - remoteRef = E2B0BC5D23C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC6023C3B4A6007C7960 /* test-bson */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-bson"; - path = "test-bson.app"; - remoteRef = E2B0BC5F23C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC6223C3B4A6007C7960 /* test-capacity */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-capacity"; - path = "test-capacity.app"; - remoteRef = E2B0BC6123C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC6423C3B4A6007C7960 /* test-cbor */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-cbor"; - path = "test-cbor.app"; - remoteRef = E2B0BC6323C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC6623C3B4A6007C7960 /* test-class_const_iterator */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-class_const_iterator"; - path = "test-class_const_iterator.app"; - remoteRef = E2B0BC6523C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC6823C3B4A6007C7960 /* test-class_iterator */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-class_iterator"; - path = "test-class_iterator.app"; - remoteRef = E2B0BC6723C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC6A23C3B4A6007C7960 /* test-class_lexer */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-class_lexer"; - path = "test-class_lexer.app"; - remoteRef = E2B0BC6923C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC6C23C3B4A6007C7960 /* test-class_parser */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-class_parser"; - path = "test-class_parser.app"; - remoteRef = E2B0BC6B23C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC6E23C3B4A6007C7960 /* test-comparison */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-comparison"; - path = "test-comparison.app"; - remoteRef = E2B0BC6D23C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC7023C3B4A6007C7960 /* test-concepts */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-concepts"; - path = "test-concepts.app"; - remoteRef = E2B0BC6F23C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC7223C3B4A6007C7960 /* test-constructor1 */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-constructor1"; - path = "test-constructor1.app"; - remoteRef = E2B0BC7123C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC7423C3B4A6007C7960 /* test-constructor2 */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-constructor2"; - path = "test-constructor2.app"; - remoteRef = E2B0BC7323C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC7623C3B4A6007C7960 /* test-convenience */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-convenience"; - path = "test-convenience.app"; - remoteRef = E2B0BC7523C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC7823C3B4A6007C7960 /* test-conversions */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-conversions"; - path = "test-conversions.app"; - remoteRef = E2B0BC7723C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC7A23C3B4A6007C7960 /* test-deserialization */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-deserialization"; - path = "test-deserialization.app"; - remoteRef = E2B0BC7923C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC7C23C3B4A6007C7960 /* test-element_access1 */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-element_access1"; - path = "test-element_access1.app"; - remoteRef = E2B0BC7B23C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC7E23C3B4A6007C7960 /* test-element_access2 */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-element_access2"; - path = "test-element_access2.app"; - remoteRef = E2B0BC7D23C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC8023C3B4A6007C7960 /* test-inspection */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-inspection"; - path = "test-inspection.app"; - remoteRef = E2B0BC7F23C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC8223C3B4A6007C7960 /* test-items */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-items"; - path = "test-items.app"; - remoteRef = E2B0BC8123C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC8423C3B4A6007C7960 /* test-iterators1 */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-iterators1"; - path = "test-iterators1.app"; - remoteRef = E2B0BC8323C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC8623C3B4A6007C7960 /* test-iterators2 */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-iterators2"; - path = "test-iterators2.app"; - remoteRef = E2B0BC8523C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC8823C3B4A6007C7960 /* test-json_patch */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-json_patch"; - path = "test-json_patch.app"; - remoteRef = E2B0BC8723C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC8A23C3B4A6007C7960 /* test-json_pointer */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-json_pointer"; - path = "test-json_pointer.app"; - remoteRef = E2B0BC8923C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC8C23C3B4A6007C7960 /* test-large_json */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-large_json"; - path = "test-large_json.app"; - remoteRef = E2B0BC8B23C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC8E23C3B4A6007C7960 /* test-merge_patch */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-merge_patch"; - path = "test-merge_patch.app"; - remoteRef = E2B0BC8D23C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC9023C3B4A6007C7960 /* test-meta */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-meta"; - path = "test-meta.app"; - remoteRef = E2B0BC8F23C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC9223C3B4A6007C7960 /* test-modifiers */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-modifiers"; - path = "test-modifiers.app"; - remoteRef = E2B0BC9123C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC9423C3B4A6007C7960 /* test-msgpack */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-msgpack"; - path = "test-msgpack.app"; - remoteRef = E2B0BC9323C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC9623C3B4A6007C7960 /* test-noexcept */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-noexcept"; - path = "test-noexcept.app"; - remoteRef = E2B0BC9523C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC9823C3B4A6007C7960 /* test-pointer_access */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-pointer_access"; - path = "test-pointer_access.app"; - remoteRef = E2B0BC9723C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC9A23C3B4A6007C7960 /* test-readme */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-readme"; - path = "test-readme.app"; - remoteRef = E2B0BC9923C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC9C23C3B4A6007C7960 /* test-reference_access */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-reference_access"; - path = "test-reference_access.app"; - remoteRef = E2B0BC9B23C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BC9E23C3B4A6007C7960 /* test-regression */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-regression"; - path = "test-regression.app"; - remoteRef = E2B0BC9D23C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BCA023C3B4A6007C7960 /* test-serialization */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-serialization"; - path = "test-serialization.app"; - remoteRef = E2B0BC9F23C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BCA223C3B4A6007C7960 /* test-testsuites */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-testsuites"; - path = "test-testsuites.app"; - remoteRef = E2B0BCA123C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BCA423C3B4A6007C7960 /* test-to_chars */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-to_chars"; - path = "test-to_chars.app"; - remoteRef = E2B0BCA323C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BCA623C3B4A6007C7960 /* test-ubjson */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-ubjson"; - path = "test-ubjson.app"; - remoteRef = E2B0BCA523C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BCA823C3B4A6007C7960 /* test-udt */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-udt"; - path = "test-udt.app"; - remoteRef = E2B0BCA723C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BCAA23C3B4A6007C7960 /* test-unicode */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-unicode"; - path = "test-unicode.app"; - remoteRef = E2B0BCA923C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2B0BCAC23C3B4A6007C7960 /* test-wstring */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = "test-wstring"; - path = "test-wstring.app"; - remoteRef = E2B0BCAB23C3B4A6007C7960 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E2CDC4BB226A407500E9FCED /* cryptest.exe */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = cryptest.exe; - path = cryptest.exe.app; - remoteRef = E2CDC4BA226A407500E9FCED /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; E2CDC4BD226A407500E9FCED /* libcryptopp-object.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1405,7 +630,7 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - E2C41D0F226DEF390049EF8E /* ShellScript */ = { + E2C41D0F226DEF390049EF8E /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -1415,6 +640,7 @@ inputPaths = ( "$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)", ); + name = "Run Script"; outputFileListPaths = ( ); outputPaths = ( @@ -1463,30 +689,60 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - E26C39312250D976009C484A /* PBXTargetDependency */ = { + E279ABBC242F9B3800DBA9FA /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cryptopp-object"; + targetProxy = E279ABBB242F9B3800DBA9FA /* PBXContainerItemProxy */; + }; + E279ABC2242F9B3800DBA9FA /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = glog; - targetProxy = E26C39302250D976009C484A /* PBXContainerItemProxy */; + targetProxy = E279ABC1242F9B3800DBA9FA /* PBXContainerItemProxy */; }; - E26C39332250D976009C484A /* PBXTargetDependency */ = { + E279ABC4242F9B3800DBA9FA /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = miniz; - targetProxy = E26C39322250D976009C484A /* PBXContainerItemProxy */; + targetProxy = E279ABC3242F9B3800DBA9FA /* PBXContainerItemProxy */; }; - E26C39352250D976009C484A /* PBXTargetDependency */ = { + E279ABC6242F9B3800DBA9FA /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = odrlib; - targetProxy = E26C39342250D976009C484A /* PBXContainerItemProxy */; + name = odr; + targetProxy = E279ABC5242F9B3800DBA9FA /* PBXContainerItemProxy */; }; - E26C39372250D976009C484A /* PBXTargetDependency */ = { + E279ABC8242F9B3800DBA9FA /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = tinyxml2; - targetProxy = E26C39362250D976009C484A /* PBXContainerItemProxy */; + name = odr_access; + targetProxy = E279ABC7242F9B3800DBA9FA /* PBXContainerItemProxy */; }; - E2D920D0226B1C4C0042A774 /* PBXTargetDependency */ = { + E279ABCA242F9B3800DBA9FA /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "cryptopp-object"; - targetProxy = E2D920CF226B1C4C0042A774 /* PBXContainerItemProxy */; + name = odr_common; + targetProxy = E279ABC9242F9B3800DBA9FA /* PBXContainerItemProxy */; + }; + E279ABCC242F9B3800DBA9FA /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = odr_crypto; + targetProxy = E279ABCB242F9B3800DBA9FA /* PBXContainerItemProxy */; + }; + E279ABCE242F9B3800DBA9FA /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = odr_odf; + targetProxy = E279ABCD242F9B3800DBA9FA /* PBXContainerItemProxy */; + }; + E279ABD0242F9B3800DBA9FA /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = odr_ooxml; + targetProxy = E279ABCF242F9B3800DBA9FA /* PBXContainerItemProxy */; + }; + E279ABD2242F9B3800DBA9FA /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = odr_svm; + targetProxy = E279ABD1242F9B3800DBA9FA /* PBXContainerItemProxy */; + }; + E279ABD4242F9B3800DBA9FA /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = tinyxml2; + targetProxy = E279ABD3242F9B3800DBA9FA /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -1633,7 +889,7 @@ DEVELOPMENT_TEAM = 5LS6X97G6J; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/OpenDocument.core/include/**", + "$(PROJECT_DIR)/OpenDocument.core/odr/include/**", ); INFOPLIST_FILE = OpenDocumentReader/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; @@ -1663,7 +919,7 @@ DEVELOPMENT_TEAM = 5LS6X97G6J; HEADER_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/OpenDocument.core/include/**", + "$(PROJECT_DIR)/OpenDocument.core/odr/include/**", ); INFOPLIST_FILE = OpenDocumentReader/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; diff --git a/OpenDocumentReader/CoreWrapper.mm b/OpenDocumentReader/CoreWrapper.mm index 28e5546..de0ee5a 100644 --- a/OpenDocumentReader/CoreWrapper.mm +++ b/OpenDocumentReader/CoreWrapper.mm @@ -10,9 +10,9 @@ #import "CoreWrapper.h" -#include "OpenDocumentReader.h" -#include "TranslationConfig.h" -#include "FileMeta.h" +#include "odr/OpenDocumentReader.h" +#include "odr/Config.h" +#include "odr/Meta.h" @implementation CoreWrapper { odr::OpenDocumentReader translator; @@ -58,7 +58,7 @@ - (bool)translate:(NSString *)inputPath into:(NSString *)outputPath at:(NSNumber initialized = true; } - odr::TranslationConfig config = {}; + odr::Config config = {}; config.editable = editable; config.entryOffset = page.intValue; config.entryCount = 1; From 206899a3dc7571c865d0533285310107c079c1fb Mon Sep 17 00:00:00 2001 From: Thomas Taschauer Date: Sun, 29 Mar 2020 10:07:34 +0200 Subject: [PATCH 03/10] use android-build branch of core --- CMakeLists.txt | 10 + OpenDocument.core | 2 +- OpenDocumentReader.xcodeproj/project.pbxproj | 504 +++++++++---------- build.sh | 2 +- 4 files changed, 256 insertions(+), 262 deletions(-) create mode 100644 CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..fbc7f2a --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,10 @@ +cmake_minimum_required(VERSION 3.12.4) + +option (ODR_TEST "" OFF) +set(ODR_TEST OFF) + +# set both to ON for simulator builds, off for devices +option(DISABLE_ASM "" OFF) +set(DISABLE_ASM OFF) + +add_subdirectory(OpenDocument.core) diff --git a/OpenDocument.core b/OpenDocument.core index 6f9dc44..b7df243 160000 --- a/OpenDocument.core +++ b/OpenDocument.core @@ -1 +1 @@ -Subproject commit 6f9dc4442ebfb55d250227281f2b0ebd7439fb5e +Subproject commit b7df243d3cf32b7dcabc20c6b11a7839f424cf3b diff --git a/OpenDocumentReader.xcodeproj/project.pbxproj b/OpenDocumentReader.xcodeproj/project.pbxproj index d57462d..e2f4e34 100644 --- a/OpenDocumentReader.xcodeproj/project.pbxproj +++ b/OpenDocumentReader.xcodeproj/project.pbxproj @@ -12,23 +12,23 @@ AC384BCE23B4FFA700C7BF47 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC384BCA23B4FFA700C7BF47 /* Constants.swift */; }; AC384BCF23B4FFA700C7BF47 /* PageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC384BCB23B4FFA700C7BF47 /* PageViewController.swift */; }; E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2064DDF22CFA1BA006441F8 /* iAd.framework */; }; + E21C59A124308C590076C37C /* libcryptopp-object.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C598224308C3E0076C37C /* libcryptopp-object.a */; }; + E21C59A324308C590076C37C /* libglogd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C598824308C3E0076C37C /* libglogd.a */; }; + E21C59A424308C590076C37C /* libminiz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C598E24308C3E0076C37C /* libminiz.a */; }; + E21C59A524308C590076C37C /* libodr_access.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599224308C3E0076C37C /* libodr_access.a */; }; + E21C59A624308C590076C37C /* libodr_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599424308C3E0076C37C /* libodr_common.a */; }; + E21C59A724308C590076C37C /* libodr_crypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599624308C3E0076C37C /* libodr_crypto.a */; }; + E21C59A824308C590076C37C /* libodr_odf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599824308C3E0076C37C /* libodr_odf.a */; }; + E21C59A924308C590076C37C /* libodr_ooxml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599A24308C3E0076C37C /* libodr_ooxml.a */; }; + E21C59AA24308C5A0076C37C /* libodr_svm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599C24308C3E0076C37C /* libodr_svm.a */; }; + E21C59AB24308C5A0076C37C /* libodr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599024308C3E0076C37C /* libodr.a */; }; + E21C59AC24308C5A0076C37C /* libtinyxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599E24308C3E0076C37C /* libtinyxml2.a */; }; E22EB716226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB6F7226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift */; }; E22EB718226B633500053B86 /* Document.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB717226B633500053B86 /* Document.swift */; }; E22EB71A226B65E300053B86 /* DocumentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB719226B65E300053B86 /* DocumentViewController.swift */; }; E22EB71C226B66B300053B86 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E22EB71B226B66B300053B86 /* Main.storyboard */; }; E23795302274844400BA7238 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E237952F2274844400BA7238 /* AdSupport.framework */; }; E26C39392250DC6E009C484A /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E26C39382250DC6E009C484A /* WebKit.framework */; }; - E279ABA6242F9A9700DBA9FA /* libcryptopp-object.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E2CDC4BD226A407500E9FCED /* libcryptopp-object.a */; }; - E279ABAA242F9A9700DBA9FA /* libglogd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E26C39172250D91C009C484A /* libglogd.a */; }; - E279ABAB242F9A9700DBA9FA /* libminiz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E26C391B2250D91C009C484A /* libminiz.a */; }; - E279ABAC242F9A9700DBA9FA /* libodr_access.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E22E2FD42427F6A900E8071C /* libodr_access.a */; }; - E279ABAD242F9A9700DBA9FA /* libodr_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E22E2FD62427F6A900E8071C /* libodr_common.a */; }; - E279ABAE242F9A9700DBA9FA /* libodr_crypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E22E2FD82427F6A900E8071C /* libodr_crypto.a */; }; - E279ABAF242F9A9800DBA9FA /* libodr_odf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E22E2FDA2427F6A900E8071C /* libodr_odf.a */; }; - E279ABB0242F9A9800DBA9FA /* libodr_ooxml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E22E2FDC2427F6A900E8071C /* libodr_ooxml.a */; }; - E279ABB1242F9A9800DBA9FA /* libodr_svm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E22E2FDE2427F6A900E8071C /* libodr_svm.a */; }; - E279ABB2242F9A9800DBA9FA /* libodr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E22E2FD22427F6A900E8071C /* libodr.a */; }; - E279ABB3242F9A9800DBA9FA /* libtinyxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E26C39292250D91C009C484A /* libtinyxml2.a */; }; E29E4077225A4672002C06E6 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = E29E4076225A4672002C06E6 /* GoogleService-Info.plist */; }; E2C008FA220F1CF80097C594 /* CoreWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = E2C008F9220F1CF80097C594 /* CoreWrapper.mm */; }; E2D0B3D9226D945400534FCC /* StoreReviewHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2D0B3D8226D945400534FCC /* StoreReviewHelper.swift */; }; @@ -39,209 +39,202 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - E22E2FCF2427F6A900E8071C /* PBXContainerItemProxy */ = { + E21C597F24308C3E0076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 2; - remoteGlobalIDString = D731DD15B7154BD18E35E076; + remoteGlobalIDString = D5147A6C93074C56B4FFDC8F; remoteInfo = back_translate; }; - E22E2FD12427F6A900E8071C /* PBXContainerItemProxy */ = { + E21C598124308C3E0076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 56E24BEDA81F4B3D90783E15; - remoteInfo = odr; + remoteGlobalIDString = 9C5A662942C043859307595D; + remoteInfo = "cryptopp-object"; }; - E22E2FD32427F6A900E8071C /* PBXContainerItemProxy */ = { + E21C598324308C3E0076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 2; - remoteGlobalIDString = CAB030939EE14DB2ABC2DB2C; - remoteInfo = odr_access; + remoteGlobalIDString = 8F3409E62DBD4E10A6FDEB2D; + remoteInfo = "cryptopp-shared"; }; - E22E2FD52427F6A900E8071C /* PBXContainerItemProxy */ = { + E21C598524308C3E0076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 3742244A680B45B79E591660; - remoteInfo = odr_common; + remoteGlobalIDString = DE5E1FF9CE05464881820994; + remoteInfo = "cryptopp-static"; }; - E22E2FD72427F6A900E8071C /* PBXContainerItemProxy */ = { + E21C598724308C3E0076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 7EAEBDBE9DB64D0888433DEE; - remoteInfo = odr_crypto; + remoteGlobalIDString = 1A0F88C6684B4A73AACB18FF; + remoteInfo = glog; }; - E22E2FD92427F6A900E8071C /* PBXContainerItemProxy */ = { + E21C598924308C3E0076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 2; - remoteGlobalIDString = C922F101B53A4269998F47D8; - remoteInfo = odr_odf; + remoteGlobalIDString = 4B3B1BDF6ADD479CA9D1F15B; + remoteInfo = gtest; }; - E22E2FDB2427F6A900E8071C /* PBXContainerItemProxy */ = { + E21C598B24308C3E0076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 9D3C174D3AC44109BFCC1A30; - remoteInfo = odr_ooxml; + remoteGlobalIDString = 23AE3CEA1FA749E391C66698; + remoteInfo = gtest_main; }; - E22E2FDD2427F6A900E8071C /* PBXContainerItemProxy */ = { + E21C598D24308C3E0076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 8BD77C986E9943838C90E661; - remoteInfo = odr_svm; + remoteGlobalIDString = FE69BCE5C804491F8937A7B3; + remoteInfo = miniz; }; - E22E2FDF2427F6A900E8071C /* PBXContainerItemProxy */ = { + E21C598F24308C3E0076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 2; - remoteGlobalIDString = E2B9C082EAE545A8ABE0ED1D; - remoteInfo = odr_test; + remoteGlobalIDString = 12E6C7F674EF41DB8F412071; + remoteInfo = odr; }; - E22E2FE12427F6A900E8071C /* PBXContainerItemProxy */ = { + E21C599124308C3E0076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 7DB86CB9CF974084A54B0C78; - remoteInfo = translate; + remoteGlobalIDString = F0AF55C8AE4449E09920914C; + remoteInfo = odr_access; }; - E26C39162250D91C009C484A /* PBXContainerItemProxy */ = { + E21C599324308C3E0076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 6ED6444089C4415CB22B29EE; - remoteInfo = glog; + remoteGlobalIDString = 4C29AF28E49144A7AA33D327; + remoteInfo = odr_common; }; - E26C391A2250D91C009C484A /* PBXContainerItemProxy */ = { + E21C599524308C3E0076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 0AB486F4EB34484CB913AE70; - remoteInfo = miniz; + remoteGlobalIDString = F81FB2E5131245788F4422A6; + remoteInfo = odr_crypto; + }; + E21C599724308C3E0076C37C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8EB39161F543402AA9E10DA5; + remoteInfo = odr_odf; + }; + E21C599924308C3E0076C37C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 69481A59730F422CAC2F797C; + remoteInfo = odr_ooxml; + }; + E21C599B24308C3E0076C37C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 446E95A03302451FAB20F160; + remoteInfo = odr_svm; }; - E26C39282250D91C009C484A /* PBXContainerItemProxy */ = { + E21C599D24308C3E0076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 6F1EEDA475E54B24980CE6D3; + remoteGlobalIDString = 11EEEFF14895406BB7B97F72; remoteInfo = tinyxml2; }; - E279ABBB242F9B3800DBA9FA /* PBXContainerItemProxy */ = { + E21C599F24308C3E0076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 621B003CADD34CDAB2D110E4; + remoteInfo = translate; + }; + E21C59AD24308C720076C37C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 85ED5DEA8B84412CB6FBE625; + remoteGlobalIDString = 483F221658B64C798729DBA6; remoteInfo = "cryptopp-object"; }; - E279ABC1242F9B3800DBA9FA /* PBXContainerItemProxy */ = { + E21C59B124308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 36BF18010D474FAE80789FAF; + remoteGlobalIDString = EB3EA1E685234474A8FC6AC4; remoteInfo = glog; }; - E279ABC3242F9B3800DBA9FA /* PBXContainerItemProxy */ = { + E21C59B324308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 744A1C3C86594C9AB74BF486; + remoteGlobalIDString = 6F607BFB2BA846A088D98C30; remoteInfo = miniz; }; - E279ABC5242F9B3800DBA9FA /* PBXContainerItemProxy */ = { + E21C59B524308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 23B48782D3844B2EB37EF5EC; + remoteGlobalIDString = BA922A7D95284F5790141791; remoteInfo = odr; }; - E279ABC7242F9B3800DBA9FA /* PBXContainerItemProxy */ = { + E21C59B724308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = DCE717B5B13F4748932F2C79; + remoteGlobalIDString = 45C61071D67F4ED1994C6F71; remoteInfo = odr_access; }; - E279ABC9242F9B3800DBA9FA /* PBXContainerItemProxy */ = { + E21C59B924308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = D11A92CE9B1648F6903A561E; + remoteGlobalIDString = 2AA041F0110141749D4C63FC; remoteInfo = odr_common; }; - E279ABCB242F9B3800DBA9FA /* PBXContainerItemProxy */ = { + E21C59BB24308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 5D431CCEBBCB420588777ACD; + remoteGlobalIDString = 8C7B74D4C2514560AFF2E42C; remoteInfo = odr_crypto; }; - E279ABCD242F9B3800DBA9FA /* PBXContainerItemProxy */ = { + E21C59BD24308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 624C104C7473497B800B6697; + remoteGlobalIDString = 50812718488C455E90430EF5; remoteInfo = odr_odf; }; - E279ABCF242F9B3800DBA9FA /* PBXContainerItemProxy */ = { + E21C59BF24308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 8C40221438EA413D8E668139; + remoteGlobalIDString = FB2996AB774D46358BCEC3BF; remoteInfo = odr_ooxml; }; - E279ABD1242F9B3800DBA9FA /* PBXContainerItemProxy */ = { + E21C59C124308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = F9F8A7612BF7482BB1C0223D; + remoteGlobalIDString = F5E76FDA3FE64060BF9648D1; remoteInfo = odr_svm; }; - E279ABD3242F9B3800DBA9FA /* PBXContainerItemProxy */ = { + E21C59C324308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 8D2029D4C5124408B892010C; + remoteGlobalIDString = C5AAC7B36DDD4EC0ABA03424; remoteInfo = tinyxml2; }; - E29A02252365EF7800BD6A96 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4A3FBC799E3946AFBC52340F; - remoteInfo = gtest; - }; - E29A02272365EF7800BD6A96 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 9A974A6917734F869FAF1CC6; - remoteInfo = gtest_main; - }; - E2CDC4BC226A407500E9FCED /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 7B7DBA4588FB4881B9C19395; - remoteInfo = "cryptopp-object"; - }; - E2CDC4BE226A407500E9FCED /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D92A12F6263E4421AACE3E5A; - remoteInfo = "cryptopp-shared"; - }; - E2CDC4C0226A407500E9FCED /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4A280009CAAA4A3CA1C33D3F; - remoteInfo = "cryptopp-static"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -251,12 +244,12 @@ AC384BCB23B4FFA700C7BF47 /* PageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PageViewController.swift; sourceTree = ""; }; B3FCFC99F5757D71C0A3EB11 /* Pods-OpenDocumentReader.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReader.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.debug.xcconfig"; sourceTree = ""; }; E2064DDF22CFA1BA006441F8 /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; }; + E21C596324308C3E0076C37C /* Project.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Project.xcodeproj; path = build/Project.xcodeproj; sourceTree = ""; }; E22EB6F7226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentBrowserTransitioningDelegate.swift; sourceTree = ""; }; E22EB717226B633500053B86 /* Document.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Document.swift; sourceTree = ""; }; E22EB719226B65E300053B86 /* DocumentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentViewController.swift; sourceTree = ""; }; E22EB71B226B66B300053B86 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; E237952F2274844400BA7238 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; }; - E26C38EA2250D91C009C484A /* odr.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = odr.xcodeproj; path = build/odr.xcodeproj; sourceTree = ""; }; E26C39382250DC6E009C484A /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; E29E4076225A4672002C06E6 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; E2BB4B60220EF3A10056176B /* BridgingHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BridgingHeader.h; sourceTree = ""; }; @@ -277,21 +270,21 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + E21C59AA24308C5A0076C37C /* libodr_svm.a in Frameworks */, + E21C59A624308C590076C37C /* libodr_common.a in Frameworks */, E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */, - E279ABAF242F9A9800DBA9FA /* libodr_odf.a in Frameworks */, - E279ABA6242F9A9700DBA9FA /* libcryptopp-object.a in Frameworks */, - E279ABB2242F9A9800DBA9FA /* libodr.a in Frameworks */, - E279ABB3242F9A9800DBA9FA /* libtinyxml2.a in Frameworks */, - E279ABAB242F9A9700DBA9FA /* libminiz.a in Frameworks */, + E21C59A124308C590076C37C /* libcryptopp-object.a in Frameworks */, + E21C59A824308C590076C37C /* libodr_odf.a in Frameworks */, E23795302274844400BA7238 /* AdSupport.framework in Frameworks */, - E279ABB0242F9A9800DBA9FA /* libodr_ooxml.a in Frameworks */, + E21C59A524308C590076C37C /* libodr_access.a in Frameworks */, E26C39392250DC6E009C484A /* WebKit.framework in Frameworks */, - E279ABAE242F9A9700DBA9FA /* libodr_crypto.a in Frameworks */, - E279ABAD242F9A9700DBA9FA /* libodr_common.a in Frameworks */, - E279ABAA242F9A9700DBA9FA /* libglogd.a in Frameworks */, + E21C59AB24308C5A0076C37C /* libodr.a in Frameworks */, + E21C59AC24308C5A0076C37C /* libtinyxml2.a in Frameworks */, + E21C59A924308C590076C37C /* libodr_ooxml.a in Frameworks */, + E21C59A724308C590076C37C /* libodr_crypto.a in Frameworks */, + E21C59A324308C590076C37C /* libglogd.a in Frameworks */, 21E6C5303C9ED8A9A9317BEC /* Pods_OpenDocumentReader.framework in Frameworks */, - E279ABAC242F9A9700DBA9FA /* libodr_access.a in Frameworks */, - E279ABB1242F9A9800DBA9FA /* libodr_svm.a in Frameworks */, + E21C59A424308C590076C37C /* libminiz.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -307,27 +300,26 @@ name = Pods; sourceTree = ""; }; - E26C38EB2250D91C009C484A /* Products */ = { + E21C596424308C3E0076C37C /* Products */ = { isa = PBXGroup; children = ( - E22E2FD02427F6A900E8071C /* back_translate */, - E2CDC4BD226A407500E9FCED /* libcryptopp-object.a */, - E2CDC4BF226A407500E9FCED /* libcryptopp.dylib */, - E2CDC4C1226A407500E9FCED /* libcryptopp.a */, - E26C39172250D91C009C484A /* libglogd.a */, - E29A02262365EF7800BD6A96 /* libgtestd.a */, - E29A02282365EF7800BD6A96 /* libgtest_maind.a */, - E26C391B2250D91C009C484A /* libminiz.a */, - E22E2FD22427F6A900E8071C /* libodr.a */, - E22E2FD42427F6A900E8071C /* libodr_access.a */, - E22E2FD62427F6A900E8071C /* libodr_common.a */, - E22E2FD82427F6A900E8071C /* libodr_crypto.a */, - E22E2FDA2427F6A900E8071C /* libodr_odf.a */, - E22E2FDC2427F6A900E8071C /* libodr_ooxml.a */, - E22E2FDE2427F6A900E8071C /* libodr_svm.a */, - E22E2FE02427F6A900E8071C /* odr_test */, - E26C39292250D91C009C484A /* libtinyxml2.a */, - E22E2FE22427F6A900E8071C /* translate */, + E21C598024308C3E0076C37C /* back_translate */, + E21C598224308C3E0076C37C /* libcryptopp-object.a */, + E21C598424308C3E0076C37C /* libcryptopp.dylib */, + E21C598624308C3E0076C37C /* libcryptopp.a */, + E21C598824308C3E0076C37C /* libglogd.a */, + E21C598A24308C3E0076C37C /* libgtestd.a */, + E21C598C24308C3E0076C37C /* libgtest_maind.a */, + E21C598E24308C3E0076C37C /* libminiz.a */, + E21C599024308C3E0076C37C /* libodr.a */, + E21C599224308C3E0076C37C /* libodr_access.a */, + E21C599424308C3E0076C37C /* libodr_common.a */, + E21C599624308C3E0076C37C /* libodr_crypto.a */, + E21C599824308C3E0076C37C /* libodr_odf.a */, + E21C599A24308C3E0076C37C /* libodr_ooxml.a */, + E21C599C24308C3E0076C37C /* libodr_svm.a */, + E21C599E24308C3E0076C37C /* libtinyxml2.a */, + E21C59A024308C3E0076C37C /* translate */, ); name = Products; sourceTree = ""; @@ -338,8 +330,8 @@ E2064DDF22CFA1BA006441F8 /* iAd.framework */, E237952F2274844400BA7238 /* AdSupport.framework */, E26C39382250DC6E009C484A /* WebKit.framework */, - E26C38EA2250D91C009C484A /* odr.xcodeproj */, EF00F649A86477A6C27F07C0 /* Pods_OpenDocumentReader.framework */, + E21C596324308C3E0076C37C /* Project.xcodeproj */, ); name = Frameworks; sourceTree = ""; @@ -403,17 +395,17 @@ buildRules = ( ); dependencies = ( - E279ABBC242F9B3800DBA9FA /* PBXTargetDependency */, - E279ABC2242F9B3800DBA9FA /* PBXTargetDependency */, - E279ABC4242F9B3800DBA9FA /* PBXTargetDependency */, - E279ABC6242F9B3800DBA9FA /* PBXTargetDependency */, - E279ABC8242F9B3800DBA9FA /* PBXTargetDependency */, - E279ABCA242F9B3800DBA9FA /* PBXTargetDependency */, - E279ABCC242F9B3800DBA9FA /* PBXTargetDependency */, - E279ABCE242F9B3800DBA9FA /* PBXTargetDependency */, - E279ABD0242F9B3800DBA9FA /* PBXTargetDependency */, - E279ABD2242F9B3800DBA9FA /* PBXTargetDependency */, - E279ABD4242F9B3800DBA9FA /* PBXTargetDependency */, + E21C59AE24308C720076C37C /* PBXTargetDependency */, + E21C59B224308C720076C37C /* PBXTargetDependency */, + E21C59B424308C720076C37C /* PBXTargetDependency */, + E21C59B624308C720076C37C /* PBXTargetDependency */, + E21C59B824308C720076C37C /* PBXTargetDependency */, + E21C59BA24308C720076C37C /* PBXTargetDependency */, + E21C59BC24308C720076C37C /* PBXTargetDependency */, + E21C59BE24308C720076C37C /* PBXTargetDependency */, + E21C59C024308C720076C37C /* PBXTargetDependency */, + E21C59C224308C720076C37C /* PBXTargetDependency */, + E21C59C424308C720076C37C /* PBXTargetDependency */, ); name = OpenDocumentReader; productName = "OpenDocument Reader"; @@ -449,8 +441,8 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = E26C38EB2250D91C009C484A /* Products */; - ProjectRef = E26C38EA2250D91C009C484A /* odr.xcodeproj */; + ProductGroup = E21C596424308C3E0076C37C /* Products */; + ProjectRef = E21C596324308C3E0076C37C /* Project.xcodeproj */; }, ); projectRoot = ""; @@ -461,134 +453,126 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - E22E2FD02427F6A900E8071C /* back_translate */ = { + E21C598024308C3E0076C37C /* back_translate */ = { isa = PBXReferenceProxy; fileType = "compiled.mach-o.executable"; name = back_translate; path = back_translate.app; - remoteRef = E22E2FCF2427F6A900E8071C /* PBXContainerItemProxy */; + remoteRef = E21C597F24308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E22E2FD22427F6A900E8071C /* libodr.a */ = { + E21C598224308C3E0076C37C /* libcryptopp-object.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libodr.a; - remoteRef = E22E2FD12427F6A900E8071C /* PBXContainerItemProxy */; + path = "libcryptopp-object.a"; + remoteRef = E21C598124308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E22E2FD42427F6A900E8071C /* libodr_access.a */ = { + E21C598424308C3E0076C37C /* libcryptopp.dylib */ = { isa = PBXReferenceProxy; - fileType = archive.ar; - path = libodr_access.a; - remoteRef = E22E2FD32427F6A900E8071C /* PBXContainerItemProxy */; + fileType = "compiled.mach-o.dylib"; + name = libcryptopp.dylib; + path = libcryptopp.8.3.dylib; + remoteRef = E21C598324308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E22E2FD62427F6A900E8071C /* libodr_common.a */ = { + E21C598624308C3E0076C37C /* libcryptopp.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libodr_common.a; - remoteRef = E22E2FD52427F6A900E8071C /* PBXContainerItemProxy */; + path = libcryptopp.a; + remoteRef = E21C598524308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E22E2FD82427F6A900E8071C /* libodr_crypto.a */ = { + E21C598824308C3E0076C37C /* libglogd.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libodr_crypto.a; - remoteRef = E22E2FD72427F6A900E8071C /* PBXContainerItemProxy */; + path = libglogd.a; + remoteRef = E21C598724308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E22E2FDA2427F6A900E8071C /* libodr_odf.a */ = { + E21C598A24308C3E0076C37C /* libgtestd.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libodr_odf.a; - remoteRef = E22E2FD92427F6A900E8071C /* PBXContainerItemProxy */; + path = libgtestd.a; + remoteRef = E21C598924308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E22E2FDC2427F6A900E8071C /* libodr_ooxml.a */ = { + E21C598C24308C3E0076C37C /* libgtest_maind.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libodr_ooxml.a; - remoteRef = E22E2FDB2427F6A900E8071C /* PBXContainerItemProxy */; + path = libgtest_maind.a; + remoteRef = E21C598B24308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E22E2FDE2427F6A900E8071C /* libodr_svm.a */ = { + E21C598E24308C3E0076C37C /* libminiz.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libodr_svm.a; - remoteRef = E22E2FDD2427F6A900E8071C /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - E22E2FE02427F6A900E8071C /* odr_test */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = odr_test; - path = odr_test.app; - remoteRef = E22E2FDF2427F6A900E8071C /* PBXContainerItemProxy */; + path = libminiz.a; + remoteRef = E21C598D24308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E22E2FE22427F6A900E8071C /* translate */ = { + E21C599024308C3E0076C37C /* libodr.a */ = { isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - name = translate; - path = translate.app; - remoteRef = E22E2FE12427F6A900E8071C /* PBXContainerItemProxy */; + fileType = archive.ar; + path = libodr.a; + remoteRef = E21C598F24308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E26C39172250D91C009C484A /* libglogd.a */ = { + E21C599224308C3E0076C37C /* libodr_access.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libglogd.a; - remoteRef = E26C39162250D91C009C484A /* PBXContainerItemProxy */; + path = libodr_access.a; + remoteRef = E21C599124308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E26C391B2250D91C009C484A /* libminiz.a */ = { + E21C599424308C3E0076C37C /* libodr_common.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libminiz.a; - remoteRef = E26C391A2250D91C009C484A /* PBXContainerItemProxy */; + path = libodr_common.a; + remoteRef = E21C599324308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E26C39292250D91C009C484A /* libtinyxml2.a */ = { + E21C599624308C3E0076C37C /* libodr_crypto.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libtinyxml2.a; - remoteRef = E26C39282250D91C009C484A /* PBXContainerItemProxy */; + path = libodr_crypto.a; + remoteRef = E21C599524308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E29A02262365EF7800BD6A96 /* libgtestd.a */ = { + E21C599824308C3E0076C37C /* libodr_odf.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libgtestd.a; - remoteRef = E29A02252365EF7800BD6A96 /* PBXContainerItemProxy */; + path = libodr_odf.a; + remoteRef = E21C599724308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E29A02282365EF7800BD6A96 /* libgtest_maind.a */ = { + E21C599A24308C3E0076C37C /* libodr_ooxml.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libgtest_maind.a; - remoteRef = E29A02272365EF7800BD6A96 /* PBXContainerItemProxy */; + path = libodr_ooxml.a; + remoteRef = E21C599924308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E2CDC4BD226A407500E9FCED /* libcryptopp-object.a */ = { + E21C599C24308C3E0076C37C /* libodr_svm.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libcryptopp-object.a"; - remoteRef = E2CDC4BC226A407500E9FCED /* PBXContainerItemProxy */; + path = libodr_svm.a; + remoteRef = E21C599B24308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E2CDC4BF226A407500E9FCED /* libcryptopp.dylib */ = { + E21C599E24308C3E0076C37C /* libtinyxml2.a */ = { isa = PBXReferenceProxy; - fileType = "compiled.mach-o.dylib"; - name = libcryptopp.dylib; - path = libcryptopp.7.0.dylib; - remoteRef = E2CDC4BE226A407500E9FCED /* PBXContainerItemProxy */; + fileType = archive.ar; + path = libtinyxml2.a; + remoteRef = E21C599D24308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E2CDC4C1226A407500E9FCED /* libcryptopp.a */ = { + E21C59A024308C3E0076C37C /* translate */ = { isa = PBXReferenceProxy; - fileType = archive.ar; - path = libcryptopp.a; - remoteRef = E2CDC4C0226A407500E9FCED /* PBXContainerItemProxy */; + fileType = "compiled.mach-o.executable"; + name = translate; + path = translate.app; + remoteRef = E21C599F24308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -689,60 +673,60 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - E279ABBC242F9B3800DBA9FA /* PBXTargetDependency */ = { + E21C59AE24308C720076C37C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "cryptopp-object"; - targetProxy = E279ABBB242F9B3800DBA9FA /* PBXContainerItemProxy */; + targetProxy = E21C59AD24308C720076C37C /* PBXContainerItemProxy */; }; - E279ABC2242F9B3800DBA9FA /* PBXTargetDependency */ = { + E21C59B224308C720076C37C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = glog; - targetProxy = E279ABC1242F9B3800DBA9FA /* PBXContainerItemProxy */; + targetProxy = E21C59B124308C720076C37C /* PBXContainerItemProxy */; }; - E279ABC4242F9B3800DBA9FA /* PBXTargetDependency */ = { + E21C59B424308C720076C37C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = miniz; - targetProxy = E279ABC3242F9B3800DBA9FA /* PBXContainerItemProxy */; + targetProxy = E21C59B324308C720076C37C /* PBXContainerItemProxy */; }; - E279ABC6242F9B3800DBA9FA /* PBXTargetDependency */ = { + E21C59B624308C720076C37C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = odr; - targetProxy = E279ABC5242F9B3800DBA9FA /* PBXContainerItemProxy */; + targetProxy = E21C59B524308C720076C37C /* PBXContainerItemProxy */; }; - E279ABC8242F9B3800DBA9FA /* PBXTargetDependency */ = { + E21C59B824308C720076C37C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = odr_access; - targetProxy = E279ABC7242F9B3800DBA9FA /* PBXContainerItemProxy */; + targetProxy = E21C59B724308C720076C37C /* PBXContainerItemProxy */; }; - E279ABCA242F9B3800DBA9FA /* PBXTargetDependency */ = { + E21C59BA24308C720076C37C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = odr_common; - targetProxy = E279ABC9242F9B3800DBA9FA /* PBXContainerItemProxy */; + targetProxy = E21C59B924308C720076C37C /* PBXContainerItemProxy */; }; - E279ABCC242F9B3800DBA9FA /* PBXTargetDependency */ = { + E21C59BC24308C720076C37C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = odr_crypto; - targetProxy = E279ABCB242F9B3800DBA9FA /* PBXContainerItemProxy */; + targetProxy = E21C59BB24308C720076C37C /* PBXContainerItemProxy */; }; - E279ABCE242F9B3800DBA9FA /* PBXTargetDependency */ = { + E21C59BE24308C720076C37C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = odr_odf; - targetProxy = E279ABCD242F9B3800DBA9FA /* PBXContainerItemProxy */; + targetProxy = E21C59BD24308C720076C37C /* PBXContainerItemProxy */; }; - E279ABD0242F9B3800DBA9FA /* PBXTargetDependency */ = { + E21C59C024308C720076C37C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = odr_ooxml; - targetProxy = E279ABCF242F9B3800DBA9FA /* PBXContainerItemProxy */; + targetProxy = E21C59BF24308C720076C37C /* PBXContainerItemProxy */; }; - E279ABD2242F9B3800DBA9FA /* PBXTargetDependency */ = { + E21C59C224308C720076C37C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = odr_svm; - targetProxy = E279ABD1242F9B3800DBA9FA /* PBXContainerItemProxy */; + targetProxy = E21C59C124308C720076C37C /* PBXContainerItemProxy */; }; - E279ABD4242F9B3800DBA9FA /* PBXTargetDependency */ = { + E21C59C424308C720076C37C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = tinyxml2; - targetProxy = E279ABD3242F9B3800DBA9FA /* PBXContainerItemProxy */; + targetProxy = E21C59C324308C720076C37C /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ diff --git a/build.sh b/build.sh index 20a948e..258069c 100644 --- a/build.sh +++ b/build.sh @@ -4,5 +4,5 @@ rm -rf build mkdir build/ cd build/ -cmake -G "Xcode" -DCMAKE_TOOLCHAIN_FILE=../ios-cmake/ios.toolchain.cmake ../OpenDocument.core/ +cmake -G "Xcode" -DCMAKE_TOOLCHAIN_FILE=../ios-cmake/ios.toolchain.cmake ../ cd ../ From eb00bf491eb06396b79ca89845ff88747ccb9e58 Mon Sep 17 00:00:00 2001 From: Thomas Taschauer Date: Sun, 29 Mar 2020 10:34:55 +0200 Subject: [PATCH 04/10] use latest core --- OpenDocument.core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenDocument.core b/OpenDocument.core index b7df243..19464ac 160000 --- a/OpenDocument.core +++ b/OpenDocument.core @@ -1 +1 @@ -Subproject commit b7df243d3cf32b7dcabc20c6b11a7839f424cf3b +Subproject commit 19464ac364016c473b166d276fc38917c1652fc8 From 381f2a6bc9c7d2f9ebf4e9c46be5c39b4913e16d Mon Sep 17 00:00:00 2001 From: Thomas Taschauer Date: Sun, 29 Mar 2020 10:57:38 +0200 Subject: [PATCH 05/10] use generic platform as build destination --- .github/workflows/ios_main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios_main.yml b/.github/workflows/ios_main.yml index d3707af..183a081 100644 --- a/.github/workflows/ios_main.yml +++ b/.github/workflows/ios_main.yml @@ -7,7 +7,7 @@ jobs: runs-on: macos-latest strategy: matrix: - destination: ['platform=iOS Simulator,name=iPhone 11'] + destination: ['generic/platform=iOS'] scheme: [OpenDocumentReader] steps: - uses: actions/checkout@v1 From 27ede8b577ee3e459629b7692b9981a6bac43662 Mon Sep 17 00:00:00 2001 From: Thomas Taschauer Date: Sun, 29 Mar 2020 11:44:13 +0200 Subject: [PATCH 06/10] Revert "use generic platform as build destination" This reverts commit 381f2a6bc9c7d2f9ebf4e9c46be5c39b4913e16d. --- .github/workflows/ios_main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios_main.yml b/.github/workflows/ios_main.yml index 183a081..d3707af 100644 --- a/.github/workflows/ios_main.yml +++ b/.github/workflows/ios_main.yml @@ -7,7 +7,7 @@ jobs: runs-on: macos-latest strategy: matrix: - destination: ['generic/platform=iOS'] + destination: ['platform=iOS Simulator,name=iPhone 11'] scheme: [OpenDocumentReader] steps: - uses: actions/checkout@v1 From 6087a219e9ce727e0c67da24674d8358b68142c0 Mon Sep 17 00:00:00 2001 From: Thomas Taschauer Date: Sun, 29 Mar 2020 11:45:37 +0200 Subject: [PATCH 07/10] separate build.sh for simulator and device --- .github/workflows/ios_main.yml | 2 +- CMakeLists.txt | 4 ---- README.md | 3 ++- build.sh => build-device.sh | 0 build-simulator.sh | 8 ++++++++ 5 files changed, 11 insertions(+), 6 deletions(-) rename build.sh => build-device.sh (100%) create mode 100644 build-simulator.sh diff --git a/.github/workflows/ios_main.yml b/.github/workflows/ios_main.yml index d3707af..b250db4 100644 --- a/.github/workflows/ios_main.yml +++ b/.github/workflows/ios_main.yml @@ -16,7 +16,7 @@ jobs: - name: Install pods run: pod install - name: Run build.sh - run: bash build.sh + run: bash build-simulator.sh - name: Build run: | xcodebuild clean build -workspace OpenDocumentReader.xcworkspace -scheme "${scheme}" -destination "${destination}" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO diff --git a/CMakeLists.txt b/CMakeLists.txt index fbc7f2a..ecfe833 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,4 @@ cmake_minimum_required(VERSION 3.12.4) option (ODR_TEST "" OFF) set(ODR_TEST OFF) -# set both to ON for simulator builds, off for devices -option(DISABLE_ASM "" OFF) -set(DISABLE_ASM OFF) - add_subdirectory(OpenDocument.core) diff --git a/README.md b/README.md index 107de50..38ca187 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,5 @@ It's Android's first OpenOffice Document Reader... for iOS! ## Setup 1. run "git submodule update --init --recursive" 2. run "pod install" -3. open workspace in Xcode +3. run "bash build-simulator.sh" or "bash build-device.sh" +4. open workspace in Xcode diff --git a/build.sh b/build-device.sh similarity index 100% rename from build.sh rename to build-device.sh diff --git a/build-simulator.sh b/build-simulator.sh new file mode 100644 index 0000000..64a811d --- /dev/null +++ b/build-simulator.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +rm -rf build + +mkdir build/ +cd build/ +cmake -G "Xcode" -DCMAKE_TOOLCHAIN_FILE=../ios-cmake/ios.toolchain.cmake ../ -DDISABLE_ASM=ON +cd ../ From c94ce6e8d7a1e3d6ebe1123cf774e5986b071e48 Mon Sep 17 00:00:00 2001 From: Artsem Lemiasheuski Date: Sat, 4 Apr 2020 18:16:38 +0200 Subject: [PATCH 08/10] Add localization for different laguages --- .../DocumentBrowserViewController.swift | 6 +- .../DocumentViewController.swift | 30 ++++---- OpenDocumentReader/PageViewController.swift | 12 +-- .../ca.lproj/Localizable.strings | 74 +++++++++++++++++++ .../cs.lproj/Localizable.strings | 74 +++++++++++++++++++ .../da.lproj/Localizable.strings | 74 +++++++++++++++++++ .../de.lproj/Localizable.strings | 74 +++++++++++++++++++ .../en.lproj/Localizable.strings | 74 +++++++++++++++++++ .../es.lproj/Localizable.strings | 74 +++++++++++++++++++ .../fr.lproj/Localizable.strings | 74 +++++++++++++++++++ .../ga.lproj/Localizable.strings | 74 +++++++++++++++++++ .../it.lproj/Localizable.strings | 74 +++++++++++++++++++ .../ja.lproj/Localizable.strings | 74 +++++++++++++++++++ .../pl.lproj/Localizable.strings | 74 +++++++++++++++++++ .../pt-BR.lproj/Localizable.strings | 74 +++++++++++++++++++ .../ru.lproj/Localizable.strings | 74 +++++++++++++++++++ .../sl.lproj/Localizable.strings | 74 +++++++++++++++++++ .../tr.lproj/Localizable.strings | 74 +++++++++++++++++++ .../zh-Hans.lproj/Localizable.strings | 74 +++++++++++++++++++ 19 files changed, 1208 insertions(+), 24 deletions(-) create mode 100644 OpenDocumentReader/ca.lproj/Localizable.strings create mode 100644 OpenDocumentReader/cs.lproj/Localizable.strings create mode 100644 OpenDocumentReader/da.lproj/Localizable.strings create mode 100644 OpenDocumentReader/de.lproj/Localizable.strings create mode 100644 OpenDocumentReader/en.lproj/Localizable.strings create mode 100644 OpenDocumentReader/es.lproj/Localizable.strings create mode 100644 OpenDocumentReader/fr.lproj/Localizable.strings create mode 100644 OpenDocumentReader/ga.lproj/Localizable.strings create mode 100644 OpenDocumentReader/it.lproj/Localizable.strings create mode 100644 OpenDocumentReader/ja.lproj/Localizable.strings create mode 100644 OpenDocumentReader/pl.lproj/Localizable.strings create mode 100644 OpenDocumentReader/pt-BR.lproj/Localizable.strings create mode 100644 OpenDocumentReader/ru.lproj/Localizable.strings create mode 100644 OpenDocumentReader/sl.lproj/Localizable.strings create mode 100644 OpenDocumentReader/tr.lproj/Localizable.strings create mode 100644 OpenDocumentReader/zh-Hans.lproj/Localizable.strings diff --git a/OpenDocumentReader/DocumentBrowserViewController.swift b/OpenDocumentReader/DocumentBrowserViewController.swift index 53e94d3..e5fef95 100644 --- a/OpenDocumentReader/DocumentBrowserViewController.swift +++ b/OpenDocumentReader/DocumentBrowserViewController.swift @@ -46,12 +46,12 @@ class DocumentBrowserViewController: UIDocumentBrowserViewController, UIDocument func documentBrowser(_ controller: UIDocumentBrowserViewController, failedToImportDocumentAt documentURL: URL, error: Error?) { let alert = UIAlertController( - title: "Unable to Import Document", - message: "An error occurred while trying to import a document: \(error?.localizedDescription ?? "No Description")", + title: "", + message: NSLocalizedString("alert_error_generic", comment: ""), preferredStyle: .alert) let action = UIAlertAction( - title: "OK", + title: NSLocalizedString("ok", comment: ""), style: .cancel, handler: nil) diff --git a/OpenDocumentReader/DocumentViewController.swift b/OpenDocumentReader/DocumentViewController.swift index df2d671..7008810 100644 --- a/OpenDocumentReader/DocumentViewController.swift +++ b/OpenDocumentReader/DocumentViewController.swift @@ -115,14 +115,14 @@ class DocumentViewController: UIViewController, DocumentDelegate { } if doc.edit { - let alert = UIAlertController(title: "You have unsaved changes", message: "Save them now?", preferredStyle: .alert) - alert.addAction(UIAlertAction(title: "No", style: .destructive, handler: { (_) in + let alert = UIAlertController(title: NSLocalizedString("alert_unsaved_changes", comment: ""), message: NSLocalizedString("alert_save_now", comment: ""), preferredStyle: .alert) + alert.addAction(UIAlertAction(title: NSLocalizedString("no", comment: ""), style: .destructive, handler: { (_) in Analytics.logEvent("alert_unsaved_changes_no", parameters: nil) self.discardChanges() self.closeCurrentDocument() })) - alert.addAction(UIAlertAction(title: "Yes", style: .default, handler: { (_) in + alert.addAction(UIAlertAction(title: NSLocalizedString("yes", comment: ""), style: .default, handler: { (_) in Analytics.logEvent("alert_unsaved_changes_yes", parameters: nil) self.saveContent() @@ -152,31 +152,31 @@ class DocumentViewController: UIViewController, DocumentDelegate { let alert = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet) if (document?.isOdf ?? false && !(document?.edit ?? false)) { - alert.addAction(UIAlertAction(title: "Edit (EXPERIMENTAL)", style: .default, handler: { (_) in + alert.addAction(UIAlertAction(title: NSLocalizedString("menu_edit", comment: ""), style: .default, handler: { (_) in self.editDocument() })) } if document?.edit ?? false { - alert.addAction(UIAlertAction(title: "Save", style: .default, handler: { (_) in + alert.addAction(UIAlertAction(title: NSLocalizedString("menu_save", comment: ""), style: .default, handler: { (_) in self.saveContent() })) - alert.addAction(UIAlertAction(title: "Discard changes", style: .default, handler: { (_) in + alert.addAction(UIAlertAction(title: NSLocalizedString("menu_discard_changes", comment: ""), style: .default, handler: { (_) in self.discardChanges() })) } - alert.addAction(UIAlertAction(title: "Fullscreen", style: .default, handler: { (_) in + alert.addAction(UIAlertAction(title: NSLocalizedString("menu_fullscreen", comment: ""), style: .default, handler: { (_) in self.toggleFullscreen() })) - alert.addAction(UIAlertAction(title: "Print", style: .default, handler: { (_) in + alert.addAction(UIAlertAction(title: NSLocalizedString("menu_cloud_print", comment: ""), style: .default, handler: { (_) in self.printDocument() })) - alert.addAction(UIAlertAction(title: "Help!?", style: .default, handler: { (_) in + alert.addAction(UIAlertAction(title: NSLocalizedString("menu_help", comment: ""), style: .default, handler: { (_) in self.showWebsite() })) - alert.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil)) + alert.addAction(UIAlertAction(title: NSLocalizedString("cancel", comment: ""), style: .cancel, handler: nil)) alert.popoverPresentationController?.sourceView = menuButton.value(forKey: "view") as? UIView self.present(alert, animated: true, completion: nil) @@ -207,10 +207,10 @@ class DocumentViewController: UIViewController, DocumentDelegate { let message: String let color: UIColor if success { - message = "Successfully saved" + message = NSLocalizedString("alert_document_saved", comment: "") color = .green } else { - message = "Error while saving" + message = NSLocalizedString("alert_error_save_failed", comment: "") color = .red } @@ -280,14 +280,14 @@ class DocumentViewController: UIViewController, DocumentDelegate { }) } - let alert = UIAlertController(title: "Document encrypted", message: "Please enter the password to decrypt this document", preferredStyle: .alert) + let alert = UIAlertController(title: NSLocalizedString("alert_error_password_protected", comment: ""), message: NSLocalizedString("alert_enter_password", comment: ""), preferredStyle: .alert) alert.addTextField { (textField) in textField.text = "" } - alert.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: { [] (_) in + alert.addAction(UIAlertAction(title: NSLocalizedString("cancel", comment: ""), style: .cancel, handler: { [] (_) in self.returnToDocuments("nil" as Any) })) - alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { [weak alert] (_) in + alert.addAction(UIAlertAction(title: NSLocalizedString("ok", comment: ""), style: .default, handler: { [weak alert] (_) in let textField = alert?.textFields![0] self.document?.password = textField!.text! diff --git a/OpenDocumentReader/PageViewController.swift b/OpenDocumentReader/PageViewController.swift index d563062..1f09b97 100644 --- a/OpenDocumentReader/PageViewController.swift +++ b/OpenDocumentReader/PageViewController.swift @@ -12,12 +12,12 @@ class PageViewController: UIPageViewController { let contentViewController = "contentViewController" - var headersArray = [Constants.onboarding_header_1, - Constants.onboarding_header_2, - Constants.onboarding_header_3] - var subHeadersArray = [Constants.onboarding_subheader_1, - Constants.onboarding_subheader_2, - Constants.onboarding_subheader_3] + var headersArray = [NSLocalizedString("intro_title_1", comment: ""), + NSLocalizedString("intro_title_2", comment: ""), + NSLocalizedString("intro_title_3", comment: ""),] + var subHeadersArray = [NSLocalizedString("intro_description_1", comment: ""), + NSLocalizedString("intro_description_2", comment: ""), + NSLocalizedString("intro_description_3", comment: ""),] var imagesArray = [Constants.onboarding_image_1, Constants.onboarding_image_2, Constants.onboarding_image_3] diff --git a/OpenDocumentReader/ca.lproj/Localizable.strings b/OpenDocumentReader/ca.lproj/Localizable.strings new file mode 100644 index 0000000..d702b9b --- /dev/null +++ b/OpenDocumentReader/ca.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* */ +"alert_error_generic" = "Hi ha hagut un problema. No s'ha pogut obrir el fitxer."; + +/* */ +"ok" = "OK"; + +/* */ +"no_description" = "No Description"; + +/* */ +"alert_unsaved_changes" = "You have unsaved changes"; + +/* */ +"alert_save_now" = "Save them now?"; + +/* */ +"yes" = "Yes"; + +/* */ +"no" = "No"; + +/* */ +"menu_edit" = "Edit document"; + +/* */ +"menu_save" = "Save"; + +/* */ +"menu_discard_changes" = "Discard changes"; + +/* */ +"menu_fullscreen" = "Mode de pantalla completa"; + +/* */ +"menu_cloud_print" = "Google Cloud Print"; + +/* */ +"menu_help" = "Help!?"; + +/* */ +"cancel" = "Cancel"; + +/* */ +"alert_document_saved" = "Document saved"; + +/* */ +"alert_error_save_failed" = "File could not be saved. Please contact support@opendocument.app"; + +/* */ +"alert_error_password_protected" = "El document està protegit per contrasenya"; + +/* */ +"alert_enter_password" = "Please enter the password to decrypt this document"; + +/* */ +"intro_title_1" = "Open and read your ODF file on the go!"; + +/* */ +"intro_title_2" = "Found a typo in your document? Now supports modification!"; + +/* */ +"intro_title_3" = "Read your documents from within other apps"; + +/* */ +"intro_description_1" = "OpenDocument Reader allows you to view documents that are stored in OpenDocument format (.odt, .ods, .odp and .odg). These files are usually created using LibreOffice or OpenOffice. This app allows to open such files on your mobile device too, so you can read them on the go."; + +/* */ +"intro_description_2" = "OpenDocument Reader not only allows to read documents on your mobile device, but also supports modifying them too. Typos are fixed in a breeze, even on the train!"; + +/* */ +"intro_description_3" = "OpenDocument Reader supports a huge range of other apps to open documents from. A colleague sent a presentation via Gmail? Click the attachment and this app is going to open right away!"; + + + diff --git a/OpenDocumentReader/cs.lproj/Localizable.strings b/OpenDocumentReader/cs.lproj/Localizable.strings new file mode 100644 index 0000000..113e03c --- /dev/null +++ b/OpenDocumentReader/cs.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* */ +"alert_error_generic" = "Něco se pokazilo. Nelze otevřít soubor."; + +/* */ +"ok" = "OK"; + +/* */ +"no_description" = "No Description"; + +/* */ +"alert_unsaved_changes" = "You have unsaved changes"; + +/* */ +"alert_save_now" = "Save them now?"; + +/* */ +"yes" = "Yes"; + +/* */ +"no" = "No"; + +/* */ +"menu_edit" = "Upravit dokument"; + +/* */ +"menu_save" = "Uložit"; + +/* */ +"menu_discard_changes" = "Discard changes"; + +/* */ +"menu_fullscreen" = "Celá obrazovka"; + +/* */ +"menu_cloud_print" = "Google Cloud Print"; + +/* */ +"menu_help" = "Help!?"; + +/* */ +"cancel" = "Cancel"; + +/* */ +"alert_document_saved" = "Document saved"; + +/* */ +"alert_error_save_failed" = "File could not be saved. Please contact support@opendocument.app"; + +/* */ +"alert_error_password_protected" = "Dokument je chráněn heslem"; + +/* */ +"alert_enter_password" = "Please enter the password to decrypt this document"; + +/* */ +"intro_title_1" = "Open and read your ODF file on the go!"; + +/* */ +"intro_title_2" = "Found a typo in your document? Now supports modification!"; + +/* */ +"intro_title_3" = "Read your documents from within other apps"; + +/* */ +"intro_description_1" = "OpenDocument Reader allows you to view documents that are stored in OpenDocument format (.odt, .ods, .odp and .odg). These files are usually created using LibreOffice or OpenOffice. This app allows to open such files on your mobile device too, so you can read them on the go."; + +/* */ +"intro_description_2" = "OpenDocument Reader not only allows to read documents on your mobile device, but also supports modifying them too. Typos are fixed in a breeze, even on the train!"; + +/* */ +"intro_description_3" = "OpenDocument Reader supports a huge range of other apps to open documents from. A colleague sent a presentation via Gmail? Click the attachment and this app is going to open right away!"; + + + diff --git a/OpenDocumentReader/da.lproj/Localizable.strings b/OpenDocumentReader/da.lproj/Localizable.strings new file mode 100644 index 0000000..6459ca4 --- /dev/null +++ b/OpenDocumentReader/da.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* */ +"alert_error_generic" = "Der er gået noget galt. Filen kunne ikke åbnes."; + +/* */ +"ok" = "OK"; + +/* */ +"no_description" = "No Description"; + +/* */ +"alert_unsaved_changes" = "You have unsaved changes"; + +/* */ +"alert_save_now" = "Save them now?"; + +/* */ +"yes" = "Yes"; + +/* */ +"no" = "No"; + +/* */ +"menu_edit" = "Edit document"; + +/* */ +"menu_save" = "Save"; + +/* */ +"menu_discard_changes" = "Discard changes"; + +/* */ +"menu_fullscreen" = "Open fullscreen mode"; + +/* */ +"menu_cloud_print" = "Print document"; + +/* */ +"menu_help" = "Help!?"; + +/* */ +"cancel" = "Cancel"; + +/* */ +"alert_document_saved" = "Document saved"; + +/* */ +"alert_error_save_failed" = "File could not be saved. Please contact support@opendocument.app"; + +/* */ +"alert_error_password_protected" = "Dokumentet er låst med et kodeord"; + +/* */ +"alert_enter_password" = "Please enter the password to decrypt this document"; + +/* */ +"intro_title_1" = "Open and read your ODF file on the go!"; + +/* */ +"intro_title_2" = "Found a typo in your document? Now supports modification!"; + +/* */ +"intro_title_3" = "Read your documents from within other apps"; + +/* */ +"intro_description_1" = "OpenDocument Reader allows you to view documents that are stored in OpenDocument format (.odt, .ods, .odp and .odg). These files are usually created using LibreOffice or OpenOffice. This app allows to open such files on your mobile device too, so you can read them on the go."; + +/* */ +"intro_description_2" = "OpenDocument Reader not only allows to read documents on your mobile device, but also supports modifying them too. Typos are fixed in a breeze, even on the train!"; + +/* */ +"intro_description_3" = "OpenDocument Reader supports a huge range of other apps to open documents from. A colleague sent a presentation via Gmail? Click the attachment and this app is going to open right away!"; + + + diff --git a/OpenDocumentReader/de.lproj/Localizable.strings b/OpenDocumentReader/de.lproj/Localizable.strings new file mode 100644 index 0000000..091ab76 --- /dev/null +++ b/OpenDocumentReader/de.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* */ +"alert_error_generic" = "Etwas schlimmes ist passiert. Datei konnte nicht geöffnet werden."; + +/* */ +"ok" = "OK"; + +/* */ +"no_description" = "Keine Beschreibung"; + +/* */ +"alert_unsaved_changes" = "You have unsaved changes"; + +/* */ +"alert_save_now" = "Save them now?"; + +/* */ +"yes" = "Ja"; + +/* */ +"no" = "Nein"; + +/* */ +"menu_edit" = "Dokument bearbeiten"; + +/* */ +"menu_save" = "Speichern"; + +/* */ +"menu_discard_changes" = "Discard changes"; + +/* */ +"menu_fullscreen" = "Vollbildmodus aktivieren"; + +/* */ +"menu_cloud_print" = "Dokument drucken"; + +/* */ +"menu_help" = "Hilfe!?"; + +/* */ +"cancel" = "Cancel"; + +/* */ +"alert_document_saved" = "Dokument gespeichert"; + +/* */ +"alert_error_save_failed" = "File could not be saved. Please contact support@opendocument.app"; + +/* */ +"alert_error_password_protected" = "Dokument ist passwort-geschützt"; + +/* */ +"alert_enter_password" = "Please enter the password to decrypt this document"; + +/* */ +"intro_title_1" = "Öffnen und lesen Sie Ihre ODF-Datei unterwegs!"; + +/* */ +"intro_title_2" = "Einen Tippfehler gefunden? Änderungen werden jetzt auch unterstützt!"; + +/* */ +"intro_title_3" = "Lesen Sie Ihre Dokumente aus anderen Apps heraus"; + +/* */ +"intro_description_1" = "OpenDocument Reader kann Dokumente anzeigen, die im OpenDocument-Format (.odt, .ods, .odp und .odg) gespeichert sind. Diese Dateien werden in der Regel mit LibreOffice oder OpenOffice erstellt. Diese App ermöglicht es solche Dateien auf Ihrem mobilen Gerät zu öffnen, so dass Sie unterwegs gelesen werden können."; + +/* */ +"intro_description_2" = "OpenDocument Reader erlaubt nicht nur Dokumente auf Ihrem mobilen Gerät zu lesen, sondern unterstützt auch, sie zu ändern. Tippfehler sind schnell behoben, auch unterwegs!"; + +/* */ +"intro_description_3" = "OpenDocument Reader unterstützt eine Vielzahl anderer Apps, um Dokumente zu öffnen. Ein Kollege hat eine Präsentation via Gmail gesendet? Klicken Sie auf den Anhang und diese App wird sofort geöffnet!"; + + + diff --git a/OpenDocumentReader/en.lproj/Localizable.strings b/OpenDocumentReader/en.lproj/Localizable.strings new file mode 100644 index 0000000..feb9755 --- /dev/null +++ b/OpenDocumentReader/en.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* */ +"alert_error_generic" = "Something bad happened. Couldn't open file."; + +/* */ +"ok" = "OK"; + +/* */ +"no_description" = "No Description"; + +/* */ +"alert_unsaved_changes" = "You have unsaved changes"; + +/* */ +"alert_save_now" = "Save them now?"; + +/* */ +"yes" = "Yes"; + +/* */ +"no" = "No"; + +/* */ +"menu_edit" = "Edit document"; + +/* */ +"menu_save" = "Save"; + +/* */ +"menu_discard_changes" = "Discard changes"; + +/* */ +"menu_fullscreen" = "Open fullscreen mode"; + +/* */ +"menu_cloud_print" = "Print document"; + +/* */ +"menu_help" = "Help!?"; + +/* */ +"cancel" = "Cancel"; + +/* */ +"alert_document_saved" = "Document saved"; + +/* */ +"alert_error_save_failed" = "File could not be saved. Please contact support@opendocument.app"; + +/* */ +"alert_error_password_protected" = "This document is password-protected"; + +/* */ +"alert_enter_password" = "Please enter the password to decrypt this document"; + +/* */ +"intro_title_1" = "Open and read your ODF file on the go!"; + +/* */ +"intro_title_2" = "Found a typo in your document? Now supports modification!"; + +/* */ +"intro_title_3" = "Read your documents from within other apps"; + +/* */ +"intro_description_1" = "OpenDocument Reader allows you to view documents that are stored in OpenDocument format (.odt, .ods, .odp and .odg). These files are usually created using LibreOffice or OpenOffice. This app allows to open such files on your mobile device too, so you can read them on the go."; + +/* */ +"intro_description_2" = "OpenDocument Reader not only allows to read documents on your mobile device, but also supports modifying them too. Typos are fixed in a breeze, even on the train!"; + +/* */ +"intro_description_3" = "OpenDocument Reader supports a huge range of other apps to open documents from. A colleague sent a presentation via Gmail? Click the attachment and this app is going to open right away!"; + + + diff --git a/OpenDocumentReader/es.lproj/Localizable.strings b/OpenDocumentReader/es.lproj/Localizable.strings new file mode 100644 index 0000000..60d771f --- /dev/null +++ b/OpenDocumentReader/es.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* */ +"alert_error_generic" = "Ha pasado algo malo. No se ha podido abrir el archivo."; + +/* */ +"ok" = "OK"; + +/* */ +"no_description" = "No Description"; + +/* */ +"alert_unsaved_changes" = "You have unsaved changes"; + +/* */ +"alert_save_now" = "Save them now?"; + +/* */ +"yes" = "Yes"; + +/* */ +"no" = "No"; + +/* */ +"menu_edit" = "Editar"; + +/* */ +"menu_save" = "Guardar"; + +/* */ +"menu_discard_changes" = "Discard changes"; + +/* */ +"menu_fullscreen" = "Modo a pantalla completa"; + +/* */ +"menu_cloud_print" = "Imprimir"; + +/* */ +"menu_help" = "¿Ayuda?"; + +/* */ +"cancel" = "Cancel"; + +/* */ +"alert_document_saved" = "Document saved"; + +/* */ +"alert_error_save_failed" = "File could not be saved. Please contact support@opendocument.app"; + +/* */ +"alert_error_password_protected" = "El documento está protegido con contraseña."; + +/* */ +"alert_enter_password" = "Please enter the password to decrypt this document"; + +/* */ +"intro_title_1" = "¡Abra y lea su archivo ODF desde cualquier lugar!"; + +/* */ +"intro_title_2" = "¿Encontró un error tipográfico en su documento? ¡Ahora permite hacer modificaciones!"; + +/* */ +"intro_title_3" = "Lea sus documentos desde otras aplicaciones"; + +/* */ +"intro_description_1" = "OpenDocument Reader le permite ver documentos almacenados en formato OpenDocument (.odt, .ods, .odp y .odg). Estos archivos se suelen crear utilizando LibreOffice u OpenOffice. Esta aplicación permite abrir estos archivos también en su dispositivo móvil, para que pueda leerlos desde cualquier lugar."; + +/* */ +"intro_description_2" = "OpenDocument Reader no solo permite leer documentos en su dispositivo móvil, sino que también puede modificarlos. ¡Los errores tipográficos se arreglan en un abrir y cerrar de ojos, incluso en el tren!"; + +/* */ +"intro_description_3" = "OpenDocument Reader es compatible con una amplia gama de aplicaciones, y puede abrir los documentos creados con ellas. ¿Un compañero ha enviado una presentación a través de Gmail? ¡Haga clic en el archivo adjunto y la aplicación se abrirá de inmediato!"; + + + diff --git a/OpenDocumentReader/fr.lproj/Localizable.strings b/OpenDocumentReader/fr.lproj/Localizable.strings new file mode 100644 index 0000000..b5feeb3 --- /dev/null +++ b/OpenDocumentReader/fr.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* */ +"alert_error_generic" = "Une erreur est survenue. Impossible d'ouvrir le fichier."; + +/* */ +"ok" = "OK"; + +/* */ +"no_description" = "No Description"; + +/* */ +"alert_unsaved_changes" = "You have unsaved changes"; + +/* */ +"alert_save_now" = "Save them now?"; + +/* */ +"yes" = "Yes"; + +/* */ +"no" = "No"; + +/* */ +"menu_edit" = "Modifier"; + +/* */ +"menu_save" = "Enregistrer"; + +/* */ +"menu_discard_changes" = "Discard changes"; + +/* */ +"menu_fullscreen" = "Mode plein écran"; + +/* */ +"menu_cloud_print" = "Imprimer"; + +/* */ +"menu_help" = "Aide"; + +/* */ +"cancel" = "Cancel"; + +/* */ +"alert_document_saved" = "Document saved"; + +/* */ +"alert_error_save_failed" = "File could not be saved. Please contact support@opendocument.app"; + +/* */ +"alert_error_password_protected" = "Ce document est protégé par mot de passe"; + +/* */ +"alert_enter_password" = "Please enter the password to decrypt this document"; + +/* */ +"intro_title_1" = "Ouvrez et lisez votre fichier ODF n’importe où !"; + +/* */ +"intro_title_2" = "Vous avez trouvé une faute de frappe dans votre document ? Il est désormais possible de la corriger !"; + +/* */ +"intro_title_3" = "Lisez vos documents depuis d’autres applications"; + +/* */ +"intro_description_1" = "OpenDocument Reader vous permet de visualiser, sur votre appareil mobile, les documents enregistrés au format OpenDocument (.odt, .ods, .odp et .odg). Ces fichiers sont généralement créés avec LibreOffice ou OpenOffice."; + +/* */ +"intro_description_2" = "OpenDocument Reader permet non seulement de lire des documents mais aussi de les modifier sur votre appareil mobile. Vous pouvez corriger les fautes de frappe y compris dans le train !"; + +/* */ +"intro_description_3" = "OpenDocument Reader prend en charge un grand nombre d’autres applications depuis lesquelles il est possible d’ouvrir des documents. Un collègue a envoyé une présentation via Gmail ? Cliquez sur la pièce jointe et cette application s’ouvrira instantanément !"; + + + diff --git a/OpenDocumentReader/ga.lproj/Localizable.strings b/OpenDocumentReader/ga.lproj/Localizable.strings new file mode 100644 index 0000000..1acae7a --- /dev/null +++ b/OpenDocumentReader/ga.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* */ +"alert_error_generic" = "Tharla taisme. Níorbh fhéidir an comhad a oscailt."; + +/* */ +"ok" = "OK"; + +/* */ +"no_description" = "No Description"; + +/* */ +"alert_unsaved_changes" = "You have unsaved changes"; + +/* */ +"alert_save_now" = "Save them now?"; + +/* */ +"yes" = "Yes"; + +/* */ +"no" = "No"; + +/* */ +"menu_edit" = "Cuir an cháipéis in eagar"; + +/* */ +"menu_save" = "Taisc"; + +/* */ +"menu_discard_changes" = "Discard changes"; + +/* */ +"menu_fullscreen" = "Lánscáileán"; + +/* */ +"menu_cloud_print" = "Clóbhuail an cháipéis"; + +/* */ +"menu_help" = "Cabhair!?"; + +/* */ +"cancel" = "Cancel"; + +/* */ +"alert_document_saved" = "Document saved"; + +/* */ +"alert_error_save_failed" = "File could not be saved. Please contact support@opendocument.app"; + +/* */ +"alert_error_password_protected" = "Tá an cháipéis faoi chosaint focal faire"; + +/* */ +"alert_enter_password" = "Please enter the password to decrypt this document"; + +/* */ +"intro_title_1" = "Oscail agus léigh do chomhad ODF agus tú ar shiúl!"; + +/* */ +"intro_title_2" = "Léigh do chuid cáipéisí ó laistigh d'fheidhmchláiríní eile"; + +/* */ +"intro_title_3" = "Read your documents from within other apps"; + +/* */ +"intro_description_1" = "OpenDocument Reader allows you to view documents that are stored in OpenDocument format (.odt, .ods, .odp and .odg). These files are usually created using LibreOffice or OpenOffice. This app allows to open such files on your mobile device too, so you can read them on the go."; + +/* */ +"intro_description_2" = "OpenDocument Reader not only allows to read documents on your mobile device, but also supports modifying them too. Typos are fixed in a breeze, even on the train!"; + +/* */ +"intro_description_3" = "OpenDocument Reader supports a huge range of other apps to open documents from. A colleague sent a presentation via Gmail? Click the attachment and this app is going to open right away!"; + + + diff --git a/OpenDocumentReader/it.lproj/Localizable.strings b/OpenDocumentReader/it.lproj/Localizable.strings new file mode 100644 index 0000000..5a96773 --- /dev/null +++ b/OpenDocumentReader/it.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* */ +"alert_error_generic" = "Si è verificato un errore. Impossibile aprire il file."; + +/* */ +"ok" = "OK"; + +/* */ +"no_description" = "No Description"; + +/* */ +"alert_unsaved_changes" = "You have unsaved changes"; + +/* */ +"alert_save_now" = "Save them now?"; + +/* */ +"yes" = "Yes"; + +/* */ +"no" = "No"; + +/* */ +"menu_edit" = "Modifica documento"; + +/* */ +"menu_save" = "Salva"; + +/* */ +"menu_discard_changes" = "Discard changes"; + +/* */ +"menu_fullscreen" = "Apri in modalità schermo intero"; + +/* */ +"menu_cloud_print" = "Stampa il documento"; + +/* */ +"menu_help" = "Aiuto!?"; + +/* */ +"cancel" = "Cancel"; + +/* */ +"alert_document_saved" = "Document saved"; + +/* */ +"alert_error_save_failed" = "File could not be saved. Please contact support@opendocument.app"; + +/* */ +"alert_error_password_protected" = "Il documento è protetto da password."; + +/* */ +"alert_enter_password" = "Please enter the password to decrypt this document"; + +/* */ +"intro_title_1" = "Apri e leggi il tuo file ODF mentre sei in movimento!"; + +/* */ +"intro_title_2" = "Hai trovato un errore nel tuo documento? Ora la modifica è supportata!"; + +/* */ +"intro_title_3" = "Leggi i tuoi documenti da altre app"; + +/* */ +"intro_description_1" = "OpenDocument Reader ti consente di visualizzare documenti archiviati in formato OpenDocument (.odt, .ods, .odp e .odg). Questi file vengono generalmente creati usando LibreOffice od OpenOffice. Questa app consente di aprire tali file anche sul tuo dispositivo mobile, in modo che tu possa leggerli mentre sei in movimento."; + +/* */ +"intro_description_2" = "OpenDocument Reader non solo consente di leggere documenti sul tuo dispositivo mobile, ma supporta anche la modifica di questi. Correggere gli errori di battitura è un gioco da ragazzi, anche sul treno!"; + +/* */ +"intro_description_3" = "OpenDocument Reader supporta una vasta gamma di altre app da cui aprire documenti. Un collega ha inviato una presentazione tramite Gmail? Fai clic sull'allegato e questa app si aprirà subito!"; + + + diff --git a/OpenDocumentReader/ja.lproj/Localizable.strings b/OpenDocumentReader/ja.lproj/Localizable.strings new file mode 100644 index 0000000..7bfb6c9 --- /dev/null +++ b/OpenDocumentReader/ja.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* */ +"alert_error_generic" = "何か問題が発生しました。ファイルを開くことができませんでした。"; + +/* */ +"ok" = "OK"; + +/* */ +"no_description" = "No Description"; + +/* */ +"alert_unsaved_changes" = "You have unsaved changes"; + +/* */ +"alert_save_now" = "Save them now?"; + +/* */ +"yes" = "Yes"; + +/* */ +"no" = "No"; + +/* */ +"menu_edit" = "ドキュメントを編集"; + +/* */ +"menu_save" = "保存"; + +/* */ +"menu_discard_changes" = "Discard changes"; + +/* */ +"menu_fullscreen" = "全画面表示を開く"; + +/* */ +"menu_cloud_print" = "ドキュメントを印刷"; + +/* */ +"menu_help" = "ヘルプ!?"; + +/* */ +"cancel" = "Cancel"; + +/* */ +"alert_document_saved" = "Document saved"; + +/* */ +"alert_error_save_failed" = "File could not be saved. Please contact support@opendocument.app"; + +/* */ +"alert_error_password_protected" = "ドキュメントがパスワードで保護されています"; + +/* */ +"alert_enter_password" = "Please enter the password to decrypt this document"; + +/* */ +"intro_title_1" = "外出先で ODF ファイルを開いたり読み込みます!"; + +/* */ +"intro_title_2" = "ドキュメントにタイプミスを発見しましたか? 変更をサポートするようになりました!"; + +/* */ +"intro_title_3" = "他のアプリを使用してドキュメントを読む"; + +/* */ +"intro_description_1" = "OpenDocument リーダーは OpenDocument 形式 (.odt、.ods、.odp、.odg) で格納されているドキュメントを表示することができます。通常これらのファイルは、LibreOffice または OpenOffice を使用して作成されます。このアプリは、モバイルデバイスでこのようなファイルを開くことができるので、外出先でそれらを読み取ることができます。"; + +/* */ +"intro_description_2" = "OpenDocument リーダーは、お使いのモバイルデバイス上でドキュメントを読むことができるだけでなく、変更もサポートしています。タイプミスは、電車の中でもすぐに修正できます!"; + +/* */ +"intro_description_3" = "OpenDocument リーダーは、ドキュメントを開く他のアプリを幅広くサポートしています。同僚が Gmail でプレゼンテーションを送信しましたか? 添付ファイルをクリックすると、このアプリがすぐに開くことができます!"; + + + diff --git a/OpenDocumentReader/pl.lproj/Localizable.strings b/OpenDocumentReader/pl.lproj/Localizable.strings new file mode 100644 index 0000000..dcd5d6e --- /dev/null +++ b/OpenDocumentReader/pl.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* */ +"alert_error_generic" = "Jest jakaś przeszkoda. Nie można otworzyć pliku."; + +/* */ +"ok" = "OK"; + +/* */ +"no_description" = "No Description"; + +/* */ +"alert_unsaved_changes" = "You have unsaved changes"; + +/* */ +"alert_save_now" = "Save them now?"; + +/* */ +"yes" = "Yes"; + +/* */ +"no" = "No"; + +/* */ +"menu_edit" = "Edytuj dokument"; + +/* */ +"menu_save" = "Zapisz"; + +/* */ +"menu_discard_changes" = "Discard changes"; + +/* */ +"menu_fullscreen" = "Otwórz tryb pełnoekranowy"; + +/* */ +"menu_cloud_print" = "Drukuj dokument"; + +/* */ +"menu_help" = "Potrzebujesz pomocy?"; + +/* */ +"cancel" = "Cancel"; + +/* */ +"alert_document_saved" = "Document saved"; + +/* */ +"alert_error_save_failed" = "File could not be saved. Please contact support@opendocument.app"; + +/* */ +"alert_error_password_protected" = "Dokument zabezpieczony jest hasłem"; + +/* */ +"alert_enter_password" = "Please enter the password to decrypt this document"; + +/* */ +"intro_title_1" = "Otwórz i czytaj swój plik ODF nawet w podróży!"; + +/* */ +"intro_title_2" = "Znajdujesz literówkę w swoim dokumencie? Czytnik obsługuje teraz zmiany!"; + +/* */ +"intro_title_3" = "Czytaj swoje dokumenty pochodzące z innych aplikacji"; + +/* */ +"intro_description_1" = "Przeglądarka OpenDocument Reader umożliwia przeglądanie dokumentów przechowywanych w formacie OpenDocument (.odt, .ods, .odp i .odg). Pliki te są zazwyczaj tworzone przy użyciu programów LibreOffice lub OpenOffice. Ta aplikacja umożliwia również otwieranie tego typu plików na urządzeniu mobilnym, dzięki czemu możesz je czytać również w podróży."; + +/* */ +"intro_description_2" = "Przeglądarka OpenDocument Reader nie tylko pozwala czytać dokumenty na urządzeniu mobilnym, ale także obsługuje ich modyfikowanie. Literówki są usuwane natychmiast, nawet w pociągu!"; + +/* */ +"intro_description_3" = "Przeglądarka OpenDocument Reader obsługuje wiele różnych aplikacji, umożliwiając otwieranie w nich dokumentów. Kolega wysłał prezentację za pośrednictwem poczty Gmail? Kliknij załącznik i aplikacja ta natychmiast się otworzy!"; + + + diff --git a/OpenDocumentReader/pt-BR.lproj/Localizable.strings b/OpenDocumentReader/pt-BR.lproj/Localizable.strings new file mode 100644 index 0000000..7c1761a --- /dev/null +++ b/OpenDocumentReader/pt-BR.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* */ +"alert_error_generic" = "Houve um problema. Não foi possível abrir o arquivo."; + +/* */ +"ok" = "OK"; + +/* */ +"no_description" = "No Description"; + +/* */ +"alert_unsaved_changes" = "You have unsaved changes"; + +/* */ +"alert_save_now" = "Save them now?"; + +/* */ +"yes" = "Yes"; + +/* */ +"no" = "No"; + +/* */ +"menu_edit" = "Editar"; + +/* */ +"menu_save" = "Salvar"; + +/* */ +"menu_discard_changes" = "Discard changes"; + +/* */ +"menu_fullscreen" = "Modo de tela inteira"; + +/* */ +"menu_cloud_print" = "Imprimir"; + +/* */ +"menu_help" = "Ajuda!?"; + +/* */ +"cancel" = "Cancel"; + +/* */ +"alert_document_saved" = "Document saved"; + +/* */ +"alert_error_save_failed" = "File could not be saved. Please contact support@opendocument.app"; + +/* */ +"alert_error_password_protected" = "O documento está protegido por senha"; + +/* */ +"alert_enter_password" = "Please enter the password to decrypt this document"; + +/* */ +"intro_title_1" = "Abra e leia seu arquivo ODF em qualquer lugar!"; + +/* */ +"intro_title_2" = "Encontrou um erro de digitação em seu documento? Agora suporta modificação!"; + +/* */ +"intro_title_3" = "Leia seus documentos de dentro de outros apps"; + +/* */ +"intro_description_1" = "O OpenDocument Reader permite que você veja documentos que são armazenados no formato OpenDocument (.odt, .ods, .odp e .odg). Estes arquivos geralmente são criados usando o LibreOffice ou OpenOffice. Este aplicativo permite abrir esses arquivos também no seu dispositivo móvel, então você pode lê-los em qualquer lugar."; + +/* */ +"intro_description_2" = "O OpenDocument Reader não só permite ler documentos no seu dispositivo móvel, como também suporta modificá-los também. Os erros de digitação são corrigidos em uma brisa, mesmo no trem!"; + +/* */ +"intro_description_3" = "O OpenDocument Reader suporta uma grande variedade de outros aplicativos para abrir documentos. Um colega enviou uma apresentação através do Gmail? Clique no anexo e este aplicativo vai abrir imediatamente!"; + + + diff --git a/OpenDocumentReader/ru.lproj/Localizable.strings b/OpenDocumentReader/ru.lproj/Localizable.strings new file mode 100644 index 0000000..20f8597 --- /dev/null +++ b/OpenDocumentReader/ru.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* */ +"alert_error_generic" = "Произошла ошибка. Не удалось открыть файл."; + +/* */ +"ok" = "ОК"; + +/* */ +"no_description" = "Нет описания."; + +/* */ +"alert_unsaved_changes" = "У вас есть несохраненные изменения."; + +/* */ +"alert_save_now" = "Сохранить их?"; + +/* */ +"yes" = "Да"; + +/* */ +"no" = "Нет"; + +/* */ +"menu_edit" = "Редактировать документ"; + +/* */ +"menu_save" = "Сохранить"; + +/* */ +"menu_discard_changes" = "Отменить изменения"; + +/* */ +"menu_fullscreen" = "Редактировать документ"; + +/* */ +"menu_cloud_print" = "Печать документа"; + +/* */ +"menu_help" = "Нужна помощь?"; + +/* */ +"cancel" = "Отмена"; + +/* */ +"alert_document_saved" = "Документ сохранен"; + +/* */ +"alert_error_save_failed" = "Файл не сохранен. Пожалуйста, свяжитесь с support@opendocument.app"; + +/* */ +"alert_error_password_protected" = "Документ защищён паролем"; + +/* */ +"alert_enter_password" = "Пожалуйста, введите пароль, чтобы открыть документ"; + +/* */ +"intro_title_1" = "Открывайте и читайте файлы ODF прямо на ходу!"; + +/* */ +"intro_title_2" = "Нашли ошибку в своем документе? Теперь вы можете внести в него изменения!"; + +/* */ +"intro_title_3" = "Читайте ваши документы из других приложений"; + +/* */ +"intro_description_1" = "OpenDocument Reader позволяет просматривать документы, сохраненные в формате OpenDocument (.odt, .ods, .odp и .odg). Эти файлы обычно создаются в программах LibreOffice или OpenOffice. С помощью приложения вы также можете открывать такие файлы на мобильном устройстве и читать их прямо на ходу."; + +/* */ +"intro_description_2" = "OpenDocument Reader позволяет не только читать документы с мобильного устройства, но и поддерживает возможность вносить в них изменения. Исправляйте ошибки легко, даже в поезде!"; + +/* */ +"intro_description_3" = "OpenDocument Reader поддерживает возможность открывать документы из многих других приложений. Коллега отправил вам презентацию через Gmail? Нажмите на вложение, и приложение немедленно откроется!"; + + + diff --git a/OpenDocumentReader/sl.lproj/Localizable.strings b/OpenDocumentReader/sl.lproj/Localizable.strings new file mode 100644 index 0000000..986ebec --- /dev/null +++ b/OpenDocumentReader/sl.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* */ +"alert_error_generic" = "Nekaj je šlo narobe. Datoteke ni bilo mogoče odpreti."; + +/* */ +"ok" = "OK"; + +/* */ +"no_description" = "No Description"; + +/* */ +"alert_unsaved_changes" = "You have unsaved changes"; + +/* */ +"alert_save_now" = "Save them now?"; + +/* */ +"yes" = "Yes"; + +/* */ +"no" = "No"; + +/* */ +"menu_edit" = "Uredi"; + +/* */ +"menu_save" = "Shrani"; + +/* */ +"menu_discard_changes" = "Discard changes"; + +/* */ +"menu_fullscreen" = "Celozaslonski način"; + +/* */ +"menu_cloud_print" = "Natisni"; + +/* */ +"menu_help" = "Pomoč!?"; + +/* */ +"cancel" = "Cancel"; + +/* */ +"alert_document_saved" = "Document saved"; + +/* */ +"alert_error_save_failed" = "Datoteke ni bilo mogoče shraniti. Prosimo, pišite na support@opendocument.app"; + +/* */ +"alert_error_password_protected" = "Dokument je zaščiten z geslom"; + +/* */ +"alert_enter_password" = "Please enter the password to decrypt this document"; + +/* */ +"intro_title_1" = "Odprite in berite vašo datoteko ODF na poti!!"; + +/* */ +"intro_title_2" = "Ste v dokumentu našli napako? Sedaj podpira tudi urejanje!"; + +/* */ +"intro_title_3" = "Berite svoje dokumente iz drugih programov"; + +/* */ +"intro_description_1" = "OpenDocument Reader omogoča ogled dokumentov, ki so shranjeni v obliki OpenDocument (.odt, .ods, .odp in .odg). Te datoteke se običajno ustvarijo z LibreOfficeom ali OpenOfficeom. Ta program omogoča odpiranje takih datotek tudi na vaši prenosni napravi, da jih lahko berete na poti."; + +/* */ +"intro_description_2" = "OpenDocument Reader ne omogoča samo branje dokumentov na vaši prenosni napravi, ampak tudi njihovo urejanje. Napake lahko popravite v trenutku, tudi na vlaku!"; + +/* */ +"intro_description_3" = "OpenDocument Reader supports a huge range of other apps to open documents from. A colleague sent a presentation via Gmail? Click the attachment and this app is going to open right away!"; + + + diff --git a/OpenDocumentReader/tr.lproj/Localizable.strings b/OpenDocumentReader/tr.lproj/Localizable.strings new file mode 100644 index 0000000..87081a2 --- /dev/null +++ b/OpenDocumentReader/tr.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* */ +"alert_error_generic" = "Kötü bir şey oldu. Dosya açılamadı."; + +/* */ +"ok" = "OK"; + +/* */ +"no_description" = "No Description"; + +/* */ +"alert_unsaved_changes" = "You have unsaved changes"; + +/* */ +"alert_save_now" = "Save them now?"; + +/* */ +"yes" = "Yes"; + +/* */ +"no" = "No"; + +/* */ +"menu_edit" = "Edit document"; + +/* */ +"menu_save" = "Kaydet"; + +/* */ +"menu_discard_changes" = "Discard changes"; + +/* */ +"menu_fullscreen" = "Open fullscreen mode"; + +/* */ +"menu_cloud_print" = "Print document"; + +/* */ +"menu_help" = "Yardım!?"; + +/* */ +"cancel" = "Cancel"; + +/* */ +"alert_document_saved" = "Document saved"; + +/* */ +"alert_error_save_failed" = "File could not be saved. Please contact support@opendocument.app"; + +/* */ +"alert_error_password_protected" = "Belge parola korumalı"; + +/* */ +"alert_enter_password" = "Please enter the password to decrypt this document"; + +/* */ +"intro_title_1" = "Open and read your ODF file on the go!"; + +/* */ +"intro_title_2" = "Found a typo in your document? Now supports modification!"; + +/* */ +"intro_title_3" = "Read your documents from within other apps"; + +/* */ +"intro_description_1" = "OpenDocument Reader allows you to view documents that are stored in OpenDocument format (.odt, .ods, .odp and .odg). These files are usually created using LibreOffice or OpenOffice. This app allows to open such files on your mobile device too, so you can read them on the go."; + +/* */ +"intro_description_2" = "OpenDocument Reader not only allows to read documents on your mobile device, but also supports modifying them too. Typos are fixed in a breeze, even on the train!"; + +/* */ +"intro_description_3" = "OpenDocument Reader supports a huge range of other apps to open documents from. A colleague sent a presentation via Gmail? Click the attachment and this app is going to open right away!"; + + + diff --git a/OpenDocumentReader/zh-Hans.lproj/Localizable.strings b/OpenDocumentReader/zh-Hans.lproj/Localizable.strings new file mode 100644 index 0000000..8823c35 --- /dev/null +++ b/OpenDocumentReader/zh-Hans.lproj/Localizable.strings @@ -0,0 +1,74 @@ +/* */ +"alert_error_generic" = "出现了一些错误，无法打开文件。"; + +/* */ +"ok" = "OK"; + +/* */ +"no_description" = "No Description"; + +/* */ +"alert_unsaved_changes" = "You have unsaved changes"; + +/* */ +"alert_save_now" = "Save them now?"; + +/* */ +"yes" = "Yes"; + +/* */ +"no" = "No"; + +/* */ +"menu_edit" = "编辑文档"; + +/* */ +"menu_save" = "保存"; + +/* */ +"menu_discard_changes" = "Discard changes"; + +/* */ +"menu_fullscreen" = "打开全屏模式"; + +/* */ +"menu_cloud_print" = "打印文档"; + +/* */ +"menu_help" = "帮助"; + +/* */ +"cancel" = "Cancel"; + +/* */ +"alert_document_saved" = "Document saved"; + +/* */ +"alert_error_save_failed" = "File could not be saved. Please contact support@opendocument.app"; + +/* */ +"alert_error_password_protected" = "此文档受密码保护。"; + +/* */ +"alert_enter_password" = "Please enter the password to decrypt this document"; + +/* */ +"intro_title_1" = "随时随地打开并阅读您的 ODF 文件！"; + +/* */ +"intro_title_2" = "发现文件存在一处文稿错误？支持修改！"; + +/* */ +"intro_title_3" = "通过其他app阅读文件"; + +/* */ +"intro_description_1" = "您可以使用 OpenDocument 阅读器查看以 OpenDocument 格式（.odt, .ods, .odp 和 .odg）储存的文档文件。这些文件通常是使用 LibreOffice 或 OpenOffice 创建的。本应用允许您在移动设备上打开这些文档，助您随时随地阅读它们。"; + +/* */ +"intro_description_2" = "超级文件管理大师不仅允许用户在移动设备上阅读文件，同时还支持文件修改。用户即使在火车上也可轻松修改文稿错误。"; + +/* */ +"intro_description_3" = "超级文件管理大师支持通过大量其他的app打开文件。一位同事通过Gmail发来一份演示文稿？只需点击附件，立刻将其打开！"; + + + From 5c4bb81cc22483840ab098c560d59f0347fe176c Mon Sep 17 00:00:00 2001 From: Thomas Taschauer Date: Sun, 5 Apr 2020 08:19:02 +0200 Subject: [PATCH 09/10] use latest core --- OpenDocument.core | 2 +- OpenDocumentReader.xcodeproj/project.pbxproj | 40 ++++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/OpenDocument.core b/OpenDocument.core index 19464ac..37cb551 160000 --- a/OpenDocument.core +++ b/OpenDocument.core @@ -1 +1 @@ -Subproject commit 19464ac364016c473b166d276fc38917c1652fc8 +Subproject commit 37cb551b138eb7bc2c5024e24912d7b9159fba8f diff --git a/OpenDocumentReader.xcodeproj/project.pbxproj b/OpenDocumentReader.xcodeproj/project.pbxproj index e2f4e34..24a8a59 100644 --- a/OpenDocumentReader.xcodeproj/project.pbxproj +++ b/OpenDocumentReader.xcodeproj/project.pbxproj @@ -13,7 +13,7 @@ AC384BCF23B4FFA700C7BF47 /* PageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC384BCB23B4FFA700C7BF47 /* PageViewController.swift */; }; E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2064DDF22CFA1BA006441F8 /* iAd.framework */; }; E21C59A124308C590076C37C /* libcryptopp-object.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C598224308C3E0076C37C /* libcryptopp-object.a */; }; - E21C59A324308C590076C37C /* libglogd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C598824308C3E0076C37C /* libglogd.a */; }; + E21C59A324308C590076C37C /* libglog.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C598824308C3E0076C37C /* libglog.a */; }; E21C59A424308C590076C37C /* libminiz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C598E24308C3E0076C37C /* libminiz.a */; }; E21C59A524308C590076C37C /* libodr_access.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599224308C3E0076C37C /* libodr_access.a */; }; E21C59A624308C590076C37C /* libodr_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599424308C3E0076C37C /* libodr_common.a */; }; @@ -162,77 +162,77 @@ isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 483F221658B64C798729DBA6; + remoteGlobalIDString = A62509A9557F4E92908A067C; remoteInfo = "cryptopp-object"; }; E21C59B124308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = EB3EA1E685234474A8FC6AC4; + remoteGlobalIDString = CEDAD0E387D14D49B22887C9; remoteInfo = glog; }; E21C59B324308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 6F607BFB2BA846A088D98C30; + remoteGlobalIDString = 9BE247E39ACC4A35B0310BDF; remoteInfo = miniz; }; E21C59B524308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = BA922A7D95284F5790141791; + remoteGlobalIDString = B3312A6E2A5642299390910E; remoteInfo = odr; }; E21C59B724308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 45C61071D67F4ED1994C6F71; + remoteGlobalIDString = 7B66EE5A409C4E8CBF03C55B; remoteInfo = odr_access; }; E21C59B924308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 2AA041F0110141749D4C63FC; + remoteGlobalIDString = 7FCA09740AE0412C973751F4; remoteInfo = odr_common; }; E21C59BB24308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 8C7B74D4C2514560AFF2E42C; + remoteGlobalIDString = 714662803DFB448890C736E9; remoteInfo = odr_crypto; }; E21C59BD24308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 50812718488C455E90430EF5; + remoteGlobalIDString = A5B45BFEEFFA47C8A8570F1C; remoteInfo = odr_odf; }; E21C59BF24308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = FB2996AB774D46358BCEC3BF; + remoteGlobalIDString = 75EB44DB7B02498A841AADF1; remoteInfo = odr_ooxml; }; E21C59C124308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = F5E76FDA3FE64060BF9648D1; + remoteGlobalIDString = 07C09E9DBF0C46D7AE25AB14; remoteInfo = odr_svm; }; E21C59C324308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = C5AAC7B36DDD4EC0ABA03424; + remoteGlobalIDString = B951B32DE6CB476FBF4105AF; remoteInfo = tinyxml2; }; /* End PBXContainerItemProxy section */ @@ -282,7 +282,7 @@ E21C59AC24308C5A0076C37C /* libtinyxml2.a in Frameworks */, E21C59A924308C590076C37C /* libodr_ooxml.a in Frameworks */, E21C59A724308C590076C37C /* libodr_crypto.a in Frameworks */, - E21C59A324308C590076C37C /* libglogd.a in Frameworks */, + E21C59A324308C590076C37C /* libglog.a in Frameworks */, 21E6C5303C9ED8A9A9317BEC /* Pods_OpenDocumentReader.framework in Frameworks */, E21C59A424308C590076C37C /* libminiz.a in Frameworks */, ); @@ -307,7 +307,7 @@ E21C598224308C3E0076C37C /* libcryptopp-object.a */, E21C598424308C3E0076C37C /* libcryptopp.dylib */, E21C598624308C3E0076C37C /* libcryptopp.a */, - E21C598824308C3E0076C37C /* libglogd.a */, + E21C598824308C3E0076C37C /* libglog.a */, E21C598A24308C3E0076C37C /* libgtestd.a */, E21C598C24308C3E0076C37C /* libgtest_maind.a */, E21C598E24308C3E0076C37C /* libminiz.a */, @@ -483,10 +483,10 @@ remoteRef = E21C598524308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E21C598824308C3E0076C37C /* libglogd.a */ = { + E21C598824308C3E0076C37C /* libglog.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libglogd.a; + path = libglog.a; remoteRef = E21C598724308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -869,7 +869,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 17; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = 5LS6X97G6J; HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -882,7 +882,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.13; + MARKETING_VERSION = 1.14; PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; @@ -899,7 +899,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 17; + CURRENT_PROJECT_VERSION = 18; DEVELOPMENT_TEAM = 5LS6X97G6J; HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -912,7 +912,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.13; + MARKETING_VERSION = 1.14; PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h; From d060779ad8a2370b8564618838a94a91da08c612 Mon Sep 17 00:00:00 2001 From: Artsem Lemiasheuski Date: Sun, 5 Apr 2020 11:10:30 +0200 Subject: [PATCH 10/10] Add missing .xcodeproj --- OpenDocumentReader.xcodeproj/project.pbxproj | 91 ++++++++++++++++---- 1 file changed, 75 insertions(+), 16 deletions(-) diff --git a/OpenDocumentReader.xcodeproj/project.pbxproj b/OpenDocumentReader.xcodeproj/project.pbxproj index e2f4e34..a79ddc9 100644 --- a/OpenDocumentReader.xcodeproj/project.pbxproj +++ b/OpenDocumentReader.xcodeproj/project.pbxproj @@ -8,12 +8,13 @@ /* Begin PBXBuildFile section */ 21E6C5303C9ED8A9A9317BEC /* Pods_OpenDocumentReader.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EF00F649A86477A6C27F07C0 /* Pods_OpenDocumentReader.framework */; }; + AC125F162435311A008AD515 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = AC125F182435311A008AD515 /* Localizable.strings */; }; AC384BCD23B4FFA700C7BF47 /* ContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC384BC923B4FFA700C7BF47 /* ContentViewController.swift */; }; AC384BCE23B4FFA700C7BF47 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC384BCA23B4FFA700C7BF47 /* Constants.swift */; }; AC384BCF23B4FFA700C7BF47 /* PageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC384BCB23B4FFA700C7BF47 /* PageViewController.swift */; }; E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2064DDF22CFA1BA006441F8 /* iAd.framework */; }; E21C59A124308C590076C37C /* libcryptopp-object.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C598224308C3E0076C37C /* libcryptopp-object.a */; }; - E21C59A324308C590076C37C /* libglogd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C598824308C3E0076C37C /* libglogd.a */; }; + E21C59A324308C590076C37C /* libglog.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C598824308C3E0076C37C /* libglog.a */; }; E21C59A424308C590076C37C /* libminiz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C598E24308C3E0076C37C /* libminiz.a */; }; E21C59A524308C590076C37C /* libodr_access.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599224308C3E0076C37C /* libodr_access.a */; }; E21C59A624308C590076C37C /* libodr_common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E21C599424308C3E0076C37C /* libodr_common.a */; }; @@ -162,86 +163,102 @@ isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 483F221658B64C798729DBA6; + remoteGlobalIDString = 59DBB53456484CB0983C9A43; remoteInfo = "cryptopp-object"; }; E21C59B124308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = EB3EA1E685234474A8FC6AC4; + remoteGlobalIDString = CC12E08925BE42A0AA294E15; remoteInfo = glog; }; E21C59B324308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 6F607BFB2BA846A088D98C30; + remoteGlobalIDString = 8EACE2CBC6E34210A50D99F0; remoteInfo = miniz; }; E21C59B524308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = BA922A7D95284F5790141791; + remoteGlobalIDString = EA8D6D3A69944DD3B6ED464B; remoteInfo = odr; }; E21C59B724308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 45C61071D67F4ED1994C6F71; + remoteGlobalIDString = E4812450E4264EA3BD05F075; remoteInfo = odr_access; }; E21C59B924308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 2AA041F0110141749D4C63FC; + remoteGlobalIDString = 55C82E1E9A1C4FB3ADDB6D3C; remoteInfo = odr_common; }; E21C59BB24308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 8C7B74D4C2514560AFF2E42C; + remoteGlobalIDString = 8955837D11E449258913A737; remoteInfo = odr_crypto; }; E21C59BD24308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 50812718488C455E90430EF5; + remoteGlobalIDString = EF0C4D7C888C4C7DB71A8BBC; remoteInfo = odr_odf; }; E21C59BF24308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = FB2996AB774D46358BCEC3BF; + remoteGlobalIDString = 7217A617658D40FDA1DDF157; remoteInfo = odr_ooxml; }; E21C59C124308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = F5E76FDA3FE64060BF9648D1; + remoteGlobalIDString = 888A4486ED384BE1B26365E4; remoteInfo = odr_svm; }; E21C59C324308C720076C37C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = E21C596324308C3E0076C37C /* Project.xcodeproj */; proxyType = 1; - remoteGlobalIDString = C5AAC7B36DDD4EC0ABA03424; + remoteGlobalIDString = 5A020867743D4E9AB2DF2737; remoteInfo = tinyxml2; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 97704690541D85438FC2079C /* Pods-OpenDocumentReader.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReader.release.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.release.xcconfig"; sourceTree = ""; }; + AC125F172435311A008AD515 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; + AC125F1924353135008AD515 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; + AC125F1A24353140008AD515 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = ""; }; + AC2D94C12436848F00040B87 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = ""; }; + AC2D94C22436849900040B87 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; + AC2D94C3243684B600040B87 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = ""; }; + AC2D94C4243684BF00040B87 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = ""; }; + AC2D94C5243684C700040B87 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; + AC2D94C6243684DD00040B87 /* ga */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ga; path = ga.lproj/Localizable.strings; sourceTree = ""; }; + AC2D94C7243684E500040B87 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = ""; }; + AC2D94C8243684ED00040B87 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = ""; }; + AC2D94C9243684F700040B87 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = ""; }; + AC2D94CA2436854300040B87 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = ""; }; + AC2D94CC2436856600040B87 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = ""; }; + AC2D94CD2436857100040B87 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = ""; }; AC384BC923B4FFA700C7BF47 /* ContentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentViewController.swift; sourceTree = ""; }; AC384BCA23B4FFA700C7BF47 /* Constants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = ""; }; AC384BCB23B4FFA700C7BF47 /* PageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PageViewController.swift; sourceTree = ""; }; + AC73790F2438E52B00F9F3B5 /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/Localizable.strings; sourceTree = ""; }; B3FCFC99F5757D71C0A3EB11 /* Pods-OpenDocumentReader.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReader.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.debug.xcconfig"; sourceTree = ""; }; E2064DDF22CFA1BA006441F8 /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; }; E21C596324308C3E0076C37C /* Project.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Project.xcodeproj; path = build/Project.xcodeproj; sourceTree = ""; }; @@ -282,7 +299,7 @@ E21C59AC24308C5A0076C37C /* libtinyxml2.a in Frameworks */, E21C59A924308C590076C37C /* libodr_ooxml.a in Frameworks */, E21C59A724308C590076C37C /* libodr_crypto.a in Frameworks */, - E21C59A324308C590076C37C /* libglogd.a in Frameworks */, + E21C59A324308C590076C37C /* libglog.a in Frameworks */, 21E6C5303C9ED8A9A9317BEC /* Pods_OpenDocumentReader.framework in Frameworks */, E21C59A424308C590076C37C /* libminiz.a in Frameworks */, ); @@ -307,7 +324,7 @@ E21C598224308C3E0076C37C /* libcryptopp-object.a */, E21C598424308C3E0076C37C /* libcryptopp.dylib */, E21C598624308C3E0076C37C /* libcryptopp.a */, - E21C598824308C3E0076C37C /* libglogd.a */, + E21C598824308C3E0076C37C /* libglog.a */, E21C598A24308C3E0076C37C /* libgtestd.a */, E21C598C24308C3E0076C37C /* libgtest_maind.a */, E21C598E24308C3E0076C37C /* libminiz.a */, @@ -374,6 +391,7 @@ E2C008FC220F1D570097C594 /* CoreWrapper.h */, E29E4076225A4672002C06E6 /* GoogleService-Info.plist */, E2D0B3D8226D945400534FCC /* StoreReviewHelper.swift */, + AC125F182435311A008AD515 /* Localizable.strings */, ); path = OpenDocumentReader; sourceTree = ""; @@ -435,6 +453,21 @@ knownRegions = ( en, Base, + de, + ru, + ca, + "zh-Hans", + cs, + da, + fr, + ga, + it, + ja, + pl, + "pt-BR", + es, + tr, + sl, ); mainGroup = E2F7ED46220B54D600D63515; productRefGroup = E2F7ED50220B54D600D63515 /* Products */; @@ -483,10 +516,10 @@ remoteRef = E21C598524308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - E21C598824308C3E0076C37C /* libglogd.a */ = { + E21C598824308C3E0076C37C /* libglog.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libglogd.a; + path = libglog.a; remoteRef = E21C598724308C3E0076C37C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -582,6 +615,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + AC125F162435311A008AD515 /* Localizable.strings in Resources */, E2F7ED61220B54D700D63515 /* LaunchScreen.storyboard in Resources */, E22EB71C226B66B300053B86 /* Main.storyboard in Resources */, E29E4077225A4672002C06E6 /* GoogleService-Info.plist in Resources */, @@ -731,6 +765,29 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ + AC125F182435311A008AD515 /* Localizable.strings */ = { + isa = PBXVariantGroup; + children = ( + AC125F172435311A008AD515 /* en */, + AC125F1924353135008AD515 /* de */, + AC125F1A24353140008AD515 /* ru */, + AC2D94C12436848F00040B87 /* ca */, + AC2D94C22436849900040B87 /* zh-Hans */, + AC2D94C3243684B600040B87 /* cs */, + AC2D94C4243684BF00040B87 /* da */, + AC2D94C5243684C700040B87 /* fr */, + AC2D94C6243684DD00040B87 /* ga */, + AC2D94C7243684E500040B87 /* it */, + AC2D94C8243684ED00040B87 /* ja */, + AC2D94C9243684F700040B87 /* pl */, + AC2D94CA2436854300040B87 /* pt-BR */, + AC2D94CC2436856600040B87 /* es */, + AC2D94CD2436857100040B87 /* tr */, + AC73790F2438E52B00F9F3B5 /* sl */, + ); + name = Localizable.strings; + sourceTree = ""; + }; E2F7ED5F220B54D700D63515 /* LaunchScreen.storyboard */ = { isa = PBXVariantGroup; children = ( @@ -746,6 +803,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -809,6 +867,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";