Merge commit 'c23ff4c8cd5bb2040f75a3a9845fc41d9d496216' into develop

DesktopEditor/Word_Api/Editor_Api.h

@@ -991,10 +991,10 @@ namespace NSEditorApi
         js_wrapper<int> m_nTransitionType;
         js_wrapper<int> m_nTransitionOption;
         js_wrapper<int> m_nTransitionDuration;
+        js_wrapper<int> m_nSlideAdvanceDuration;
         
         js_wrapper<bool> m_bSlideAdvanceOnMouseClick;
         js_wrapper<bool> m_bSlideAdvanceAfter;
-        js_wrapper<bool> m_bSlideAdvanceDuration;
         js_wrapper<bool> m_bShowLoop;
         
     public:
@@ -1007,10 +1007,10 @@ namespace NSEditorApi
         LINK_PROPERTY_INT_JS(TransitionType)
         LINK_PROPERTY_INT_JS(TransitionOption)
         LINK_PROPERTY_INT_JS(TransitionDuration)
+        LINK_PROPERTY_INT_JS(SlideAdvanceDuration)
         
         LINK_PROPERTY_BOOL_JS(SlideAdvanceOnMouseClick)
         LINK_PROPERTY_BOOL_JS(SlideAdvanceAfter)
-        LINK_PROPERTY_BOOL_JS(SlideAdvanceDuration)
         LINK_PROPERTY_BOOL_JS(ShowLoop)
     };
     

DesktopEditor/Word_Api/Editor_Defines.h

@@ -690,6 +690,9 @@
 #define ASC_MENU_EVENT_TYPE_SECTION					17
 #define ASC_MENU_EVENT_TYPE_SHAPE                   18
 #define ASC_MENU_EVENT_TYPE_SLIDE                   20
+#define ASC_MENU_EVENT_TYPE_THEME_THUMBNAILS        21
+#define ASC_MENU_EVENT_TYPE_LAYOUT_THUMBNAILS       22
+#define ASC_MENU_EVENT_TYPE_SLIDETIMINGALL          23
 
 // insert commands
 #define ASC_MENU_EVENT_TYPE_INSERT_IMAGE			50

DesktopEditor/fontengine/ApplicationFonts.cpp

@@ -41,32 +41,6 @@
 
 namespace NSFonts
 {
-    void makeLower(std::wstring& name)
-    {
-        int nLen = (int)name.length();
-        wchar_t* pStr = (wchar_t*)name.c_str();
-
-        for (int i = 0; i < nLen; ++i)
-        {
-            if (pStr[i] >= 'A' && pStr[i] <= 'Z')
-                pStr[i] = pStr[i] + 'a' - 'A';
-        }
-    }
-    std::wstring prepareFont3000(std::wstring& name)
-    {
-        std::wstring sRet;
-        int nLen = (int)name.length();
-        wchar_t* pStr = (wchar_t*)name.c_str();
-
-        for (int i = 0; i < nLen; ++i)
-        {
-            if (pStr[i] == ' ' || pStr[i] == '-')
-                continue;
-            sRet.append(pStr + i, 1);
-        }
-        return sRet;
-    }
-
     CFontInfo* FromBuffer(BYTE*& pBuffer, std::wstring strDir)
     {
         // name
@@ -755,7 +729,7 @@ int CFontList::GetFaceNamePenalty(std::wstring sCandName, std::wstring sReqName,
 	else if ( std::wstring::npos != sReqName.find( sCandName ) || std::wstring::npos != sCandName.find( sReqName ) )
 		return 1000;
 
-    if (NULL != pArrayLikes)
+	if (NULL != pArrayLikes)
 	{
 		for (std::vector<std::wstring>::iterator iter = pArrayLikes->begin(); iter != pArrayLikes->end(); iter++)
 		{
@@ -764,19 +738,6 @@ int CFontList::GetFaceNamePenalty(std::wstring sCandName, std::wstring sReqName,
 		}
 	}
 
-    /*
-    NSFonts::makeLower(sCandName);
-    NSFonts::makeLower(sReqName);
-    if ( sReqName == sCandName )
-        return 1500;
-
-    sCandName = NSFonts::prepareFont3000(sCandName);
-    sReqName = NSFonts::prepareFont3000(sReqName);
-
-    if ( sReqName == sCandName )
-        return 3000;
-    */
-
 	return 10000;
 }
 

DesktopEditor/xml/mac/libxml2.xcodeproj/project.pbxproj

@@ -584,15 +584,20 @@
 				DEVELOPMENT_TEAM = 2WH24U26GJ;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					UNICODE,
-					_UNICODE,
 					USE_LITE_READER,
-					_USE_LIBXML2_READER_,
-					_USE_XMLLITE_READER_,
 					LINUX,
 					MAC,
-					_IOS,
 					LIBXML_READER_ENABLED,
-					_XCODE,
+					LIBXML_PUSH_ENABLED,
+					LIBXML_HTML_ENABLED,
+					LIBXML_XPATH_ENABLED,
+					LIBXML_OUTPUT_ENABLED,
+					LIBXML_C14N_ENABLED,
+					LIBXML_SAX1_ENABLED,
+					LIBXML_TREE_ENABLED,
+					LIBXML_XPTR_ENABLED,
+					IN_LIBXML,
+					LIBXML_STATIC,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -612,15 +617,20 @@
 				DEVELOPMENT_TEAM = 2WH24U26GJ;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					UNICODE,
-					_UNICODE,
 					USE_LITE_READER,
-					_USE_LIBXML2_READER_,
-					_USE_XMLLITE_READER_,
 					LINUX,
 					MAC,
-					_IOS,
 					LIBXML_READER_ENABLED,
-					_XCODE,
+					LIBXML_PUSH_ENABLED,
+					LIBXML_HTML_ENABLED,
+					LIBXML_XPATH_ENABLED,
+					LIBXML_OUTPUT_ENABLED,
+					LIBXML_C14N_ENABLED,
+					LIBXML_SAX1_ENABLED,
+					LIBXML_TREE_ENABLED,
+					LIBXML_XPTR_ENABLED,
+					IN_LIBXML,
+					LIBXML_STATIC,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",

DesktopEditor/xml/src/xmldom.cpp

@@ -1,4 +1,4 @@
-/*
+/*
  * (c) Copyright Ascensio System SIA 2010-2018
  *
  * This program is a free software product. You can redistribute it and/or