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
30f07d3a
Commit
30f07d3a
authored
Mar 31, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://github.com/ONLYOFFICE/core
into develop
parents
a5f70c97
d27b7b2f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
DesktopEditor/Word_Api/Editor_Api.h
DesktopEditor/Word_Api/Editor_Api.h
+2
-0
No files found.
DesktopEditor/Word_Api/Editor_Api.h
View file @
30f07d3a
...
...
@@ -531,6 +531,7 @@ namespace NSEditorApi
private:
js_wrapper
<
CAscImageRaw
>
m_oRaw
;
js_wrapper
<
std
::
wstring
>
m_sPath
;
js_wrapper
<
std
::
wstring
>
m_sUploadPath
;
js_wrapper
<
std
::
string
>
m_sBase64
;
js_wrapper
<
CAscBinaryData
>
m_oBinaryData
;
...
...
@@ -544,6 +545,7 @@ namespace NSEditorApi
LINK_PROPERTY_OBJECT_JS
(
CAscImageRaw
,
Raw
)
LINK_PROPERTY_STRING_JS
(
Path
)
LINK_PROPERTY_STRING_JS
(
UploadPath
)
LINK_PROPERTY_STRINGA_JS
(
Base64
)
LINK_PROPERTY_OBJECT_JS
(
CAscBinaryData
,
BinaryData
)
};
...
...
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