Skip to content

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

[ios] update 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@66406 954022d7-b5bf-4e40-9824-e11837661b57
parent 6f8228a7
Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 19 deletions
Common/DocxFormat/Mac/DocxFormatLib.xcodeproj/project.pbxproj
View file @ 4f2eba7c
...@@ -7,16 +7,16 @@ ...@@ -7,16 +7,16 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
173241491BBEC90000E67992 /* pole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 173241431BBEC90000E67992 /* pole.cpp */; settings = {ASSET_TAGS = (); }; }; 173241491BBEC90000E67992 /* pole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 173241431BBEC90000E67992 /* pole.cpp */; };
1732414A1BBEC90000E67992 /* pole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 173241431BBEC90000E67992 /* pole.cpp */; settings = {ASSET_TAGS = (); }; }; 1732414A1BBEC90000E67992 /* pole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 173241431BBEC90000E67992 /* pole.cpp */; };
1732414B1BBEC90000E67992 /* pole.h in Headers */ = {isa = PBXBuildFile; fileRef = 173241441BBEC90000E67992 /* pole.h */; settings = {ASSET_TAGS = (); }; }; 1732414B1BBEC90000E67992 /* pole.h in Headers */ = {isa = PBXBuildFile; fileRef = 173241441BBEC90000E67992 /* pole.h */; };
1732414C1BBEC90000E67992 /* pole.h in Headers */ = {isa = PBXBuildFile; fileRef = 173241441BBEC90000E67992 /* pole.h */; settings = {ASSET_TAGS = (); }; }; 1732414C1BBEC90000E67992 /* pole.h in Headers */ = {isa = PBXBuildFile; fileRef = 173241441BBEC90000E67992 /* pole.h */; };
1732463C1BBEDC2C00E67992 /* UnicodeConverter_Encodings.h in Headers */ = {isa = PBXBuildFile; fileRef = 173246391BBEDC2C00E67992 /* UnicodeConverter_Encodings.h */; settings = {ASSET_TAGS = (); }; }; 1732463C1BBEDC2C00E67992 /* UnicodeConverter_Encodings.h in Headers */ = {isa = PBXBuildFile; fileRef = 173246391BBEDC2C00E67992 /* UnicodeConverter_Encodings.h */; };
1732463D1BBEDC2C00E67992 /* UnicodeConverter_Encodings.h in Headers */ = {isa = PBXBuildFile; fileRef = 173246391BBEDC2C00E67992 /* UnicodeConverter_Encodings.h */; settings = {ASSET_TAGS = (); }; }; 1732463D1BBEDC2C00E67992 /* UnicodeConverter_Encodings.h in Headers */ = {isa = PBXBuildFile; fileRef = 173246391BBEDC2C00E67992 /* UnicodeConverter_Encodings.h */; };
1732463E1BBEDC2C00E67992 /* UnicodeConverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1732463A1BBEDC2C00E67992 /* UnicodeConverter.cpp */; settings = {ASSET_TAGS = (); }; }; 1732463E1BBEDC2C00E67992 /* UnicodeConverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1732463A1BBEDC2C00E67992 /* UnicodeConverter.cpp */; };
1732463F1BBEDC2C00E67992 /* UnicodeConverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1732463A1BBEDC2C00E67992 /* UnicodeConverter.cpp */; settings = {ASSET_TAGS = (); }; }; 1732463F1BBEDC2C00E67992 /* UnicodeConverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1732463A1BBEDC2C00E67992 /* UnicodeConverter.cpp */; };
173246401BBEDC2C00E67992 /* UnicodeConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 1732463B1BBEDC2C00E67992 /* UnicodeConverter.h */; settings = {ASSET_TAGS = (); }; }; 173246401BBEDC2C00E67992 /* UnicodeConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 1732463B1BBEDC2C00E67992 /* UnicodeConverter.h */; };
173246411BBEDC2C00E67992 /* UnicodeConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 1732463B1BBEDC2C00E67992 /* UnicodeConverter.h */; settings = {ASSET_TAGS = (); }; }; 173246411BBEDC2C00E67992 /* UnicodeConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 1732463B1BBEDC2C00E67992 /* UnicodeConverter.h */; };
17C102621ACC5114006B99B3 /* libPPTXFormatLib_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C1FE8E1ACC42B1006B99B3 /* libPPTXFormatLib_ios.a */; }; 17C102621ACC5114006B99B3 /* libPPTXFormatLib_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C1FE8E1ACC42B1006B99B3 /* libPPTXFormatLib_ios.a */; };
17C102631ACC511A006B99B3 /* libASCOfficeUtilsLib_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C1FC9F1ACC4251006B99B3 /* libASCOfficeUtilsLib_ios.a */; }; 17C102631ACC511A006B99B3 /* libASCOfficeUtilsLib_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C1FC9F1ACC4251006B99B3 /* libASCOfficeUtilsLib_ios.a */; };
17C1FB941ACC4250006B99B3 /* Hyperlink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0621AC4262700F28F8B /* Hyperlink.cpp */; }; 17C1FB941ACC4250006B99B3 /* Hyperlink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 17E6A0621AC4262700F28F8B /* Hyperlink.cpp */; };
...@@ -878,8 +878,8 @@ ...@@ -878,8 +878,8 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
173246391BBEDC2C00E67992 /* UnicodeConverter_Encodings.h */, 173246391BBEDC2C00E67992 /* UnicodeConverter_Encodings.h */,
1732463A1BBEDC2C00E67992 /* UnicodeConverter.cpp */,
1732463B1BBEDC2C00E67992 /* UnicodeConverter.h */, 1732463B1BBEDC2C00E67992 /* UnicodeConverter.h */,
1732463A1BBEDC2C00E67992 /* UnicodeConverter.cpp */,
); );
name = UnicodeConverter; name = UnicodeConverter;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1896,7 +1896,7 @@ ...@@ -1896,7 +1896,7 @@
17E69FD41AC4259800F28F8B /* Project object */ = { 17E69FD41AC4259800F28F8B /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0630; LastUpgradeCheck = 0710;
ORGANIZATIONNAME = "Ascensio System SIA"; ORGANIZATIONNAME = "Ascensio System SIA";
TargetAttributes = { TargetAttributes = {
17E69FDB1AC4259800F28F8B = { 17E69FDB1AC4259800F28F8B = {
...@@ -2126,9 +2126,10 @@ ...@@ -2126,9 +2126,10 @@
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
/usr/include/, /usr/include/,
/usr/include/libxml2/, /usr/include/libxml2/,
"$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/source/common", "$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/**",
"$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/source/i18n", "$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/common",
"$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/source/io", "$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/i18n",
"$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/io",
); );
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_NAME = DocxFormatLib_ios; PRODUCT_NAME = DocxFormatLib_ios;
...@@ -2160,9 +2161,10 @@ ...@@ -2160,9 +2161,10 @@
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
/usr/include/, /usr/include/,
/usr/include/libxml2/, /usr/include/libxml2/,
"$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/source/common", "$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/**",
"$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/source/i18n", "$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/common",
"$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/source/io", "$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/i18n",
"$(PROJECT_DIR)/../../../UnicodeConverter/icubuilds/mac/icu/icu/io",
); );
IPHONEOS_DEPLOYMENT_TARGET = 8.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_NAME = DocxFormatLib_ios; PRODUCT_NAME = DocxFormatLib_ios;
...@@ -2189,6 +2191,7 @@ ...@@ -2189,6 +2191,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
......
DesktopEditor/Word_Api/Editor_Api.h
View file @ 4f2eba7c
...@@ -2550,4 +2550,26 @@ namespace NSEditorApi ...@@ -2550,4 +2550,26 @@ namespace NSEditorApi
}; };
} }
namespace NSEditorApi
{
class CAscError : public IMenuEventDataBase
{
private:
int m_nId;
int m_nLevel;
public:
CAscError()
{
}
virtual ~CAscError()
{
}
LINK_PROPERTY_INT(Id)
LINK_PROPERTY_INT(Level)
};
}
#endif //_BUILD_EDITOR_API_CROSSPLATFORM_H_ #endif //_BUILD_EDITOR_API_CROSSPLATFORM_H_
DesktopEditor/Word_Api/Editor_Defines.h
View file @ 4f2eba7c
...@@ -650,4 +650,8 @@ ...@@ -650,4 +650,8 @@
#define ASC_MENU_EVENT_TYPE_USER_SCROLL_PAGE 300 #define ASC_MENU_EVENT_TYPE_USER_SCROLL_PAGE 300
#define ASC_MENU_EVENT_TYPE_USER_ZOOM 301 #define ASC_MENU_EVENT_TYPE_USER_ZOOM 301
#define ASC_MENU_EVENT_TYPE_INSERT_CHART 400
#define ASC_MENU_EVENT_TYPE_ERROR 500
#endif //_BUILD_EDITOR_DEFINES_CROSSPLATFORM_H_ #endif //_BUILD_EDITOR_DEFINES_CROSSPLATFORM_H_
DesktopEditor/common/Mac/ImageUtils_ios.h
View file @ 4f2eba7c
...@@ -47,7 +47,7 @@ namespace ImageUtils_IOS ...@@ -47,7 +47,7 @@ namespace ImageUtils_IOS
NO, NO,
renderingIntent); renderingIntent);
CGFloat scale = [[UIScreen mainScreen] scale]; CGFloat scale = 1;//[[UIScreen mainScreen] scale];
UIImage *ret = [UIImage imageWithCGImage:imageRef scale:scale orientation:UIImageOrientationDownMirrored]; UIImage *ret = [UIImage imageWithCGImage:imageRef scale:scale orientation:UIImageOrientationDownMirrored];
CGImageRelease(imageRef); CGImageRelease(imageRef);
CGColorSpaceRelease(colorSpaceRef); CGColorSpaceRelease(colorSpaceRef);
......
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