Fix common apps (#224)

Co-authored-by: Alexey.Musinov <alexey.musinov@gmail.com>

ASCOfficePPTXFile/PPTXFormat/Logic/TextFont.h

@@ -43,7 +43,12 @@ namespace PPTX
 		{
 		public:
 			WritingElement_AdditionConstructors(TextFont)
-			PPTX_LOGIC_BASE2(TextFont)
+			TextFont()
+			{
+				m_eType = OOX::et_Unknown;
+			}
+			virtual ~TextFont() {}
+			TextFont(const TextFont& oSrc) { *this = oSrc; }
 
 			virtual OOX::EElementType getType () const
 			{

ASCOfficePPTXFile/PPTXFormat/Logic/UniColor.cpp

@@ -338,5 +338,13 @@ namespace PPTX
 			return 0; //return 0; - заменить на просмотр настроек по умолчанию
 		}
 
+		void UniColor::SetRGBColor(const BYTE& R, const BYTE& G, const BYTE& B)
+		{
+			Logic::SrgbClr* rgbColor = new Logic::SrgbClr();
+			rgbColor->SetRGB(R, G, B);
+
+			Color.reset(rgbColor);
+		}
+
 	} // namespace Logic
 } // namespace PPTX

ASCOfficePPTXFile/PPTXFormat/Logic/UniColor.h

@@ -75,6 +75,8 @@ namespace PPTX
 					return Color->GetRGBColor(_oTheme,_oClrMap, ARGB);
 				return 0;
 			}
+			void SetRGBColor(const BYTE& R, const BYTE& G, const BYTE& B);
+
 			virtual std::wstring toXML() const;
 
 			virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const

ASCOfficePPTXFile/PPTXFormat/Theme/ClrScheme.h

@@ -79,6 +79,7 @@ namespace PPTX
                 node1 = node.ReadNode(_T("a:folHlink"));
                 lColor.GetColorFrom(node1);         Scheme.insert(std::pair<std::wstring,Logic::UniColor>(_T("folHlink"), lColor));
 
+				FillWithDefaults();
 				FillParentPointersForChilds();
 			}
 
@@ -233,7 +234,85 @@ namespace PPTX
 
 				return *this;
 			}
