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

.gitignore

@@ -2,6 +2,19 @@ build/
 dictionaries/
 LicenceManager/
 Common/boost_1_58_0
+Common/3dParty/boost/boost_1_58_0
+Common/3dParty/icu/win_64
+Common/3dParty/icu/win_32
+Common/3dParty/icu/linux_64
+Common/3dParty/icu/linux_32
+Common/3dParty/icu/mac_64
+Common/3dParty/v8/v8
+Common/3dParty/v8/depot_tools
+Common/3dParty/v8/win_64
+Common/3dParty/v8/win_32
+Common/3dParty/v8/linux_64
+Common/3dParty/v8/linux_32
+Common/3dParty/v8/mac_64
 **/Release
 **/Debug
 *.user

ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/Transition.h

@@ -78,8 +78,6 @@ namespace PPTX
 			}
 
 			virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
-			{
-				if (_T("") != trSerialize.m_strNodeName)
 			{
 				pWriter->WriteBYTE(NSBinPptxRW::g_nodeAttributeStart);
 
@@ -90,6 +88,8 @@ namespace PPTX
 
 				pWriter->WriteBYTE(NSBinPptxRW::g_nodeAttributeEnd);
 
+				if (_T("") != trSerialize.m_strNodeName)
+				{
 					pWriter->WriteRecord1(0, trSerialize);
 				}
 			}
@@ -142,9 +142,6 @@ namespace PPTX
 
 			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
 			{
-				if (_T("") == trSerialize.m_strNodeName)
-					return;
-
 				pWriter->WriteString(_T("<mc:AlternateContent xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\">\
 <mc:Choice xmlns:p14=\"http://schemas.microsoft.com/office/powerpoint/2010/main\" Requires=\"p14\">"));
 

Common/3dParty/boost/build.bat

+SET SCRIPTPATH=%~dp0
+CD /D %~dp0
+
+SET platform=win_32
+if defined ProgramFiles(x86) (
+	SET platform=win_64
+)
+
+SET outputdir=%SCRIPTPATH%boost_1_58_0\build\%platform%
+echo "%outputdir%"
+
+CD "%SCRIPTPATH%\boost_1_58_0"
+call .\bootstrap.bat
+
+SET folder=build/%platform%
+if exist "%folder%" (
+	RMDIR "%folder%" /S /Q
+)
+
+if exist "stage" (
+	RMDIR "stage" /S /Q
+)
+
+md build
+md  %folder%
+md  %folder%\static
+md  %folder%\static_fpic
+md  %folder%\shared
+
+.\b2.exe --clean
+.\bjam.exe link=static --with-filesystem --with-system
+XCOPY stage\lib\* "%folder%\static\"
+
+.\b2.exe --clean
+.\bjam.exe link=static cxxflags=-fPIC --with-filesystem --with-system
+XCOPY stage\lib\* "%folder%\static_fpic\"
+
+.\b2.exe --clean
+.\bjam.exe link=shared --with-filesystem --with-system
+XCOPY stage\lib\* "%folder%\shared\"
+

Common/3dParty/boost/build.sh

+#!/bin/bash
+
+SCRIPT=$(readlink -f "$0")
+SCRIPTPATH=$(dirname "$SCRIPT")
+
+os=$(uname -s)
+platform=""
+
+case "$os" in
+  Linux*)   platform="linux" ;;
+  Darwin*)  platform="mac" ;; 
+  *)        exit ;;
+esac
+
+architecture=$(uname -m)
+arch=""
+
+case "$architecture" in
+  x86_64*)  arch="_64" ;;
+  *)        arch="_32" ;;
+esac
+
+outputdir="$SCRIPTPATH/boost_1_58_0/build/$platform$arch"
+echo $outputdir
+
+cd "$SCRIPTPATH/boost_1_58_0"
+./bootstrap.sh --with-libraries=filesystem,system
+
+folder="build/$platform$arch"
+if [ -d $folder ]; then
+  rm -R $folder
+fi
+
+stage="stage"
+if [ -d $stage ]; then
+  rm -R $stage
+fi
+
+mkdir -p "$folder"
+mkdir -p "$folder/static"
+mkdir -p "$folder/static_fpic"
+mkdir -p "$folder/shared"
+
+./b2 --clean
+./bjam link=static
+cp stage/lib/* "$folder/static/"
+
+./b2 --clean
+./bjam link=static cxxflags=-fPIC
+cp stage/lib/* "$folder/static_fpic/"
+
+./b2 --clean
+./bjam link=shared
+cp stage/lib/* "$folder/shared/"
+

Common/3dParty/boost/fetch.bat

+SET SCRIPTPATH=%~dp0
+CD /D %~dp0
+
+if exist "%SCRIPTPATH%boost_1_58_0.7z" (
+    echo "boost already downloaded"
+) else (
+    Powershell.exe Invoke-WebRequest -OutFile boost_1_58_0.7z http://freefr.dl.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.7z
+)
+
+SET UNSIP_PROGRAMM="C:\Program Files\7-Zip\7z.exe"
+SET UNSIP_PROGRAMM2="C:\Program Files (x86)\7-Zip\7z.exe"
+if exist %UNSIP_PROGRAMM2% (
+	SET UNSIP_PROGRAMM=%UNSIP_PROGRAMM2%
+)
+
+if exist "%SCRIPTPATH%boost_1_58_0/" (
+	echo "boost already extracted"
+) else (
+    call %UNSIP_PROGRAMM% x "%SCRIPTPATH%/boost_1_58_0.7z" -o"%SCRIPTPATH%/"
+)
+
+pause
\ No newline at end of file

Common/3dParty/boost/fetch.sh

+#!/bin/bash
+
+SCRIPT=$(readlink -f "$0")
+SCRIPTPATH=$(dirname "$SCRIPT")
+
+os=$(uname -s)
+platform=""
+
+case "$os" in
+  Linux*)   platform="linux" ;;
+  Darwin*)  platform="mac" ;; 
+  *)        exit ;;
+esac
+
+if [[ "$platform" == *"mac"* ]]
+then
+if [[ -f "$SCRIPTPATH/7zX_1.7.1.dmg" ]]
+then
+echo "7z already downloaded"
+else
+wget http://static.updatestar.net/dl/7zX/7zX_1.7.1.dmg
+fi
+fi
+
+if [[ -f "$SCRIPTPATH/boost_1_58_0.7z" ]]
+then
+echo "boost already downloaded"
+else
+wget http://freefr.dl.sourceforge.net/project/boost/boost/1.58.0/boost_1_58_0.7z
+fi
+
+if [ -d "$SCRIPTPATH/boost" ]; then
+echo "boost already extracted"
+else
+if [[ "$platform" == *"linux"* ]]
+then
+7z x "$SCRIPTPATH/boost_1_58_0.7z" -o"$SCRIPTPATH/"
+else
+hdiutil mount "$SCRIPTPATH/7zX_1.7.1.dmg"
+/Volumes/7zX/7zX.app/Contents/Resources/7za x "$SCRIPTPATH/boost_1_58_0.7z" -o"$SCRIPTPATH/"
+hdiutil unmount /Volumes/7zX
+fi
+fi

Common/3dParty/icu/build.bat

+echo "build: OK!"
\ No newline at end of file

Common/3dParty/icu/build.sh

+#!/bin/bash
+
+echo "build: OK!"

Common/3dParty/icu/fetch.bat

+SET SCRIPTPATH=%~dp0
+CD /D %~dp0
+
+SET platform=win_32
+if defined ProgramFiles(x86) (
+	SET platform=win_64
+)
+
+if not exist "%platform%" (
+	md "%platform%"
+)
+
+if not exist "%platform%\build" (
+	md "%platform%\build"
+)
+
+if "%platform%" == "win_64" (
+	SET URL=http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-Win64-msvc10.zip
+) else (
+	SET URL=http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-Win32-msvc10.zip
+)
+
+if exist "%SCRIPTPATH%%platform%\icu.zip" (
+    echo "icu already downloaded"
+) else (
+    Powershell.exe Invoke-WebRequest -OutFile %platform%\icu.zip "%URL%"
+)
+
+SET UNSIP_PROGRAMM="C:\Program Files\7-Zip\7z.exe"
+SET UNSIP_PROGRAMM2="C:\Program Files (x86)\7-Zip\7z.exe"
+if exist %UNSIP_PROGRAMM2% (
+	SET UNSIP_PROGRAMM=%UNSIP_PROGRAMM2%
+)
+
+if exist "%SCRIPTPATH%%platform%\icu\" (
+	echo "icu already extracted"
+) else (
+    call %UNSIP_PROGRAMM% x "%SCRIPTPATH%%platform%\icu.zip" -o"%SCRIPTPATH%%platform%\"
+)
+
+if "%platform%" == "win_64" (
+XCOPY "%SCRIPTPATH%%platform%\icu\bin64\icudt55.dll" "%SCRIPTPATH%%platform%\build\icudt55.dll"
+XCOPY "%SCRIPTPATH%%platform%\icu\bin64\icuuc55.dll" "%SCRIPTPATH%%platform%\build\icuuc55.dll"
+XCOPY "%SCRIPTPATH%%platform%\icu\lib64\icudt.lib" "%SCRIPTPATH%%platform%\build\icudt.lib"
+XCOPY "%SCRIPTPATH%%platform%\icu\lib64\icuuc.lib" "%SCRIPTPATH%%platform%\build\icuuc.lib"
+) else (
+XCOPY "%SCRIPTPATH%%platform%\icu\bin\icudt55.dll" "%SCRIPTPATH%%platform%\build\icudt55.dll"
+XCOPY "%SCRIPTPATH%%platform%\icu\bin\icuuc55.dll" "%SCRIPTPATH%%platform%\build\icuuc55.dll"
+XCOPY "%SCRIPTPATH%%platform%\icu\lib\icudt.lib" "%SCRIPTPATH%%platform%\build\icudt.lib"
+XCOPY "%SCRIPTPATH%%platform%\icu\lib\icuuc.lib" "%SCRIPTPATH%%platform%\build\icuuc.lib"
+)
+
+pause
\ No newline at end of file

Common/3dParty/icu/fetch.sh

+#!/bin/bash
+
+SCRIPT=$(readlink -f "$0")
+SCRIPTPATH=$(dirname "$SCRIPT")
+
+os=$(uname -s)
+platform=""
+
+case "$os" in
+  Linux*)   platform="linux" ;;
+  Darwin*)  platform="mac" ;; 
+  *)        exit ;;
+esac
+
+architecture=$(uname -m)
+arch=""
+
+case "$architecture" in
+  x86_64*)  arch="_64" ;;
+  *)        arch="_32" ;;
+esac
+
+if [[ -d "$SCRIPTPATH/$platform$arch" ]]
+then
+echo
+else
+mkdir "$SCRIPTPATH/$platform$arch"
+fi
+
+cd "$SCRIPTPATH/$platform$arch"
+
+if [ -d "build" ]
+then
+echo ""
+else
+mkdir "build"
+fi
+
+if [[ "$platform" == *"linux"* ]]
+then
+if [[ -f "./icu.zip" ]]
+then 
+echo "icu already downloaded"
+else
+if [[ "$arch" == *"_64"* ]]
+then
+wget -O icu.zip http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-RHEL6-x64.tgz
+else
+wget -O icu.zip http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-RHEL6-i386.tgz
+fi
+fi
+if [ -d "./icu" ]
+then
+echo "icu already extracted"
+else
+7z x -so "./icu.zip" | tar xf -
+fi
+cp "./usr/local/lib/libicudata.so.55.1" "build/libicudata.so.55"
+cp "./usr/local/lib/libicuuc.so.55.1" "build/libicuuc.so.55"
+fi
+
+if [[ "$platform" == *"mac"* ]]
+then
+if [ -d "./icu" ]
+then
+echo "icu already extracted"
+else
+svn export http://source.icu-project.org/repos/icu/icu/tags/release-55-1 ./icu
+fi
+cd ./icu/source/
+./runConfigureICU MacOSX
+make
+cd ../../
+cp "./icu/source/lib/libicudata.55.1.dylib" "build/llibicudata.55.1.dylib"
+cp "./icu/source/lib/libicuuc.55.1.dylib" "build/libicuuc.55.1.dylib"
+fi

Common/3dParty/v8/build.sh

+#!/bin/bash
+
+export PATH=`pwd`/depot_tools:"$PATH"
+
+SCRIPT=$(readlink -f "$0")
+SCRIPTPATH=$(dirname "$SCRIPT")
+
+os=$(uname -s)
+platform=""
+
+case "$os" in
+  Linux*)   platform="linux" ;;
+  Darwin*)  platform="mac" ;; 
+  *)        exit ;;
+esac
+
+architecture=$(uname -m)
+arch=""
+
+case "$architecture" in
+  x86_64*)  arch="_64" ;;
+  *)        arch="_32" ;;
+esac
+
+if [[ -d "$SCRIPTPATH/$platform$arch" ]]
+then
+echo
+else
+mkdir "$SCRIPTPATH/$platform$arch"
+fi
+
+cd "$SCRIPTPATH/v8"
+
+if [[ "$platform" == *"linux"* ]]
+then
+CFLAGS="-fPIC" CXXFLAGS="-fPIC" make native
+
+cp "./out/native/obj.target/tools/gyp/libv8_base.a" "./../$platform$arch/"
+cp "./out/native/obj.target/tools/gyp/libv8_libbase.a" "./../$platform$arch/"
+cp "./out/native/obj.target/tools/gyp/libv8_libplatform.a" "./../$platform$arch/"
+cp "./out/native/obj.target/tools/gyp/libv8_nosnapshot.a" "./../$platform$arch/"
+cp "./out/native/obj.target/tools/gyp/libv8_external_snapshot.a" "./../$platform$arch/"
+
+cp "./out/native/obj.target/third_party/icu/libicui18n.a" "./../$platform$arch/"
+cp "./out/native/obj.target/third_party/icu/libicuuc.a" "./../$platform$arch/"
+cp "./out/native/obj.target/third_party/icu/libicudata.a" "./../$platform$arch/"
+
+cp "./third_party/icu/linux/icudtl_dat.S" "./../$platform$arch/"
+fi
+
+if [[ "$platform" == *"mac"* ]]
+then
+CFLAGS="-fPIC" CXXFLAGS="-fPIC -stdlib=libc++" LDFLAGS="-stdlib=libc++"  make native
+
+cp "./out/native/libv8_base.a" "./../$platform$arch/"
+cp "./out/native/libv8_libbase.a" "./../$platform$arch/"
+cp "./out/native/libv8_libplatform.a" "./../$platform$arch/"
+cp "./out/native/libv8_nosnapshot.a" "./../$platform$arch/"
+cp "./out/native/libv8_external_snapshot.a" "./../$platform$arch/"
+
+cp "./out/native/libicui18n.a" "./../$platform$arch/"
+cp "./out/native/libicuuc.a" "./../$platform$arch/"
+cp "./out/native/icudtl.dat" "./../$platform$arch/"
+
+cp "./third_party/icu/mac/icudtl_dat.S" "./../$platform$arch/"
+fi

Common/3dParty/v8/fetch.sh

+#!/bin/bash
+
+SCRIPT=$(readlink -f "$0")
+SCRIPTPATH=$(dirname "$SCRIPT")
+
+cd "$SCRIPTPATH"
+
+if [ -d "depot_tools" ]
+then
+echo ""
+else
+git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
+fi
+
+export PATH=`pwd`/depot_tools:"$PATH"
+gclient
+
+if [ -d "./v8" ]
+then
+gclient sync
+else
+fetch v8
+fi

Common/3dParty/v8/fetch_.bat

+SET SCRIPTPATH=%~dp0
+CD /D %~dp0
+
+if exist "depot_tools" (
+	echo "depot_tools already fetched"
+) else (
+	git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
+)
+
+setx path "%SCRIPTPATH%depot_tools;%SCRIPTPATH%depot_tools\python276_bin;%PATH%;"
+SET DEPOT_TOOLS_WIN_TOOLCHAIN=0
+SET GYP_MSVS_VERSION=2013
+
+call gclient runhooks
+
+if exist "%SCRIPTPATH%v8" (
+call gclient sync
+) else (
+call fetch v8
+)

Readme.md

 
-[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](http://www.gnu.org/licenses/agpl-3.0.ru.html)    ![Release](https://img.shields.io/badge/Release-v4.0.0-blue.svg?style=flat)  ![x2tconverter](https://img.shields.io/badge/x2tconverter-v2.0.2.376-blue.svg?style=flat) ![Platforms Windows | OS X | Linux](https://img.shields.io/badge/Platforms-Windows%20%7C%20OS%20X%20%7C%20Linux%20-lightgray.svg?style=flat)
+[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](http://www.gnu.org/licenses/agpl-3.0.ru.html)    ![Release](https://img.shields.io/badge/Release-v4.0.1-blue.svg?style=flat)  ![x2tconverter](https://img.shields.io/badge/x2tconverter-v2.0.2.376-blue.svg?style=flat) ![Platforms Windows | OS X | Linux](https://img.shields.io/badge/Platforms-Windows%20%7C%20OS%20X%20%7C%20Linux%20-lightgray.svg?style=flat)
 
 ## Core
 Server core components which are a part of [ONLYOFFICE Document Server][2]. Enable the conversion between the most popular office document formats: DOC, DOCX, ODT, RTF, TXT, PDF, HTML, EPUB, XPS, DjVu, XLS, XLSX, ODS, CSV, PPT, PPTX, ODP.