Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop

* 'develop' of https://github.com/ONLYOFFICE/core: x2t version up for bug 34597 fix bug 34603 for bug 34498
ios collaboration
2026-04-07 13:55:33 +08:00 · 2017-03-31 17:57:44 +03:00 · 2017-03-31 17:57:35 +03:00 · 2017-03-31 08:17:46 +03:00
2 changed files with 3 additions and 1 deletions
--- a/DesktopEditor/Word_Api/Editor_Api.h
+++ b/DesktopEditor/Word_Api/Editor_Api.h
@ -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)
    };
--- a/X2tConverter/build/Qt/X2tConverter.pri
+++ b/X2tConverter/build/Qt/X2tConverter.pri
@ -7,7 +7,7 @@
 QT       -= core
 QT       -= gui

-VERSION = 2.0.3.447
+VERSION = 2.0.3.448
 DEFINES += INTVER=$$VERSION

 TARGET = x2t
Author	SHA1	Message	Date
Alexey.Musinov	d27b7b2f56	Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop * 'develop' of https://github.com/ONLYOFFICE/core: x2t version up for bug 34597 fix bug 34603 for bug 34498	2017-03-31 17:57:44 +03:00
Alexey.Musinov	1dbf3e83ad	ios collaboration	2017-03-31 17:57:35 +03:00
ElenaSubbotina	4a7d40d3fb	x2t version up	2017-03-31 08:17:46 +03:00