-
+			void FillWithDefaults()
+			{
+				Logic::UniColor lColor;
+				std::map<std::wstring, Logic::UniColor>::iterator it;
+				it = Scheme.find(L"dk1");
+				if (Scheme.end() == it || !it->second.is_init())
+				{
+					lColor.SetRGBColor(0,0,0);
+					Scheme[L"dk1"] = lColor;
+				}
+				it = Scheme.find(L"lt1");
+				if (Scheme.end() == it || !it->second.is_init())
+				{
+					lColor.SetRGBColor(255,255,255);
+					Scheme[L"lt1"] = lColor;
+				}
+				it = Scheme.find(L"dk2");
+				if (Scheme.end() == it || !it->second.is_init())
+				{
+					lColor.SetRGBColor(0x1F,0x49, 0x7D);
+					Scheme[L"dk2"] = lColor;
+				}
+				it = Scheme.find(L"lt2");
+				if (Scheme.end() == it || !it->second.is_init())
+				{
+					lColor.SetRGBColor(0xEE,0xEC,0xE1);
+					Scheme[L"lt2"] = lColor;
+				}
+				it = Scheme.find(L"accent1");
+				if (Scheme.end() == it || !it->second.is_init())
+				{
+					lColor.SetRGBColor(0x4F, 0x81, 0xBD);
+					Scheme[L"accent1"] = lColor;
+				}
+				it = Scheme.find(L"accent2");
+				if (Scheme.end() == it || !it->second.is_init())
+				{
+					lColor.SetRGBColor(0xC0,0x50,0x4D);
+					Scheme[L"accent2"] = lColor;
+				}
+				it = Scheme.find(L"accent3");
+				if (Scheme.end() == it || !it->second.is_init())
+				{
+					lColor.SetRGBColor(0x9B,0xBB,0x59);
+					Scheme[L"accent3"] = lColor;
+				}
+				it = Scheme.find(L"accent4");
+				if (Scheme.end() == it || !it->second.is_init())
+				{
+					lColor.SetRGBColor(0x80,0x64,0xA2);
+					Scheme[L"accent4"] = lColor;
+				}
+				it = Scheme.find(L"accent5");
+				if (Scheme.end() == it || !it->second.is_init())
+				{
+					lColor.SetRGBColor(0x4B,0xAC,0xC6);
+					Scheme[L"accent5"] = lColor;
+				}
+				it = Scheme.find(L"accent6");
+				if (Scheme.end() == it || !it->second.is_init())
+				{
+					lColor.SetRGBColor(0xF7,0x96,0x46);
+					Scheme[L"accent6"] = lColor;
+				}
+				it = Scheme.find(L"hlink");
+				if (Scheme.end() == it || !it->second.is_init())
+				{
+					lColor.SetRGBColor(0x00,0x00,0xFF);
+					Scheme[L"hlink"] = lColor;
+				}
+				it = Scheme.find(L"folHlink");
+				if (Scheme.end() == it || !it->second.is_init())
+				{
+					lColor.SetRGBColor(0x80, 0x00, 0x80);
+					Scheme[L"folHlink"] = lColor;
+				}
+				
+				FillParentPointersForChilds();
+			}
 		protected:
 			virtual void FillParentPointersForChilds()
 			{

ASCOfficePPTXFile/PPTXFormat/Theme/FmtScheme.h

@@ -35,6 +35,7 @@
 
 #include "./../WrapperWritingElement.h"
 #include "./../Logic/UniFill.h"
+#include "./../Logic/Colors/SchemeClr.h"
 #include "./../Logic/Ln.h"
 #include "./../Logic/EffectStyle.h"
 
@@ -84,6 +85,7 @@ namespace PPTX
 				XmlUtils::CXmlNode oNode4 = node.ReadNode(_T("a:bgFillStyleLst"));
 				XmlMacroLoadArray(oNode4, _T("*"), bgFillStyleLst, Logic::UniFill);
 
+				FillWithDefaults();
 				FillParentPointersForChilds();
 			}
 
@@ -251,6 +253,113 @@ namespace PPTX
 				pReader->Seek(_end_rec);
 			}
 
+			void FillWithDefaults()
+			{
+				Logic::SolidFill* pSolidFill = NULL;
+				Logic::SchemeClr* pSchemeClr = NULL;
+
+				// -------------- fill styles -------------------------
+				if (fillStyleLst.size() < 3)
+				{
+					fillStyleLst.clear();
+
+					pSolidFill = new Logic::SolidFill();
+					pSolidFill->m_namespace = L"a";
+					pSchemeClr = new Logic::SchemeClr();
+					pSchemeClr->val.set(L"phClr");
+					pSolidFill->Color.Color.reset(pSchemeClr);
+					fillStyleLst.push_back(Logic::UniFill());
+					fillStyleLst.back().m_type = Logic::UniFill::solidFill;
+					fillStyleLst.back().Fill.reset(pSolidFill);
+
+					pSolidFill = new Logic::SolidFill();
+					pSolidFill->m_namespace = L"a";
+					pSolidFill->Color.SetRGBColor(0,0,0);
+					fillStyleLst.push_back(Logic::UniFill());
+					fillStyleLst.back().m_type = Logic::UniFill::solidFill;
+					fillStyleLst.back().Fill.reset(pSolidFill);
+
+					pSolidFill = new Logic::SolidFill();
+					pSolidFill->m_namespace = L"a";
+					pSolidFill->Color.SetRGBColor(0,0,0);
+					fillStyleLst.push_back(Logic::UniFill());
+					fillStyleLst.back().m_type = Logic::UniFill::solidFill;
+					fillStyleLst.back().Fill.reset(pSolidFill);
+				}
+
+				// -------------- back styles -------------------------
+				if (bgFillStyleLst.size() < 3)
+				{
+					bgFillStyleLst.clear();
+
+					pSolidFill = new Logic::SolidFill();
+					pSolidFill->m_namespace = L"a";
+					pSchemeClr = new Logic::SchemeClr();
+					pSchemeClr->val.set(L"phClr");
+					pSolidFill->Color.Color.reset(pSchemeClr);
+					bgFillStyleLst.push_back(Logic::UniFill());
+					bgFillStyleLst.back().m_type = Logic::UniFill::solidFill;
+					bgFillStyleLst.back().Fill.reset(pSolidFill);
+
+					pSolidFill = new Logic::SolidFill();
+					pSolidFill->m_namespace = L"a";
+					pSolidFill->Color.SetRGBColor(0,0,0);
+					bgFillStyleLst.push_back(Logic::UniFill());
+					bgFillStyleLst.back().m_type = Logic::UniFill::solidFill;
+					bgFillStyleLst.back().Fill.reset(pSolidFill);
+
+					pSolidFill = new Logic::SolidFill();
+					pSolidFill->m_namespace = L"a";
+					pSolidFill->Color.SetRGBColor(0,0,0);
+					bgFillStyleLst.push_back(Logic::UniFill());
+					bgFillStyleLst.back().m_type = Logic::UniFill::solidFill;
+					bgFillStyleLst.back().Fill.reset(pSolidFill);
+				}
+
+				// -------------- line styles -------------------------
+				if (lnStyleLst.size() < 3)
+				{
+					lnStyleLst.clear();
+
+					pSolidFill = new Logic::SolidFill();
+					pSolidFill->m_namespace = L"a";
+					pSchemeClr = new Logic::SchemeClr();
+					pSchemeClr->val.set(L"phClr");
+					pSchemeClr->Modifiers.push_back(Logic::ColorModifier());
+					pSchemeClr->Modifiers.back().name = L"shade";
+					pSchemeClr->Modifiers.back().val = 95000;
+					pSchemeClr->Modifiers.push_back(Logic::ColorModifier());
+					pSchemeClr->Modifiers.back().name = L"satMod";
+					pSchemeClr->Modifiers.back().val = 105000;
+					pSolidFill->Color.Color.reset(pSchemeClr);
+					lnStyleLst.push_back(Logic::Ln());
+					lnStyleLst.back().w = 9525;
+					lnStyleLst.back().Fill.m_type = Logic::UniFill::solidFill;
+					lnStyleLst.back().Fill.Fill.reset(pSolidFill);
+
+					pSolidFill = new Logic::SolidFill();
+					pSolidFill->m_namespace = L"a";
+					pSchemeClr = new Logic::SchemeClr();
+					pSchemeClr->val.set(L"phClr");
+					pSolidFill->Color.Color.reset(pSchemeClr);
+					lnStyleLst.push_back(Logic::Ln());
+					lnStyleLst.back().w = 25400;
+					lnStyleLst.back().Fill.m_type = Logic::UniFill::solidFill;
+					lnStyleLst.back().Fill.Fill.reset(pSolidFill);
+
+					pSolidFill = new Logic::SolidFill();
+					pSolidFill->m_namespace = L"a";
+					pSchemeClr = new Logic::SchemeClr();
+					pSchemeClr->val.set(L"phClr");
+					pSolidFill->Color.Color.reset(pSchemeClr);
+					lnStyleLst.push_back(Logic::Ln());
+					lnStyleLst.back().w = 38100;
+					lnStyleLst.back().Fill.m_type = Logic::UniFill::solidFill;
+					lnStyleLst.back().Fill.Fill.reset(pSolidFill);
+				}
+
+				FillParentPointersForChilds();
+			}
 		public:
 			std::wstring name;
 			std::vector<Logic::UniFill>		fillStyleLst;

ASCOfficePPTXFile/PPTXFormat/Theme/FontScheme.h

@@ -52,6 +52,7 @@ namespace PPTX
 				majorFont = node.ReadNode(_T("a:majorFont"));
 				minorFont = node.ReadNode(_T("a:minorFont"));
 
