Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
onlyoffice_core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
onlyoffice_core
Commits
b3384f14
Commit
b3384f14
authored
Jul 05, 2017
by
Alexey.Musinov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chart-settings seralize
parent
f501bf79
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
8 deletions
+18
-8
DesktopEditor/Word_Api/Editor_Api.h
DesktopEditor/Word_Api/Editor_Api.h
+4
-4
DesktopEditor/ios_projects/PdfWriter/PdfWriter.xcodeproj/project.pbxproj
...os_projects/PdfWriter/PdfWriter.xcodeproj/project.pbxproj
+7
-1
UnicodeConverter/icubuilds/mac/icu/icu.xcodeproj/project.pbxproj
...Converter/icubuilds/mac/icu/icu.xcodeproj/project.pbxproj
+7
-3
No files found.
DesktopEditor/Word_Api/Editor_Api.h
View file @
b3384f14
...
...
@@ -1087,9 +1087,9 @@ namespace NSEditorApi
class
CAscCatAxisSettings
{
private:
js_wrapper
<
double
>
m_dInter
n
alBetweenTick
;
js_wrapper
<
double
>
m_dInter
v
alBetweenTick
;
js_wrapper
<
int
>
m_nIntervalBetweenLabelsRule
;
// c_oAscBetweenLabelsRule_
js_wrapper
<
double
>
m_dInter
n
alBetweenLabels
;
js_wrapper
<
double
>
m_dInter
v
alBetweenLabels
;
js_wrapper
<
bool
>
m_bInvertCatOrder
;
js_wrapper
<
double
>
m_dLabelsAxisDistance
;
...
...
@@ -1114,9 +1114,9 @@ namespace NSEditorApi
{
}
LINK_PROPERTY_DOUBLE_JS
(
Inter
n
alBetweenTick
)
LINK_PROPERTY_DOUBLE_JS
(
Inter
v
alBetweenTick
)
LINK_PROPERTY_INT_JS
(
IntervalBetweenLabelsRule
)
LINK_PROPERTY_DOUBLE_JS
(
Inter
n
alBetweenLabels
)
LINK_PROPERTY_DOUBLE_JS
(
Inter
v
alBetweenLabels
)
LINK_PROPERTY_BOOL_JS
(
InvertCatOrder
)
LINK_PROPERTY_DOUBLE_JS
(
LabelsAxisDistance
)
...
...
DesktopEditor/ios_projects/PdfWriter/PdfWriter.xcodeproj/project.pbxproj
View file @
b3384f14
...
...
@@ -251,7 +251,7 @@
7C560F671AA71A91000E5860
/* Project object */
=
{
isa
=
PBXProject
;
attributes
=
{
LastUpgradeCheck
=
0
70
0
;
LastUpgradeCheck
=
0
83
0
;
ORGANIZATIONNAME
=
"Ascensio System"
;
TargetAttributes
=
{
7C560F6E1AA71A91000E5860
=
{
...
...
@@ -346,8 +346,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE
=
YES_ERROR
;
CLANG_WARN_EMPTY_BODY
=
YES
;
CLANG_WARN_ENUM_CONVERSION
=
YES
;
CLANG_WARN_INFINITE_RECURSION
=
YES
;
CLANG_WARN_INT_CONVERSION
=
YES
;
CLANG_WARN_OBJC_ROOT_CLASS
=
YES_ERROR
;
CLANG_WARN_SUSPICIOUS_MOVE
=
YES
;
CLANG_WARN_UNREACHABLE_CODE
=
YES
;
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
COPY_PHASE_STRIP
=
NO
;
...
...
@@ -355,6 +357,7 @@
ENABLE_TESTABILITY
=
YES
;
GCC_C_LANGUAGE_STANDARD
=
gnu99
;
GCC_DYNAMIC_NO_PIC
=
NO
;
GCC_NO_COMMON_BLOCKS
=
YES
;
GCC_OPTIMIZATION_LEVEL
=
0
;
GCC_PREPROCESSOR_DEFINITIONS
=
(
"DEBUG=1"
,
...
...
@@ -388,14 +391,17 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE
=
YES_ERROR
;
CLANG_WARN_EMPTY_BODY
=
YES
;
CLANG_WARN_ENUM_CONVERSION
=
YES
;
CLANG_WARN_INFINITE_RECURSION
=
YES
;
CLANG_WARN_INT_CONVERSION
=
YES
;
CLANG_WARN_OBJC_ROOT_CLASS
=
YES_ERROR
;
CLANG_WARN_SUSPICIOUS_MOVE
=
YES
;
CLANG_WARN_UNREACHABLE_CODE
=
YES
;
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
COPY_PHASE_STRIP
=
YES
;
ENABLE_NS_ASSERTIONS
=
NO
;
ENABLE_STRICT_OBJC_MSGSEND
=
YES
;
GCC_C_LANGUAGE_STANDARD
=
gnu99
;
GCC_NO_COMMON_BLOCKS
=
YES
;
GCC_WARN_64_TO_32_BIT_CONVERSION
=
YES
;
GCC_WARN_ABOUT_RETURN_TYPE
=
YES_ERROR
;
GCC_WARN_UNDECLARED_SELECTOR
=
YES
;
...
...
UnicodeConverter/icubuilds/mac/icu/icu.xcodeproj/project.pbxproj
View file @
b3384f14
...
...
@@ -1790,7 +1790,7 @@
173241781BBECF8400E67992
/* Project object */
=
{
isa
=
PBXProject
;
attributes
=
{
LastUpgradeCheck
=
0
70
0
;
LastUpgradeCheck
=
0
83
0
;
ORGANIZATIONNAME
=
"Ascensio System SIA"
;
TargetAttributes
=
{
1732417F1BBECF8400E67992
=
{
...
...
@@ -2228,8 +2228,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE
=
YES_ERROR
;
CLANG_WARN_EMPTY_BODY
=
YES
;
CLANG_WARN_ENUM_CONVERSION
=
YES
;
CLANG_WARN_INFINITE_RECURSION
=
YES
;
CLANG_WARN_INT_CONVERSION
=
YES
;
CLANG_WARN_OBJC_ROOT_CLASS
=
YES_ERROR
;
CLANG_WARN_SUSPICIOUS_MOVE
=
YES
;
CLANG_WARN_UNREACHABLE_CODE
=
YES
;
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
COPY_PHASE_STRIP
=
NO
;
...
...
@@ -2270,8 +2272,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE
=
YES_ERROR
;
CLANG_WARN_EMPTY_BODY
=
YES
;
CLANG_WARN_ENUM_CONVERSION
=
YES
;
CLANG_WARN_INFINITE_RECURSION
=
YES
;
CLANG_WARN_INT_CONVERSION
=
YES
;
CLANG_WARN_OBJC_ROOT_CLASS
=
YES_ERROR
;
CLANG_WARN_SUSPICIOUS_MOVE
=
YES
;
CLANG_WARN_UNREACHABLE_CODE
=
YES
;
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
COPY_PHASE_STRIP
=
NO
;
...
...
@@ -2297,7 +2301,7 @@
isa
=
XCBuildConfiguration
;
buildSettings
=
{
CLANG_CXX_LANGUAGE_STANDARD
=
"gnu++0x"
;
CLANG_CXX_LIBRARY
=
"
libstdc++
"
;
CLANG_CXX_LIBRARY
=
"
compiler-default
"
;
ENABLE_BITCODE
=
NO
;
EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES
=
"*.nib *.lproj *.framework *.gch *.xcode* *.xcassets (*) .DS_Store CVS .svn .git .hg *.pbproj *.pbxproj"
;
GCC_PREPROCESSOR_DEFINITIONS
=
(
...
...
@@ -2327,7 +2331,7 @@
isa
=
XCBuildConfiguration
;
buildSettings
=
{
CLANG_CXX_LANGUAGE_STANDARD
=
"gnu++0x"
;
CLANG_CXX_LIBRARY
=
"
libstdc++
"
;
CLANG_CXX_LIBRARY
=
"
compiler-default
"
;
ENABLE_BITCODE
=
NO
;
EXCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES
=
"*.nib *.lproj *.framework *.gch *.xcode* *.xcassets (*) .DS_Store CVS .svn .git .hg *.pbproj *.pbxproj"
;
GCC_PREPROCESSOR_DEFINITIONS
=
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment