Skip to content

O
onlyoffice_core
Commit 6150b093 authored by Alexey.Musinov's avatar Alexey.Musinov Committed by Alexander Trofimov
Browse files
Options

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

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62711 954022d7-b5bf-4e40-9824-e11837661b57
parent 6ed592a6
Show whitespace changes
Inline Side-by-side
Showing with 1878 additions and 81 deletions
.gitattributes
View file @ 6150b093
...@@ -7257,6 +7257,16 @@ DesktopEditor/mac_build/graphics/graphics.xcodeproj/project.xcworkspace/xcuserda ...@@ -7257,6 +7257,16 @@ DesktopEditor/mac_build/graphics/graphics.xcodeproj/project.xcworkspace/xcuserda
DesktopEditor/mac_build/graphics/graphics.xcodeproj/xcuserdata svnc_tsvn_003alogminsize=5 DesktopEditor/mac_build/graphics/graphics.xcodeproj/xcuserdata svnc_tsvn_003alogminsize=5
DesktopEditor/mac_build/graphics/graphics.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad svnc_tsvn_003alogminsize=5 DesktopEditor/mac_build/graphics/graphics.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad svnc_tsvn_003alogminsize=5
DesktopEditor/mac_build/graphics/graphics.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad/xcschemes svnc_tsvn_003alogminsize=5 DesktopEditor/mac_build/graphics/graphics.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad/xcschemes svnc_tsvn_003alogminsize=5
DesktopEditor/mac_build/metafile svnc_tsvn_003alogminsize=5
DesktopEditor/mac_build/metafile/metafile svnc_tsvn_003alogminsize=5
DesktopEditor/mac_build/metafile/metafile.xcodeproj svnc_tsvn_003alogminsize=5
DesktopEditor/mac_build/metafile/metafile.xcodeproj/project.xcworkspace svnc_tsvn_003alogminsize=5
DesktopEditor/mac_build/metafile/metafile.xcodeproj/project.xcworkspace/xcuserdata svnc_tsvn_003alogminsize=5
DesktopEditor/mac_build/metafile/metafile.xcodeproj/project.xcworkspace/xcuserdata/alexey.musinov.xcuserdatad svnc_tsvn_003alogminsize=5
DesktopEditor/mac_build/metafile/metafile.xcodeproj/project.xcworkspace/xcuserdata/alexey.musinov.xcuserdatad/UserInterfaceState.xcuserstate svn_mime_002dtype=application%2Foctet-stream
DesktopEditor/mac_build/metafile/metafile.xcodeproj/xcuserdata svnc_tsvn_003alogminsize=5
DesktopEditor/mac_build/metafile/metafile.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad svnc_tsvn_003alogminsize=5
DesktopEditor/mac_build/metafile/metafile.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad/xcschemes svnc_tsvn_003alogminsize=5
DesktopEditor/mac_build/raster svnc_tsvn_003alogminsize=5 DesktopEditor/mac_build/raster svnc_tsvn_003alogminsize=5
DesktopEditor/mac_build/raster/raster svnc_tsvn_003alogminsize=5 DesktopEditor/mac_build/raster/raster svnc_tsvn_003alogminsize=5
DesktopEditor/mac_build/raster/raster.xcodeproj svnc_tsvn_003alogminsize=5 DesktopEditor/mac_build/raster/raster.xcodeproj svnc_tsvn_003alogminsize=5
ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj/project.pbxproj
View file @ 6150b093
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
17A765281B0F3DC30046BC0B /* DefaultThemeWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17A765271B0F3DC30046BC0B /* DefaultThemeWriter.h */; };
17A765291B0F3DC30046BC0B /* DefaultThemeWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17A765271B0F3DC30046BC0B /* DefaultThemeWriter.h */; };
17C1FE961ACC42C4006B99B3 /* Common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E17F1E1AC4549B00BEA2EA /* Common.cpp */; }; 17C1FE961ACC42C4006B99B3 /* Common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E17F1E1AC4549B00BEA2EA /* Common.cpp */; };
17C1FE971ACC42C4006B99B3 /* ChartFromToBinary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E17F221AC4549B00BEA2EA /* ChartFromToBinary.cpp */; }; 17C1FE971ACC42C4006B99B3 /* ChartFromToBinary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E17F221AC4549B00BEA2EA /* ChartFromToBinary.cpp */; };
17C1FE981ACC42C4006B99B3 /* CSVReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E17F261AC4549B00BEA2EA /* CSVReader.cpp */; }; 17C1FE981ACC42C4006B99B3 /* CSVReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E17F261AC4549B00BEA2EA /* CSVReader.cpp */; };
...@@ -18,7 +20,6 @@ ...@@ -18,7 +20,6 @@
17C1FEA11ACC42C4006B99B3 /* fontTableWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF31AC4544900BEA2EA /* fontTableWriter.h */; }; 17C1FEA11ACC42C4006B99B3 /* fontTableWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF31AC4544900BEA2EA /* fontTableWriter.h */; };
17C1FEA21ACC42C4006B99B3 /* ChartFromToBinary.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F231AC4549B00BEA2EA /* ChartFromToBinary.h */; }; 17C1FEA21ACC42C4006B99B3 /* ChartFromToBinary.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F231AC4549B00BEA2EA /* ChartFromToBinary.h */; };
17C1FEA31ACC42C4006B99B3 /* MediaWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF51AC4544900BEA2EA /* MediaWriter.h */; }; 17C1FEA31ACC42C4006B99B3 /* MediaWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF51AC4544900BEA2EA /* MediaWriter.h */; };
17C1FEA41ACC42C4006B99B3 /* DefaultThemeWriterLinux.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EEE1AC4544900BEA2EA /* DefaultThemeWriterLinux.h */; };
17C1FEA51ACC42C4006B99B3 /* CommonWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F251AC4549B00BEA2EA /* CommonWriter.h */; }; 17C1FEA51ACC42C4006B99B3 /* CommonWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F251AC4549B00BEA2EA /* CommonWriter.h */; };
17C1FEA61ACC42C4006B99B3 /* NumberingWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF61AC4544900BEA2EA /* NumberingWriter.h */; }; 17C1FEA61ACC42C4006B99B3 /* NumberingWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF61AC4544900BEA2EA /* NumberingWriter.h */; };
17C1FEA71ACC42C4006B99B3 /* BinReaderWriterDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F1D1AC4549B00BEA2EA /* BinReaderWriterDefines.h */; }; 17C1FEA71ACC42C4006B99B3 /* BinReaderWriterDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F1D1AC4549B00BEA2EA /* BinReaderWriterDefines.h */; };
...@@ -41,7 +42,6 @@ ...@@ -41,7 +42,6 @@
17C1FEB81ACC42C4006B99B3 /* FileDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F4E1AC454EF00BEA2EA /* FileDownloader.h */; }; 17C1FEB81ACC42C4006B99B3 /* FileDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F4E1AC454EF00BEA2EA /* FileDownloader.h */; };
17C1FEB91ACC42C4006B99B3 /* ReaderClasses.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF71AC4544900BEA2EA /* ReaderClasses.h */; }; 17C1FEB91ACC42C4006B99B3 /* ReaderClasses.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF71AC4544900BEA2EA /* ReaderClasses.h */; };
17C1FEBA1ACC42C4006B99B3 /* BinaryReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F2E1AC4549B00BEA2EA /* BinaryReader.h */; }; 17C1FEBA1ACC42C4006B99B3 /* BinaryReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F2E1AC4549B00BEA2EA /* BinaryReader.h */; };
17C1FEBB1ACC42C4006B99B3 /* DefaultThemeWriterWin.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EEF1AC4544900BEA2EA /* DefaultThemeWriterWin.h */; };
17C1FEBC1ACC42C4006B99B3 /* DocxSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F0F1AC4546100BEA2EA /* DocxSerializer.h */; }; 17C1FEBC1ACC42C4006B99B3 /* DocxSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F0F1AC4546100BEA2EA /* DocxSerializer.h */; };
17C1FEBD1ACC42C4006B99B3 /* FileWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF21AC4544900BEA2EA /* FileWriter.h */; }; 17C1FEBD1ACC42C4006B99B3 /* FileWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF21AC4544900BEA2EA /* FileWriter.h */; };
17C1FEBE1ACC42C4006B99B3 /* CSVWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F301AC4549B00BEA2EA /* CSVWriter.h */; }; 17C1FEBE1ACC42C4006B99B3 /* CSVWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17F301AC4549B00BEA2EA /* CSVWriter.h */; };
...@@ -50,8 +50,6 @@ ...@@ -50,8 +50,6 @@
17E17EFC1AC4544900BEA2EA /* ChartWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EEB1AC4544900BEA2EA /* ChartWriter.h */; }; 17E17EFC1AC4544900BEA2EA /* ChartWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EEB1AC4544900BEA2EA /* ChartWriter.h */; };
17E17EFD1AC4544900BEA2EA /* CommentsWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EEC1AC4544900BEA2EA /* CommentsWriter.h */; }; 17E17EFD1AC4544900BEA2EA /* CommentsWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EEC1AC4544900BEA2EA /* CommentsWriter.h */; };
17E17EFE1AC4544900BEA2EA /* ContentTypesWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EED1AC4544900BEA2EA /* ContentTypesWriter.h */; }; 17E17EFE1AC4544900BEA2EA /* ContentTypesWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EED1AC4544900BEA2EA /* ContentTypesWriter.h */; };
17E17EFF1AC4544900BEA2EA /* DefaultThemeWriterLinux.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EEE1AC4544900BEA2EA /* DefaultThemeWriterLinux.h */; };
17E17F001AC4544900BEA2EA /* DefaultThemeWriterWin.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EEF1AC4544900BEA2EA /* DefaultThemeWriterWin.h */; };
17E17F011AC4544900BEA2EA /* DocumentRelsWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF01AC4544900BEA2EA /* DocumentRelsWriter.h */; }; 17E17F011AC4544900BEA2EA /* DocumentRelsWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF01AC4544900BEA2EA /* DocumentRelsWriter.h */; };
17E17F021AC4544900BEA2EA /* DocumentWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF11AC4544900BEA2EA /* DocumentWriter.h */; }; 17E17F021AC4544900BEA2EA /* DocumentWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF11AC4544900BEA2EA /* DocumentWriter.h */; };
17E17F031AC4544900BEA2EA /* FileWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF21AC4544900BEA2EA /* FileWriter.h */; }; 17E17F031AC4544900BEA2EA /* FileWriter.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E17EF21AC4544900BEA2EA /* FileWriter.h */; };
...@@ -119,14 +117,13 @@ ...@@ -119,14 +117,13 @@
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
17A765271B0F3DC30046BC0B /* DefaultThemeWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DefaultThemeWriter.h; sourceTree = "<group>"; };
17C1FEC21ACC42C4006B99B3 /* libASCOfficeDocxFile2Lib_ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libASCOfficeDocxFile2Lib_ios.a; sourceTree = BUILT_PRODUCTS_DIR; }; 17C1FEC21ACC42C4006B99B3 /* libASCOfficeDocxFile2Lib_ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libASCOfficeDocxFile2Lib_ios.a; sourceTree = BUILT_PRODUCTS_DIR; };
17D913AB1AC596180096D788 /* DocxFormatLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DocxFormatLib.xcodeproj; path = ../../Common/DocxFormat/Mac/DocxFormatLib.xcodeproj; sourceTree = "<group>"; }; 17D913AB1AC596180096D788 /* DocxFormatLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DocxFormatLib.xcodeproj; path = ../../Common/DocxFormat/Mac/DocxFormatLib.xcodeproj; sourceTree = "<group>"; };
17E17EDC1AC453F800BEA2EA /* libASCOfficeDocxFile2Lib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libASCOfficeDocxFile2Lib.a; sourceTree = BUILT_PRODUCTS_DIR; }; 17E17EDC1AC453F800BEA2EA /* libASCOfficeDocxFile2Lib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libASCOfficeDocxFile2Lib.a; sourceTree = BUILT_PRODUCTS_DIR; };
17E17EEB1AC4544900BEA2EA /* ChartWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChartWriter.h; sourceTree = "<group>"; }; 17E17EEB1AC4544900BEA2EA /* ChartWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChartWriter.h; sourceTree = "<group>"; };
17E17EEC1AC4544900BEA2EA /* CommentsWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommentsWriter.h; sourceTree = "<group>"; }; 17E17EEC1AC4544900BEA2EA /* CommentsWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommentsWriter.h; sourceTree = "<group>"; };
17E17EED1AC4544900BEA2EA /* ContentTypesWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentTypesWriter.h; sourceTree = "<group>"; }; 17E17EED1AC4544900BEA2EA /* ContentTypesWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentTypesWriter.h; sourceTree = "<group>"; };
17E17EEE1AC4544900BEA2EA /* DefaultThemeWriterLinux.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DefaultThemeWriterLinux.h; sourceTree = "<group>"; };
17E17EEF1AC4544900BEA2EA /* DefaultThemeWriterWin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DefaultThemeWriterWin.h; sourceTree = "<group>"; };
17E17EF01AC4544900BEA2EA /* DocumentRelsWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentRelsWriter.h; sourceTree = "<group>"; }; 17E17EF01AC4544900BEA2EA /* DocumentRelsWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentRelsWriter.h; sourceTree = "<group>"; };
17E17EF11AC4544900BEA2EA /* DocumentWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentWriter.h; sourceTree = "<group>"; }; 17E17EF11AC4544900BEA2EA /* DocumentWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentWriter.h; sourceTree = "<group>"; };
17E17EF21AC4544900BEA2EA /* FileWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileWriter.h; sourceTree = "<group>"; }; 17E17EF21AC4544900BEA2EA /* FileWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileWriter.h; sourceTree = "<group>"; };
...@@ -226,8 +223,7 @@ ...@@ -226,8 +223,7 @@
17E17EEB1AC4544900BEA2EA /* ChartWriter.h */, 17E17EEB1AC4544900BEA2EA /* ChartWriter.h */,
17E17EEC1AC4544900BEA2EA /* CommentsWriter.h */, 17E17EEC1AC4544900BEA2EA /* CommentsWriter.h */,
17E17EED1AC4544900BEA2EA /* ContentTypesWriter.h */, 17E17EED1AC4544900BEA2EA /* ContentTypesWriter.h */,
17E17EEE1AC4544900BEA2EA /* DefaultThemeWriterLinux.h */, 17A765271B0F3DC30046BC0B /* DefaultThemeWriter.h */,
17E17EEF1AC4544900BEA2EA /* DefaultThemeWriterWin.h */,
17E17EF01AC4544900BEA2EA /* DocumentRelsWriter.h */, 17E17EF01AC4544900BEA2EA /* DocumentRelsWriter.h */,
17E17EF11AC4544900BEA2EA /* DocumentWriter.h */, 17E17EF11AC4544900BEA2EA /* DocumentWriter.h */,
17E17EF21AC4544900BEA2EA /* FileWriter.h */, 17E17EF21AC4544900BEA2EA /* FileWriter.h */,
...@@ -321,9 +317,9 @@ ...@@ -321,9 +317,9 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
17C1FEA11ACC42C4006B99B3 /* fontTableWriter.h in Headers */, 17C1FEA11ACC42C4006B99B3 /* fontTableWriter.h in Headers */,
17A765291B0F3DC30046BC0B /* DefaultThemeWriter.h in Headers */,
17C1FEA21ACC42C4006B99B3 /* ChartFromToBinary.h in Headers */, 17C1FEA21ACC42C4006B99B3 /* ChartFromToBinary.h in Headers */,
17C1FEA31ACC42C4006B99B3 /* MediaWriter.h in Headers */, 17C1FEA31ACC42C4006B99B3 /* MediaWriter.h in Headers */,
17C1FEA41ACC42C4006B99B3 /* DefaultThemeWriterLinux.h in Headers */,
17C1FEA51ACC42C4006B99B3 /* CommonWriter.h in Headers */, 17C1FEA51ACC42C4006B99B3 /* CommonWriter.h in Headers */,
17C1FEA61ACC42C4006B99B3 /* NumberingWriter.h in Headers */, 17C1FEA61ACC42C4006B99B3 /* NumberingWriter.h in Headers */,
17C1FEA71ACC42C4006B99B3 /* BinReaderWriterDefines.h in Headers */, 17C1FEA71ACC42C4006B99B3 /* BinReaderWriterDefines.h in Headers */,
...@@ -346,7 +342,6 @@ ...@@ -346,7 +342,6 @@
17C1FEB81ACC42C4006B99B3 /* FileDownloader.h in Headers */, 17C1FEB81ACC42C4006B99B3 /* FileDownloader.h in Headers */,
17C1FEB91ACC42C4006B99B3 /* ReaderClasses.h in Headers */, 17C1FEB91ACC42C4006B99B3 /* ReaderClasses.h in Headers */,
17C1FEBA1ACC42C4006B99B3 /* BinaryReader.h in Headers */, 17C1FEBA1ACC42C4006B99B3 /* BinaryReader.h in Headers */,
17C1FEBB1ACC42C4006B99B3 /* DefaultThemeWriterWin.h in Headers */,
17C1FEBC1ACC42C4006B99B3 /* DocxSerializer.h in Headers */, 17C1FEBC1ACC42C4006B99B3 /* DocxSerializer.h in Headers */,
17C1FEBD1ACC42C4006B99B3 /* FileWriter.h in Headers */, 17C1FEBD1ACC42C4006B99B3 /* FileWriter.h in Headers */,
17C1FEBE1ACC42C4006B99B3 /* CSVWriter.h in Headers */, 17C1FEBE1ACC42C4006B99B3 /* CSVWriter.h in Headers */,
...@@ -358,9 +353,9 @@ ...@@ -358,9 +353,9 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
17E17F041AC4544900BEA2EA /* fontTableWriter.h in Headers */, 17E17F041AC4544900BEA2EA /* fontTableWriter.h in Headers */,
17A765281B0F3DC30046BC0B /* DefaultThemeWriter.h in Headers */,
17E17F3F1AC4549B00BEA2EA /* ChartFromToBinary.h in Headers */, 17E17F3F1AC4549B00BEA2EA /* ChartFromToBinary.h in Headers */,
17E17F061AC4544900BEA2EA /* MediaWriter.h in Headers */, 17E17F061AC4544900BEA2EA /* MediaWriter.h in Headers */,
17E17EFF1AC4544900BEA2EA /* DefaultThemeWriterLinux.h in Headers */,
17E17F411AC4549B00BEA2EA /* CommonWriter.h in Headers */, 17E17F411AC4549B00BEA2EA /* CommonWriter.h in Headers */,
17E17F071AC4544900BEA2EA /* NumberingWriter.h in Headers */, 17E17F071AC4544900BEA2EA /* NumberingWriter.h in Headers */,
17E17F3A1AC4549B00BEA2EA /* BinReaderWriterDefines.h in Headers */, 17E17F3A1AC4549B00BEA2EA /* BinReaderWriterDefines.h in Headers */,
...@@ -383,7 +378,6 @@ ...@@ -383,7 +378,6 @@
17E17F4F1AC454EF00BEA2EA /* FileDownloader.h in Headers */, 17E17F4F1AC454EF00BEA2EA /* FileDownloader.h in Headers */,
17E17F081AC4544900BEA2EA /* ReaderClasses.h in Headers */, 17E17F081AC4544900BEA2EA /* ReaderClasses.h in Headers */,
17E17F491AC4549B00BEA2EA /* BinaryReader.h in Headers */, 17E17F491AC4549B00BEA2EA /* BinaryReader.h in Headers */,
17E17F001AC4544900BEA2EA /* DefaultThemeWriterWin.h in Headers */,
17E17F151AC4546100BEA2EA /* DocxSerializer.h in Headers */, 17E17F151AC4546100BEA2EA /* DocxSerializer.h in Headers */,
17E17F031AC4544900BEA2EA /* FileWriter.h in Headers */, 17E17F031AC4544900BEA2EA /* FileWriter.h in Headers */,
17E17F4B1AC4549B00BEA2EA /* CSVWriter.h in Headers */, 17E17F4B1AC4549B00BEA2EA /* CSVWriter.h in Headers */,
......
ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp
View file @ 6150b093
...@@ -534,7 +534,12 @@ namespace NSBinPptxRW ...@@ -534,7 +534,12 @@ namespace NSBinPptxRW
{ {
CheckBufferSize(DOUBLE_SIZEOF); CheckBufferSize(DOUBLE_SIZEOF);
*((double*)m_pStreamCur) = dValue; #ifdef _IOS
memcpy(m_pStreamCur, &dValue, sizeof(double));
#else
*((double*)m_pStreamCur) = dValue; // EXC_ARM_DA_ALIGN on ios
#endif
m_lPosition += DOUBLE_SIZEOF; m_lPosition += DOUBLE_SIZEOF;
m_pStreamCur += DOUBLE_SIZEOF; m_pStreamCur += DOUBLE_SIZEOF;
} }
......
ASCOfficePPTXFile/PPTXLib/Mac/PPTXFormatLib.xcodeproj/project.pbxproj
View file @ 6150b093
...@@ -458,6 +458,8 @@ ...@@ -458,6 +458,8 @@
179A46FE1AC57B92005A27F7 /* ASCOfficeDrawingConverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A46FC1AC57B92005A27F7 /* ASCOfficeDrawingConverter.cpp */; }; 179A46FE1AC57B92005A27F7 /* ASCOfficeDrawingConverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A46FC1AC57B92005A27F7 /* ASCOfficeDrawingConverter.cpp */; };
179A46FF1AC57B92005A27F7 /* ASCOfficeDrawingConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A46FD1AC57B92005A27F7 /* ASCOfficeDrawingConverter.h */; }; 179A46FF1AC57B92005A27F7 /* ASCOfficeDrawingConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 179A46FD1AC57B92005A27F7 /* ASCOfficeDrawingConverter.h */; };
179A47011AC57B9B005A27F7 /* ASCOfficePPTXFileRealization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A47001AC57B9B005A27F7 /* ASCOfficePPTXFileRealization.cpp */; }; 179A47011AC57B9B005A27F7 /* ASCOfficePPTXFileRealization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 179A47001AC57B9B005A27F7 /* ASCOfficePPTXFileRealization.cpp */; };
17A762E71B0F362A0046BC0B /* libmetafile.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17A762E21B0F35E50046BC0B /* libmetafile.a */; };
17A762EA1B0F36330046BC0B /* libmetafile_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17A762E41B0F35E50046BC0B /* libmetafile_ios.a */; };
17C1003C1ACC4B96006B99B3 /* libgraphics_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C1002E1ACC4B7D006B99B3 /* libgraphics_ios.a */; }; 17C1003C1ACC4B96006B99B3 /* libgraphics_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C1002E1ACC4B7D006B99B3 /* libgraphics_ios.a */; };
17C1003D1ACC4B9A006B99B3 /* libraster_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C100311ACC4B7D006B99B3 /* libraster_ios.a */; }; 17C1003D1ACC4B9A006B99B3 /* libraster_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C100311ACC4B7D006B99B3 /* libraster_ios.a */; };
17C1003E1ACC4B9E006B99B3 /* libfontengine_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C1002B1ACC4B7D006B99B3 /* libfontengine_ios.a */; }; 17C1003E1ACC4B9E006B99B3 /* libfontengine_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C1002B1ACC4B7D006B99B3 /* libfontengine_ios.a */; };
...@@ -956,6 +958,34 @@ ...@@ -956,6 +958,34 @@
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
17A762E11B0F35E50046BC0B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 17A762DC1B0F35E40046BC0B /* metafile.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 17A762BA1B0F35320046BC0B;
remoteInfo = metafile;
};
17A762E31B0F35E50046BC0B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 17A762DC1B0F35E40046BC0B /* metafile.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 17A762DB1B0F355E0046BC0B;
remoteInfo = metafile_ios;
};
17A762E51B0F36210046BC0B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 17A762DC1B0F35E40046BC0B /* metafile.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 17A762B91B0F35320046BC0B;
remoteInfo = metafile;
};
17A762E81B0F362E0046BC0B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 17A762DC1B0F35E40046BC0B /* metafile.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 17A762D41B0F355E0046BC0B;
remoteInfo = metafile_ios;
};
17C100241ACC4B7D006B99B3 /* PBXContainerItemProxy */ = { 17C100241ACC4B7D006B99B3 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy; isa = PBXContainerItemProxy;
containerPortal = 17D91A0B1AC5A2BA0096D788 /* agg.xcodeproj */; containerPortal = 17D91A0B1AC5A2BA0096D788 /* agg.xcodeproj */;
...@@ -1554,6 +1584,7 @@ ...@@ -1554,6 +1584,7 @@
179A46FC1AC57B92005A27F7 /* ASCOfficeDrawingConverter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ASCOfficeDrawingConverter.cpp; path = ../../../ASCOfficeDrawingConverter.cpp; sourceTree = "<group>"; }; 179A46FC1AC57B92005A27F7 /* ASCOfficeDrawingConverter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ASCOfficeDrawingConverter.cpp; path = ../../../ASCOfficeDrawingConverter.cpp; sourceTree = "<group>"; };
179A46FD1AC57B92005A27F7 /* ASCOfficeDrawingConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASCOfficeDrawingConverter.h; path = ../../../ASCOfficeDrawingConverter.h; sourceTree = "<group>"; }; 179A46FD1AC57B92005A27F7 /* ASCOfficeDrawingConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASCOfficeDrawingConverter.h; path = ../../../ASCOfficeDrawingConverter.h; sourceTree = "<group>"; };
179A47001AC57B9B005A27F7 /* ASCOfficePPTXFileRealization.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ASCOfficePPTXFileRealization.cpp; path = ../../../ASCOfficePPTXFileRealization.cpp; sourceTree = "<group>"; }; 179A47001AC57B9B005A27F7 /* ASCOfficePPTXFileRealization.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ASCOfficePPTXFileRealization.cpp; path = ../../../ASCOfficePPTXFileRealization.cpp; sourceTree = "<group>"; };
17A762DC1B0F35E40046BC0B /* metafile.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = metafile.xcodeproj; path = ../../../DesktopEditor/mac_build/metafile/metafile.xcodeproj; sourceTree = "<group>"; };
17C1E3DE1AD40612001E3D18 /* Controls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Controls.cpp; sourceTree = "<group>"; }; 17C1E3DE1AD40612001E3D18 /* Controls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Controls.cpp; sourceTree = "<group>"; };
17C1E3DF1AD40612001E3D18 /* Controls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Controls.h; sourceTree = "<group>"; }; 17C1E3DF1AD40612001E3D18 /* Controls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Controls.h; sourceTree = "<group>"; };
17C1FE8B1ACC429D006B99B3 /* libPPTXFormatLib_ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPPTXFormatLib_ios.a; sourceTree = BUILT_PRODUCTS_DIR; }; 17C1FE8B1ACC429D006B99B3 /* libPPTXFormatLib_ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPPTXFormatLib_ios.a; sourceTree = BUILT_PRODUCTS_DIR; };
...@@ -1584,6 +1615,7 @@ ...@@ -1584,6 +1615,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
17A762E71B0F362A0046BC0B /* libmetafile.a in Frameworks */,
17D918611AC5A1350096D788 /* libfontengine.a in Frameworks */, 17D918611AC5A1350096D788 /* libfontengine.a in Frameworks */,
17D913A71AC595330096D788 /* libgraphics.a in Frameworks */, 17D913A71AC595330096D788 /* libgraphics.a in Frameworks */,
17D913FB1AC59C4C0096D788 /* libraster.a in Frameworks */, 17D913FB1AC59C4C0096D788 /* libraster.a in Frameworks */,
...@@ -1601,6 +1633,7 @@ ...@@ -1601,6 +1633,7 @@
17C1003E1ACC4B9E006B99B3 /* libfontengine_ios.a in Frameworks */, 17C1003E1ACC4B9E006B99B3 /* libfontengine_ios.a in Frameworks */,
17C1003F1ACC4BA3006B99B3 /* libagg_ios.a in Frameworks */, 17C1003F1ACC4BA3006B99B3 /* libagg_ios.a in Frameworks */,
17C100401ACC4BA9006B99B3 /* libcximage_ios.a in Frameworks */, 17C100401ACC4BA9006B99B3 /* libcximage_ios.a in Frameworks */,
17A762EA1B0F36330046BC0B /* libmetafile_ios.a in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -1610,6 +1643,7 @@ ...@@ -1610,6 +1643,7 @@
17063B5A1AC5708E0056A3F1 = { 17063B5A1AC5708E0056A3F1 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
17A762DC1B0F35E40046BC0B /* metafile.xcodeproj */,
17D91B411AC5AA270096D788 /* cximage.xcodeproj */, 17D91B411AC5AA270096D788 /* cximage.xcodeproj */,
17D91A0B1AC5A2BA0096D788 /* agg.xcodeproj */, 17D91A0B1AC5A2BA0096D788 /* agg.xcodeproj */,
17D918591AC5A12B0096D788 /* fontengine.xcodeproj */, 17D918591AC5A12B0096D788 /* fontengine.xcodeproj */,
...@@ -2294,6 +2328,15 @@ ...@@ -2294,6 +2328,15 @@
path = ViewProps; path = ViewProps;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
17A762DD1B0F35E40046BC0B /* Products */ = {
isa = PBXGroup;
children = (
17A762E21B0F35E50046BC0B /* libmetafile.a */,
17A762E41B0F35E50046BC0B /* libmetafile_ios.a */,
);
name = Products;
sourceTree = "<group>";
};
17D913A01AC595220096D788 /* Products */ = { 17D913A01AC595220096D788 /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -3237,6 +3280,7 @@ ...@@ -3237,6 +3280,7 @@
buildRules = ( buildRules = (
); );
dependencies = ( dependencies = (
17A762E61B0F36210046BC0B /* PBXTargetDependency */,
17D91B481AC5AA320096D788 /* PBXTargetDependency */, 17D91B481AC5AA320096D788 /* PBXTargetDependency */,
17D91A121AC5A2C80096D788 /* PBXTargetDependency */, 17D91A121AC5A2C80096D788 /* PBXTargetDependency */,
17D918601AC5A1310096D788 /* PBXTargetDependency */, 17D918601AC5A1310096D788 /* PBXTargetDependency */,
...@@ -3264,6 +3308,7 @@ ...@@ -3264,6 +3308,7 @@
17C100371ACC4B88006B99B3 /* PBXTargetDependency */, 17C100371ACC4B88006B99B3 /* PBXTargetDependency */,
17C100351ACC4B86006B99B3 /* PBXTargetDependency */, 17C100351ACC4B86006B99B3 /* PBXTargetDependency */,
17C100331ACC4B83006B99B3 /* PBXTargetDependency */, 17C100331ACC4B83006B99B3 /* PBXTargetDependency */,
17A762E91B0F362E0046BC0B /* PBXTargetDependency */,
); );
name = PPTXFormatLib_ios; name = PPTXFormatLib_ios;
productName = PPTXFormatLib; productName = PPTXFormatLib;
...@@ -3311,6 +3356,10 @@ ...@@ -3311,6 +3356,10 @@
ProductGroup = 17D913A01AC595220096D788 /* Products */; ProductGroup = 17D913A01AC595220096D788 /* Products */;
ProjectRef = 17D9139F1AC595220096D788 /* graphics.xcodeproj */; ProjectRef = 17D9139F1AC595220096D788 /* graphics.xcodeproj */;
}, },
{
ProductGroup = 17A762DD1B0F35E40046BC0B /* Products */;
ProjectRef = 17A762DC1B0F35E40046BC0B /* metafile.xcodeproj */;
},
{ {
ProductGroup = 17D913F41AC59C430096D788 /* Products */; ProductGroup = 17D913F41AC59C430096D788 /* Products */;
ProjectRef = 17D913F31AC59C430096D788 /* raster.xcodeproj */; ProjectRef = 17D913F31AC59C430096D788 /* raster.xcodeproj */;
...@@ -3325,6 +3374,20 @@ ...@@ -3325,6 +3374,20 @@
/* End PBXProject section */ /* End PBXProject section */
/* Begin PBXReferenceProxy section */ /* Begin PBXReferenceProxy section */
17A762E21B0F35E50046BC0B /* libmetafile.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libmetafile.a;
remoteRef = 17A762E11B0F35E50046BC0B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
17A762E41B0F35E50046BC0B /* libmetafile_ios.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libmetafile_ios.a;
remoteRef = 17A762E31B0F35E50046BC0B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
17C100251ACC4B7D006B99B3 /* libagg_ios.a */ = { 17C100251ACC4B7D006B99B3 /* libagg_ios.a */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = archive.ar; fileType = archive.ar;
...@@ -3507,6 +3570,16 @@ ...@@ -3507,6 +3570,16 @@
/* End PBXSourcesBuildPhase section */ /* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */ /* Begin PBXTargetDependency section */
17A762E61B0F36210046BC0B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = metafile;
targetProxy = 17A762E51B0F36210046BC0B /* PBXContainerItemProxy */;
};
17A762E91B0F362E0046BC0B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = metafile_ios;
targetProxy = 17A762E81B0F362E0046BC0B /* PBXContainerItemProxy */;
};
17C100331ACC4B83006B99B3 /* PBXTargetDependency */ = { 17C100331ACC4B83006B99B3 /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
name = cximage_ios; name = cximage_ios;
......
Common/DocxFormat/Mac/DocxFormatLib.xcodeproj/project.pbxproj
View file @ 6150b093
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
17C1FB961ACC4250006B99B3 /* oMathContent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0801AC4262700F28F8B /* oMathContent.cpp */; }; 17C1FB961ACC4250006B99B3 /* oMathContent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0801AC4262700F28F8B /* oMathContent.cpp */; };
17C1FB971ACC4250006B99B3 /* Table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0741AC4262700F28F8B /* Table.cpp */; }; 17C1FB971ACC4250006B99B3 /* Table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0741AC4262700F28F8B /* Table.cpp */; };
17C1FB981ACC4250006B99B3 /* TableProperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0761AC4262700F28F8B /* TableProperty.cpp */; }; 17C1FB981ACC4250006B99B3 /* TableProperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0761AC4262700F28F8B /* TableProperty.cpp */; };
17C1FB991ACC4250006B99B3 /* pole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6B3B61AC4289200F28F8B /* pole.cpp */; };
17C1FB9A1ACC4250006B99B3 /* Bdo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A05B1AC4262700F28F8B /* Bdo.cpp */; }; 17C1FB9A1ACC4250006B99B3 /* Bdo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A05B1AC4262700F28F8B /* Bdo.cpp */; };
17C1FB9B1ACC4250006B99B3 /* Annotations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0581AC4262700F28F8B /* Annotations.cpp */; }; 17C1FB9B1ACC4250006B99B3 /* Annotations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0581AC4262700F28F8B /* Annotations.cpp */; };
17C1FB9C1ACC4250006B99B3 /* FileFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0491AC4262700F28F8B /* FileFactory.cpp */; }; 17C1FB9C1ACC4250006B99B3 /* FileFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0491AC4262700F28F8B /* FileFactory.cpp */; };
...@@ -124,7 +123,6 @@ ...@@ -124,7 +123,6 @@
17C1FC081ACC4250006B99B3 /* XmlSimple.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6B1F01AC4263900F28F8B /* XmlSimple.h */; }; 17C1FC081ACC4250006B99B3 /* XmlSimple.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6B1F01AC4263900F28F8B /* XmlSimple.h */; };
17C1FC091ACC4250006B99B3 /* Settings.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A12D1AC4262800F28F8B /* Settings.h */; }; 17C1FC091ACC4250006B99B3 /* Settings.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A12D1AC4262800F28F8B /* Settings.h */; };
17C1FC0A1ACC4250006B99B3 /* Sdt.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A06E1AC4262700F28F8B /* Sdt.h */; }; 17C1FC0A1ACC4250006B99B3 /* Sdt.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A06E1AC4262700F28F8B /* Sdt.h */; };
17C1FC0B1ACC4250006B99B3 /* pole.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6B3B71AC4289200F28F8B /* pole.h */; };
17C1FC0C1ACC4250006B99B3 /* Unit.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A0961AC4262700F28F8B /* Unit.h */; }; 17C1FC0C1ACC4250006B99B3 /* Unit.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A0961AC4262700F28F8B /* Unit.h */; };
17C1FC0D1ACC4250006B99B3 /* Cols.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A1881AC4262800F28F8B /* Cols.h */; }; 17C1FC0D1ACC4250006B99B3 /* Cols.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A1881AC4262800F28F8B /* Cols.h */; };
17C1FC0E1ACC4250006B99B3 /* BookViews.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A1801AC4262800F28F8B /* BookViews.h */; }; 17C1FC0E1ACC4250006B99B3 /* BookViews.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6A1801AC4262800F28F8B /* BookViews.h */; };
...@@ -522,8 +520,6 @@ ...@@ -522,8 +520,6 @@
17E6B3B01AC4263A00F28F8B /* xmlutils.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6B1F11AC4263900F28F8B /* xmlutils.h */; }; 17E6B3B01AC4263A00F28F8B /* xmlutils.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6B1F11AC4263900F28F8B /* xmlutils.h */; };
17E6B3B31AC4279400F28F8B /* docxformatlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6B3B11AC4279400F28F8B /* docxformatlib.cpp */; }; 17E6B3B31AC4279400F28F8B /* docxformatlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6B3B11AC4279400F28F8B /* docxformatlib.cpp */; };
17E6B3B41AC4279400F28F8B /* docxformatlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6B3B21AC4279400F28F8B /* docxformatlib.h */; }; 17E6B3B41AC4279400F28F8B /* docxformatlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6B3B21AC4279400F28F8B /* docxformatlib.h */; };
17E6B3B81AC4289200F28F8B /* pole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6B3B61AC4289200F28F8B /* pole.cpp */; };
17E6B3B91AC4289200F28F8B /* pole.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6B3B71AC4289200F28F8B /* pole.h */; };
17E6B3C51AC43E6A00F28F8B /* MathString.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6B3C41AC43E6A00F28F8B /* MathString.h */; }; 17E6B3C51AC43E6A00F28F8B /* MathString.h in Headers */ = {isa = PBXBuildFile; fileRef = 17E6B3C41AC43E6A00F28F8B /* MathString.h */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
...@@ -845,8 +841,6 @@ ...@@ -845,8 +841,6 @@
17E6B1F11AC4263900F28F8B /* xmlutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlutils.h; sourceTree = "<group>"; }; 17E6B1F11AC4263900F28F8B /* xmlutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlutils.h; sourceTree = "<group>"; };
17E6B3B11AC4279400F28F8B /* docxformatlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = docxformatlib.cpp; path = ../../DocxFormatLib/docxformatlib.cpp; sourceTree = "<group>"; }; 17E6B3B11AC4279400F28F8B /* docxformatlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = docxformatlib.cpp; path = ../../DocxFormatLib/docxformatlib.cpp; sourceTree = "<group>"; };
17E6B3B21AC4279400F28F8B /* docxformatlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = docxformatlib.h; path = ../../DocxFormatLib/docxformatlib.h; sourceTree = "<group>"; }; 17E6B3B21AC4279400F28F8B /* docxformatlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = docxformatlib.h; path = ../../DocxFormatLib/docxformatlib.h; sourceTree = "<group>"; };
17E6B3B61AC4289200F28F8B /* pole.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pole.cpp; path = ../../../../ASCOfficeDocFile/pole/pole.cpp; sourceTree = "<group>"; };
17E6B3B71AC4289200F28F8B /* pole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pole.h; path = ../../../../ASCOfficeDocFile/pole/pole.h; sourceTree = "<group>"; };
17E6B3BB1AC4298500F28F8B /* Array.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Array.h; sourceTree = "<group>"; }; 17E6B3BB1AC4298500F28F8B /* Array.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Array.h; sourceTree = "<group>"; };
17E6B3BC1AC4298500F28F8B /* ASCVariant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASCVariant.h; sourceTree = "<group>"; }; 17E6B3BC1AC4298500F28F8B /* ASCVariant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASCVariant.h; sourceTree = "<group>"; };
17E6B3BD1AC4298500F28F8B /* Base64.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; }; 17E6B3BD1AC4298500F28F8B /* Base64.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; };
...@@ -920,7 +914,6 @@ ...@@ -920,7 +914,6 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
17E6B3BA1AC4298500F28F8B /* common */, 17E6B3BA1AC4298500F28F8B /* common */,
17E6B3B51AC4288900F28F8B /* pole */,
17E69FEB1AC4262700F28F8B /* Source */, 17E69FEB1AC4262700F28F8B /* Source */,
17E6B3B21AC4279400F28F8B /* docxformatlib.h */, 17E6B3B21AC4279400F28F8B /* docxformatlib.h */,
17E6B3B11AC4279400F28F8B /* docxformatlib.cpp */, 17E6B3B11AC4279400F28F8B /* docxformatlib.cpp */,
...@@ -1429,15 +1422,6 @@ ...@@ -1429,15 +1422,6 @@
path = libxml2; path = libxml2;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
17E6B3B51AC4288900F28F8B /* pole */ = {
isa = PBXGroup;
children = (
17E6B3B61AC4289200F28F8B /* pole.cpp */,
17E6B3B71AC4289200F28F8B /* pole.h */,
);
name = pole;
sourceTree = "<group>";
};
17E6B3BA1AC4298500F28F8B /* common */ = { 17E6B3BA1AC4298500F28F8B /* common */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -1527,7 +1511,6 @@ ...@@ -1527,7 +1511,6 @@
17C1FC081ACC4250006B99B3 /* XmlSimple.h in Headers */, 17C1FC081ACC4250006B99B3 /* XmlSimple.h in Headers */,
17C1FC091ACC4250006B99B3 /* Settings.h in Headers */, 17C1FC091ACC4250006B99B3 /* Settings.h in Headers */,
17C1FC0A1ACC4250006B99B3 /* Sdt.h in Headers */, 17C1FC0A1ACC4250006B99B3 /* Sdt.h in Headers */,
17C1FC0B1ACC4250006B99B3 /* pole.h in Headers */,
17C1FC0C1ACC4250006B99B3 /* Unit.h in Headers */, 17C1FC0C1ACC4250006B99B3 /* Unit.h in Headers */,
17C1FC0D1ACC4250006B99B3 /* Cols.h in Headers */, 17C1FC0D1ACC4250006B99B3 /* Cols.h in Headers */,
17C1FC0E1ACC4250006B99B3 /* BookViews.h in Headers */, 17C1FC0E1ACC4250006B99B3 /* BookViews.h in Headers */,
...@@ -1743,7 +1726,6 @@ ...@@ -1743,7 +1726,6 @@
17E6B3AF1AC4263A00F28F8B /* XmlSimple.h in Headers */, 17E6B3AF1AC4263A00F28F8B /* XmlSimple.h in Headers */,
17E6B2A51AC4263900F28F8B /* Settings.h in Headers */, 17E6B2A51AC4263900F28F8B /* Settings.h in Headers */,
17E6B26B1AC4263900F28F8B /* Sdt.h in Headers */, 17E6B26B1AC4263900F28F8B /* Sdt.h in Headers */,
17E6B3B91AC4289200F28F8B /* pole.h in Headers */,
17E6B28F1AC4263900F28F8B /* Unit.h in Headers */, 17E6B28F1AC4263900F28F8B /* Unit.h in Headers */,
17E6B2EA1AC4263900F28F8B /* Cols.h in Headers */, 17E6B2EA1AC4263900F28F8B /* Cols.h in Headers */,
17E6B2E31AC4263900F28F8B /* BookViews.h in Headers */, 17E6B2E31AC4263900F28F8B /* BookViews.h in Headers */,
...@@ -2012,7 +1994,6 @@ ...@@ -2012,7 +1994,6 @@
17C1FB961ACC4250006B99B3 /* oMathContent.cpp in Sources */, 17C1FB961ACC4250006B99B3 /* oMathContent.cpp in Sources */,
17C1FB971ACC4250006B99B3 /* Table.cpp in Sources */, 17C1FB971ACC4250006B99B3 /* Table.cpp in Sources */,
17C1FB981ACC4250006B99B3 /* TableProperty.cpp in Sources */, 17C1FB981ACC4250006B99B3 /* TableProperty.cpp in Sources */,
17C1FB991ACC4250006B99B3 /* pole.cpp in Sources */,
17C1FB9A1ACC4250006B99B3 /* Bdo.cpp in Sources */, 17C1FB9A1ACC4250006B99B3 /* Bdo.cpp in Sources */,
17C1FB9B1ACC4250006B99B3 /* Annotations.cpp in Sources */, 17C1FB9B1ACC4250006B99B3 /* Annotations.cpp in Sources */,
17C1FB9C1ACC4250006B99B3 /* FileFactory.cpp in Sources */, 17C1FB9C1ACC4250006B99B3 /* FileFactory.cpp in Sources */,
...@@ -2067,7 +2048,6 @@ ...@@ -2067,7 +2048,6 @@
17E6B27C1AC4263900F28F8B /* oMathContent.cpp in Sources */, 17E6B27C1AC4263900F28F8B /* oMathContent.cpp in Sources */,
17E6B2711AC4263900F28F8B /* Table.cpp in Sources */, 17E6B2711AC4263900F28F8B /* Table.cpp in Sources */,
17E6B2731AC4263900F28F8B /* TableProperty.cpp in Sources */, 17E6B2731AC4263900F28F8B /* TableProperty.cpp in Sources */,
17E6B3B81AC4289200F28F8B /* pole.cpp in Sources */,
17E6B2581AC4263900F28F8B /* Bdo.cpp in Sources */, 17E6B2581AC4263900F28F8B /* Bdo.cpp in Sources */,
17E6B2551AC4263900F28F8B /* Annotations.cpp in Sources */, 17E6B2551AC4263900F28F8B /* Annotations.cpp in Sources */,
17E6B2471AC4263900F28F8B /* FileFactory.cpp in Sources */, 17E6B2471AC4263900F28F8B /* FileFactory.cpp in Sources */,
......
DesktopEditor/common/Directory.h
View file @ 6150b093
...@@ -89,7 +89,7 @@ namespace NSDirectory ...@@ -89,7 +89,7 @@ namespace NSDirectory
delete [] pUtf8; delete [] pUtf8;
#endif #endif
#ifdef MAC #if defined(MAC) || defined (_IOS)
BYTE* pUtf8 = NULL; BYTE* pUtf8 = NULL;
LONG lLen = 0; LONG lLen = 0;
NSFile::CUtf8Converter::GetUtf8StringFromUnicode(strDirectory.c_str(), strDirectory.length(), pUtf8, lLen, false); NSFile::CUtf8Converter::GetUtf8StringFromUnicode(strDirectory.c_str(), strDirectory.length(), pUtf8, lLen, false);
...@@ -119,42 +119,6 @@ namespace NSDirectory ...@@ -119,42 +119,6 @@ namespace NSDirectory
delete [] pUtf8; delete [] pUtf8;
return; return;
#endif #endif
//#if 0
// // нормально работает и линукс версия
#ifdef _IOS
BYTE* pUtf8 = NULL;
LONG lLen = 0;
NSFile::CUtf8Converter::GetUtf8StringFromUnicode(strDirectory.c_str(), strDirectory.length(), pUtf8, lLen, false);
DIR *dp;
struct dirent *dirp;
if((dp = opendir((char*)pUtf8)) != NULL)
{
while ((dirp = readdir(dp)) != NULL)
{
if(DT_REG == dirp->d_type)
{
std::wstring sName = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)dirp->d_name, strlen(dirp->d_name));
oArray.Add(strDirectory + L"/" + sName);
}
if (bIsRecursion && DT_DIR == dirp->d_type)
{
if(dirp->d_name[0] != '.')
{
std::wstring sName = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)dirp->d_name, strlen(dirp->d_name));
GetFiles2(strDirectory + L"/" + sName, oArray, bIsRecursion);
}
}
}
closedir(dp);
}
delete [] pUtf8;
return;
//return GetFiles2_ios(strDirectory, oArray, bIsRecursion);
#endif
//#endif
} }
static CArray<std::wstring> GetFiles(std::wstring strDirectory, bool bIsRecursion = false) static CArray<std::wstring> GetFiles(std::wstring strDirectory, bool bIsRecursion = false)
......
DesktopEditor/fontengine/FontFile.cpp
View file @ 6150b093
...@@ -1620,4 +1620,4 @@ CFontPath* CFontFile::GetGlyphPath(int nCode) ...@@ -1620,4 +1620,4 @@ CFontPath* CFontFile::GetGlyphPath(int nCode)
FT_Done_Glyph( oGlyph ); FT_Done_Glyph( oGlyph );
return oGlyphPath.pPath; return oGlyphPath.pPath;
} };
\ No newline at end of file \ No newline at end of file
DesktopEditor/mac_build/fontengine/fontengine.xcodeproj/project.pbxproj
View file @ 6150b093
...@@ -320,6 +320,7 @@ ...@@ -320,6 +320,7 @@
UNICODE, UNICODE,
_UNICODE, _UNICODE,
FT2_BUILD_LIBRARY, FT2_BUILD_LIBRARY,
_IOS,
); );
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
...@@ -342,6 +343,7 @@ ...@@ -342,6 +343,7 @@
UNICODE, UNICODE,
_UNICODE, _UNICODE,
FT2_BUILD_LIBRARY, FT2_BUILD_LIBRARY,
_IOS,
); );
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
......
DesktopEditor/mac_build/metafile/metafile.xcodeproj/project.pbxproj 0 → 100644
View file @ 6150b093
This source diff could not be displayed because it is too large. You can view the blob instead.
DesktopEditor/mac_build/metafile/metafile.xcodeproj/project.xcworkspace/contents.xcworkspacedata 0 → 100644
View file @ 6150b093
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:metafile.xcodeproj">
</FileRef>
</Workspace>
DesktopEditor/mac_build/metafile/metafile.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad/xcschemes/metafile.xcscheme 0 → 100644
View file @ 6150b093
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0630"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "17A762B91B0F35320046BC0B"
BuildableName = "libmetafile.a"
BlueprintName = "metafile"
ReferencedContainer = "container:metafile.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "17A762C41B0F35320046BC0B"
BuildableName = "metafileTests.xctest"
BlueprintName = "metafileTests"
ReferencedContainer = "container:metafile.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "17A762C41B0F35320046BC0B"
BuildableName = "metafileTests.xctest"
BlueprintName = "metafileTests"
ReferencedContainer = "container:metafile.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "17A762B91B0F35320046BC0B"
BuildableName = "libmetafile.a"
BlueprintName = "metafile"
ReferencedContainer = "container:metafile.xcodeproj">
</BuildableReference>
</MacroExpansion>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "17A762B91B0F35320046BC0B"
BuildableName = "libmetafile.a"
BlueprintName = "metafile"
ReferencedContainer = "container:metafile.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "17A762B91B0F35320046BC0B"
BuildableName = "libmetafile.a"
BlueprintName = "metafile"
ReferencedContainer = "container:metafile.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
DesktopEditor/mac_build/metafile/metafile.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad/xcschemes/metafile_ios.xcscheme 0 → 100644
View file @ 6150b093
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0630"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "17A762D41B0F355E0046BC0B"
BuildableName = "libmetafile_ios.a"
BlueprintName = "metafile_ios"
ReferencedContainer = "container:metafile.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "17A762D41B0F355E0046BC0B"
BuildableName = "libmetafile_ios.a"
BlueprintName = "metafile_ios"
ReferencedContainer = "container:metafile.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "17A762D41B0F355E0046BC0B"
BuildableName = "libmetafile_ios.a"
BlueprintName = "metafile_ios"
ReferencedContainer = "container:metafile.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
DesktopEditor/mac_build/metafile/metafile.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad/xcschemes/xcschememanagement.plist 0 → 100644
View file @ 6150b093
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>metafile.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>metafile_ios.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>17A762B91B0F35320046BC0B</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>17A762C41B0F35320046BC0B</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>17A762D41B0F355E0046BC0B</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
DesktopEditor/mac_build/raster/raster.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad/xcschemes/xcschememanagement.plist
View file @ 6150b093
...@@ -9,11 +9,6 @@ ...@@ -9,11 +9,6 @@
<key>orderHint</key> <key>orderHint</key>
<integer>16</integer> <integer>16</integer>
</dict> </dict>
<key>raster_ios.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>25</integer>
</dict>
</dict> </dict>
<key>SuppressBuildableAutocreation</key> <key>SuppressBuildableAutocreation</key>
<dict> <dict>
......
DesktopEditor/raster/JBig2/source/LeptonLib/readfile.cpp
View file @ 6150b093
...@@ -65,12 +65,27 @@ static const char *FILE_ZIP = "/tmp/junkout_zip.tif"; ...@@ -65,12 +65,27 @@ static const char *FILE_ZIP = "/tmp/junkout_zip.tif";
static const char *FILE_TIFF = "/tmp/junkout.tif"; static const char *FILE_TIFF = "/tmp/junkout.tif";
static const char *FILE_JPG = "/tmp/junkout.jpg"; static const char *FILE_JPG = "/tmp/junkout.jpg";
/* I found these from the source code to the unix file */ /* I found these from the source code to the unix file */
/* command. man 1 file */ /* command. man 1 file */
#if defined(__APPLE__) // compile on xcode
static const char JP2K_CODESTREAM[4] = {
(char)0xff, (char)0x4f, (char)0xff, (char)0x51
};
static const char JP2K_IMAGE_DATA[12] = {
(char)0x00, (char)0x00, (char)0x00, (char)0x0C,
(char)0x6A, (char)0x50, (char)0x20, (char)0x20,
(char)0x0D, (char)0x0A, (char)0x87, (char)0x0A
};
#else
static const char JP2K_CODESTREAM[4] = { 0xff, 0x4f, 0xff, 0x51 }; static const char JP2K_CODESTREAM[4] = { 0xff, 0x4f, 0xff, 0x51 };
static const char JP2K_IMAGE_DATA[12] = { 0x00, 0x00, 0x00, 0x0C, static const char JP2K_IMAGE_DATA[12] = { 0x00, 0x00, 0x00, 0x0C,
0x6A, 0x50, 0x20, 0x20, 0x6A, 0x50, 0x20, 0x20,
0x0D, 0x0A, 0x87, 0x0A }; 0x0D, 0x0A, 0x87, 0x0A };
#endif
/*---------------------------------------------------------------------* /*---------------------------------------------------------------------*
* Top-level functions for reading images from file * * Top-level functions for reading images from file *
......
DesktopEditor/raster/Metafile/Wmf/WmfFile.h
View file @ 6150b093
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#include "WmfTypes.h" #include "WmfTypes.h"
#include "WmfPlayer.h" #include "WmfPlayer.h"
#include <cmath>
#undef DrawText #undef DrawText
namespace MetaFile namespace MetaFile
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7