+				FillWithDefaults();
 				FillParentPointersForChilds();
 			}
 			virtual std::wstring toXML() const
@@ -133,6 +134,20 @@ namespace PPTX
 
 				pReader->Seek(_end_rec);
 			}
+			void FillWithDefaults()
+			{
+				if (OOX::et_Unknown == majorFont.latin.m_eType)
+				{
+					majorFont.latin.m_name = _T("a:latin");
+					majorFont.latin.typeface = L"Arial";
+				}
+				if (OOX::et_Unknown == minorFont.latin.m_eType)
+				{
+					minorFont.latin.m_name = _T("a:latin");
+					minorFont.latin.typeface = L"Arial";
+				}
+				FillParentPointersForChilds();
+			}
 
 			std::wstring			name;
 			Logic::FontCollection	majorFont;

Common/3dParty/icu/icu.pri

@@ -23,3 +23,11 @@ core_mac {
     LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.$${ICU_MAJOR_VER}.dylib
     LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.$${ICU_MAJOR_VER}.dylib
 }
+
+core_ios {
+    INCLUDEPATH += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/include
+
+    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.a
+    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicui18n.a
+    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.a
+}

Common/3dParty/icu/icu_ios.sh

@@ -0,0 +1,272 @@
+#!/bin/bash
+
+ICU_VERSION="58"
+
+ICU_DIR="$PWD/icu"
+
+ICU_SOURCE="${ICU_DIR}/source"
+
+PREBUILD="$PWD/ios/icu_build"
+
+CONFIG_PREFIX=" --enable-extras=yes \
+--enable-tools=yes \
+--enable-icuio=yes \
+--enable-strict=no \
+--enable-static \
+--enable-shared=no \
+--enable-tests=yes \
+--disable-renaming \
+--enable-samples=no \
+--enable-dyload=no \
+--with-data-packaging=static"
+
+CFLAGS="-O3 -D__STDC_INT64__ -fno-exceptions -fno-short-wchar -fno-short-enums -fembed-bitcode"
+
+CXXFLAGS="${CFLAGS} -std=c++11 -fembed-bitcode"
+
+#will set value to 1
+defines_config_set_1=(
+    "UCONFIG_NO_BREAK_ITERATION"
+    "UCONFIG_NO_FORMATTING"
+    "UCONFIG_NO_REGULAR_EXPRESSIONS"
+    "CONFIG_NO_CONVERSION"
+    "U_DISABLE_RENAMING"
+)
+
+#will set value to 0
+defines_config_set_0=(
+    "U_HAVE_NL_LANGINFO_CODESET"
+    "UCONFIG_NO_TRANSLITERATION"
+    "U_USING_ICU_NAMESPACE"
+)
+
+#will set value to 1
+defines_utypes=(
+    "U_CHARSET_IS_UTF8"
+)
+
+function prebuild() {
+
+    svn export http://source.icu-project.org/repos/icu/tags/release-${ICU_VERSION}/icu4c/ ${ICU_DIR} --native-eol LF
+
+    echo "===== REMOVING data from bundle ====="
+
+    #Data bundle reduction
+    {
+        echo "GENRB_CLDR_VERSION = 32.0.1"
+        echo "GENRB_SYNTHETIC_ALIAS = "
+        echo "GENRB_ALIAS_SOURCE = \$(GENRB_SYNTHETIC_ALIAS) "
+        echo "GENRB_SOURCE = "
+    } >"${ICU_SOURCE}/data/locales/reslocal.mk"
+
+    {
+        echo "LANG_CLDR_VERSION = 32.0.1"
+        echo "LANG_SYNTHETIC_ALIAS = "
+        echo "LANG_ALIAS_SOURCE = \$(LANG_SYNTHETIC_ALIAS) "
+        echo "LANG_SOURCE = "
+    } >"${ICU_SOURCE}/data/lang/reslocal.mk"
+
+    {
+        echo "CURR_CLDR_VERSION = 32.0.1"
+        echo "CURR_SYNTHETIC_ALIAS = "
+        echo "CURR_ALIAS_SOURCE = \$(CURR_SYNTHETIC_ALIAS) "
+        echo "CURR_SOURCE = "
+    } >"${ICU_SOURCE}/data/curr/reslocal.mk"
+
+    {
+        echo "REGION_CLDR_VERSION = 32.0.1"
+        echo "REGION_SYNTHETIC_ALIAS = "
+        echo "REGION_ALIAS_SOURCE = \$(REGION_SYNTHETIC_ALIAS) "
+        echo "REGION_SOURCE = "
+    } >"${ICU_SOURCE}/data/region/reslocal.mk"
+
+    {
+        echo "UNIT_CLDR_VERSION = 32.0.1"
+        echo "UNIT_SYNTHETIC_ALIAS = "
+        echo "UNIT_ALIAS_SOURCE = \$(UNIT_SYNTHETIC_ALIAS) "
+        echo "UNIT_SOURCE = "
+    } >"${ICU_SOURCE}/data/unit/reslocal.mk"
+
+    {
+        echo "ZONE_CLDR_VERSION = 32.0.1"
+        echo "ZONE_SYNTHETIC_ALIAS = "
+        echo "ZONE_ALIAS_SOURCE = \$(ZONE_SYNTHETIC_ALIAS) "
+        echo "ZONE_SOURCE = "
+    } >"${ICU_SOURCE}/data/zone/reslocal.mk"
+
+    #find "${ICU_SOURCES}/data/mappings/" -name '*.mk' ! -name 'ucmcore.mk' -type f -exec rm -f {} +
+
+    mv "${ICU_SOURCE}/data/mappings/ucmcore.mk" "${ICU_SOURCE}/data/mappings/ucmcore.not_used" 2>/dev/null
+    mv "${ICU_SOURCE}/data/mappings/ucmfiles.mk" "${ICU_SOURCE}/data/mappings/ucmfiles.not_used" 2>/dev/null
+    mv "${ICU_SOURCE}/data/mappings/ucmebcdic.mk" "${ICU_SOURCE}/data/mappings/ucmebcdic.not_used" 2>/dev/null
+    mv "${ICU_SOURCE}/data/mappings/ucmlocal.mk" "${ICU_SOURCE}/data/mappings/ucmlocal.not_used" 2>/dev/null
+
+    echo "===== Modify icu/source/common/unicode/uconfig.h ====="
+
+    cp "${ICU_SOURCE}/common/unicode/uconfig" "${ICU_SOURCE}/common/unicode/uconfig.h" 2>/dev/null
+    cp "${ICU_SOURCE}/common/unicode/uconfig.h" "${ICU_SOURCE}/common/unicode/uconfig" 2>/dev/null
+
+    for var in "${defines_config_set_1[@]}"; do
+        sed "/define __UCONFIG_H__/a \\
+#ifndef ${var} \\
+#define ${var} 1 \\
+#endif \\
+" "${ICU_SOURCE}/common/unicode/uconfig.h" >"${ICU_SOURCE}/common/unicode/uconfig.tmp"
+
+        mv "${ICU_SOURCE}/common/unicode/uconfig.tmp" "${ICU_SOURCE}/common/unicode/uconfig.h"
+    done
+
+    for var in "${defines_config_set_0[@]}"; do
+        sed "/define __UCONFIG_H__/a \\
+#ifndef ${var} \\
+#define ${var} 0 \\
+#endif \\
+" "${ICU_SOURCE}/common/unicode/uconfig.h" >"${ICU_SOURCE}/common/unicode/uconfig.tmp"
+
+        mv "${ICU_SOURCE}/common/unicode/uconfig.tmp" "${ICU_SOURCE}/common/unicode/uconfig.h"
+    done
+
+    echo "===== Modify icu/source/common/unicode/utypes.h ====="
+
+    cp "${ICU_SOURCE}/common/unicode/utypes" "${ICU_SOURCE}/common/unicode/utypes.h" 2>/dev/null
+    cp "${ICU_SOURCE}/common/unicode/utypes.h" "${ICU_SOURCE}/common/unicode/utypes" 2>/dev/null
+
+    for var in "${defines_utypes[@]}"; do
+        sed "/define UTYPES_H/a \\
+#ifndef ${var} \\
+#define ${var} 1 \\
+#endif \\
+" "${ICU_SOURCE}/common/unicode/utypes.h" >"${ICU_SOURCE}/common/unicode/utypes.tmp"
+
+        mv "${ICU_SOURCE}/common/unicode/utypes.tmp" "${ICU_SOURCE}/common/unicode/utypes.h"
+
+    done
+
+    echo "===== Patching icu/source/tools/pkgdata/pkgdata.cpp for iOS ====="
+
+    cp "${ICU_SOURCE}/tools/pkgdata/pkgdata" "${ICU_SOURCE}/tools/pkgdata/pkgdata.cpp" 2>/dev/null
+    cp "${ICU_SOURCE}/tools/pkgdata/pkgdata.cpp" "${ICU_SOURCE}/tools/pkgdata/pkgdata" 2>/dev/null
+
+    sed "s/int result = system(cmd);/ \\
+#if defined(IOS_SYSTEM_FIX) \\
+pid_t pid; \\
+char * argv[2]; argv[0] = cmd; argv[1] = NULL; \\
+posix_spawn(\&pid, argv[0], NULL, NULL, argv, environ); \\
+waitpid(pid, NULL, 0); \\
+int result = 0; \\
+#else \\
+int result = system(cmd); \\
+#endif \\
+/g" "${ICU_SOURCE}/tools/pkgdata/pkgdata.cpp" >"${ICU_SOURCE}/tools/pkgdata/pkgdata.tmp"
+
+    sed "/#include <stdlib.h>/a \\
+#if defined(IOS_SYSTEM_FIX) \\
+#include <spawn.h> \\
+extern char **environ; \\
+#endif \\
+" "${ICU_SOURCE}/tools/pkgdata/pkgdata.tmp" >"${ICU_SOURCE}/tools/pkgdata/pkgdata.cpp"
+
+    #mv "${ICU_SOURCE}/tools/pkgdata/pkgdata.tmp" "${ICU_SOURCE}/tools/pkgdata/pkgdata.cpp"
+
+    echo "==============================="
+    echo "===== Run build for MacOS ====="
+    echo "==============================="
+
+    export PLATFORM_PREFIX="${PWD}/mac-build"
+
+    export CPPFLAGS=${CFLAGS}
+
+    mkdir -p ${PREBUILD}
+
+    cd ${PREBUILD}
+
+    sh ${ICU_SOURCE}/runConfigureICU MacOSX --prefix=${PLATFORM_PREFIX} ${CONFIG_PREFIX}
+
+    make clean
+    make -j4
+    make install
+
+    cd ..
+}
+
+function build() {
+
+    unset CXX
+    unset CC
+    unset CFLAGS
+    unset CXXFLAGS
+    unset LDFLAGS
+
+    echo "preparing $1 toolchain"
+
+    export BUILD_DIR="${PWD}/build-${2}"
+
+    DEVELOPER="$(xcode-select --print-path)"
+    SDKROOT="$(xcodebuild -version -sdk $4 | grep -E '^Path' | sed 's/Path: //')"
+    ARCH=$2
+
+    ICU_FLAGS="-I$ICU_SOURCE/common/ -I$ICU_SOURCE/tools/tzcode/ "
+
+    export ADDITION_FLAG="-DIOS_SYSTEM_FIX"
+
+    export CXX="$DEVELOPER/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
+    export CC="$DEVELOPER/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang"
+    export CFLAGS="-fembed-bitcode -isysroot $SDKROOT -I$SDKROOT/usr/include/ -I./include/ -arch $ARCH -miphoneos-version-min=9.0 $ICU_FLAGS $CFLAGS ${ADDITION_FLAG}"
+    export CXXFLAGS="${CXXFLAGS} -fembed-bitcode -stdlib=libc++ -isysroot $SDKROOT -I$SDKROOT/usr/include/ -I./include/ -arch $ARCH -miphoneos-version-min=9.0 $ICU_FLAGS ${ADDITION_FLAG}"
+    export LDFLAGS="-fembed-bitcode -stdlib=libc++ -L$SDKROOT/usr/lib/ -isysroot $SDKROOT -Wl,-dead_strip -miphoneos-version-min=9.0 -lstdc++ ${ADDITION_FLAG}"
+
+    mkdir -p ${BUILD_DIR}
+    cd ${BUILD_DIR}
+
+    sh ${ICU_SOURCE}/configure --host=$3 --with-library-suffix=${2} --with-cross-build=${PREBUILD} ${CONFIG_PREFIX}
+
+    make clean
+    make -j4
+    make install
+
+    cd ..
+}
+
+prebuild
+
+echo "------------------------------------------------------"
+echo " ICU build armv7 libraries"
+echo "------------------------------------------------------"
+
+build "armv7" "armv7" "armv7-apple-darwin" "iphoneos"
+
+echo "------------------------------------------------------"
+echo " ICU build arm64 libraries"
+echo "------------------------------------------------------"
+
+build "arm64" "arm64" "aarch64-apple-darwin" "iphoneos"
+
+echo "------------------------------------------------------"
+echo " ICU combining x86_64 libraries"
+echo "------------------------------------------------------"
+
+build "x86_64" "x86_64" "x86_64-apple-darwin" "iphonesimulator"
+
+cd ..
+
+echo "------------------------------------------------------"
+echo " ICU combining x86_64, armv7 and arm64 libraries"
+echo "------------------------------------------------------"
+
+function buildUniversal() {
+    lipo -create -output "${PWD}/ios/build/$1.a" \
+        "${PWD}/ios/build-x86_64/lib/$1x86_64.a" \
+        "${PWD}/ios/build-arm64/lib/$1arm64.a" \
+        "${PWD}/ios/build-armv7/lib/$1armv7.a"
+}
+
+mkdir -p build
+mkdir -p ios/build
+mkdir -p ios/build/include
+mkdir -p ios/build/include/unicode
+
+cp ${ICU_SOURCE}/common/unicode/*.h ios/build/include/unicode
+
+buildUniversal "libicuuc"
+buildUniversal "libicui18n"
+buildUniversal "libicudata"

Common/DocxFormat/Source/DocxFormat/Logic/ParagraphProperty.h

@@ -391,9 +391,9 @@ namespace ComplexTypes
 
 			nullable<SimpleTypes::CSignedTwipsMeasure > m_oEnd;
 			nullable<SimpleTypes::CDecimalNumber<>    > m_oEndChars;
-			nullable<SimpleTypes::CTwipsMeasure       > m_oFirstLine;
+			nullable<SimpleTypes::CSignedTwipsMeasure > m_oFirstLine;
 			nullable<SimpleTypes::CDecimalNumber<>    > m_oFirstLineChars;
-			nullable<SimpleTypes::CTwipsMeasure       > m_oHanging;
+			nullable<SimpleTypes::CSignedTwipsMeasure > m_oHanging;
 			nullable<SimpleTypes::CDecimalNumber<>    > m_oHangingChars;
 			nullable<SimpleTypes::CSignedTwipsMeasure > m_oStart;
 			nullable<SimpleTypes::CDecimalNumber<>    > m_oStartChars;

Common/base.pri

@@ -141,8 +141,13 @@ core_windows {
     QMAKE_CXXFLAGS += /MP
 
     equals(TEMPLATE, app) {
-        core_win_64:QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE,5.02
-        core_win_32:QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE,5.01
+        console {
+            core_win_64:QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE,5.02
+            core_win_32:QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE,5.01
+        } else {
+            core_win_64:QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:WINDOWS,5.02
+            core_win_32:QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:WINDOWS,5.01
+        }
     }
 }
 

DesktopEditor/AllFontsGen/main.cpp

@@ -1210,6 +1210,22 @@ std::wstring CorrectDir(const std::wstring& sDir)
     return sDir.substr(pos1, pos2 - pos1);
 }
 
+std::wstring CorrectValue(const std::wstring& value)
+{
+    if (value.empty())
+        return L"";
+
+    const wchar_t* data = value.c_str();
+
+    std::wstring::size_type pos1 = (data[0] == '\"') ? 1 : 0;
+    std::wstring::size_type pos2 = value.length();
+
+    if (data[pos2 - 1] == '\"')
+        --pos2;
+
+    return value.substr(pos1, pos2 - pos1);
+}
+
 #ifdef WIN32
 int wmain(int argc, wchar_t** argv)
 #else
@@ -1252,6 +1268,7 @@ int main(int argc, char** argv)
 
             if (sKey == L"--use-system")
             {
+                sValue = CorrectValue(sValue);
                 if (sValue == L"1" || sValue == L"true")
                     bIsUseSystemFonts = true;
             }
@@ -1283,7 +1300,7 @@ int main(int argc, char** argv)
                     {
                         if (srcPrev != src)
                         {
-                            arFontsDirs.push_back(std::wstring(srcPrev, src - srcPrev));
+                            arFontsDirs.push_back(CorrectDir(std::wstring(srcPrev, src - srcPrev)));
                         }
                         src++;
                         srcPrev = src;
@@ -1294,7 +1311,7 @@ int main(int argc, char** argv)
 
                 if (src > srcPrev)
                 {
-                    arFontsDirs.push_back(std::wstring(srcPrev, src - srcPrev));
+                    arFontsDirs.push_back(CorrectDir(std::wstring(srcPrev, src - srcPrev)));
                 }
             }
             else if (sKey == L"--output-web")

DesktopEditor/allthemesgen/main.cpp

@@ -72,6 +72,21 @@ std::wstring CorrectDir(const std::wstring& sDir)
 
     return sDir.substr(pos1, pos2 - pos1);
 }
+std::wstring CorrectValue(const std::wstring& value)
+{
+    if (value.empty())
+        return L"";
+
+    const wchar_t* data = value.c_str();
+
+    std::wstring::size_type pos1 = (data[0] == '\"') ? 1 : 0;
+    std::wstring::size_type pos2 = value.length();
+
+    if (data[pos2 - 1] == '\"')
+        --pos2;
+
+    return value.substr(pos1, pos2 - pos1);
+}
 void string_replace(std::wstring& text, const std::wstring& replaceFrom, const std::wstring& replaceTo)
 {
     size_t posn = 0;
@@ -308,6 +323,7 @@ int main(int argc, char** argv)
             }
             else if (sKey == L"--change-sdk")
             {
+                sValue = CorrectValue(sValue);
                 if (L"1" == sValue || L"true" == sValue)
                 {
                     bIsNeedCorrectSdkAll = true;
@@ -315,6 +331,7 @@ int main(int argc, char** argv)
             }
             else if (sKey == L"--allfonts")
             {
+                sValue = CorrectValue(sValue);
                 sAllFonts = sValue;
             }
             else if (sKey == L"--params")

X2tConverter/build/Android/libx2t/src/main/java/lib/x2t/X2t.kt

@@ -432,7 +432,7 @@ class X2t private constructor() {
 
             if (File(mInputParams.to).exists()) {
                 if (mIsOverwrite) {
-                    FileUtils.deletePath(result.root!!)
+                    FileUtils.deletePath(result.to!!)
                 } else {
                     result.code = CONVERTER_CODE_EXIST
                     return@let
@@ -555,6 +555,7 @@ class X2t private constructor() {
                 this.to = cache1.to
                 this.temp = cache1.temp
                 this.theme = inputParams.theme
+                this.password = inputParams.password
             }
 
             var code = first.invoke(inputTemp)
@@ -565,6 +566,7 @@ class X2t private constructor() {
                         this.to = inputParams.to
                         this.temp = cache2.temp
                         this.theme = "${cache2.root}/theme"
+                        this.password = inputParams.password
                     }
 
                     if (!FileUtils.createPath(inputResult.theme!!)) {