build error (macOS, clang)

* 'develop' of https://github.com/ONLYOFFICE/core:
  OdfFormatReader - fix errors ...

ASCOfficeOdfFile/src/docx/xlsx_table_metrics.cpp

@@ -223,7 +223,7 @@ public:
         const std::pair<int, double> c = cols_.search (x_pt);
         const std::pair<int, double> r = rows_.search (y_pt);
       
-		xlsx_table_position res = {c.first, c.second, r.first, r.second};
+        xlsx_table_position res = {(size_t)c.first, c.second, (size_t)r.first, r.second};
         return res;
     }
 
@@ -236,7 +236,7 @@ public:
 
 		r = rows_.search(offset_row, y_pt);
         
-		xlsx_table_position res = {c.first, c.second, r.first, r.second};
+        xlsx_table_position res = {(size_t)c.first, c.second, (size_t)r.first, r.second};
       
 		return res;
     }
@@ -246,7 +246,7 @@ public:
 		std::pair<int, double> r = rows_.search (last_row, 0); 
 		
      
-		xlsx_table_position res = {c.first, c.second, r.first, r.second};
+        xlsx_table_position res = {(size_t)c.first, c.second, (size_t)r.first, r.second};
       
 		return res;
     }

DesktopEditor/Word_Api/Editor_Defines.h

@@ -744,12 +744,11 @@
 
 #define ASC_MENU_EVENT_TYPE_ERROR                   500
 
+#define ASC_MENU_EVENT_TYPE_COLOR_SCHEMES           2404    //  CAscColorSchemes
+#define ASC_MENU_EVENT_TYPE_CHANGE_COLOR_SCHEME     2415    //  SET(int)
 
-#define ASC_MENU_EVENT_TYPE_COLOR_SCHEMES               2404    //  CAscColorSchemes
-#define ASC_MENU_EVENT_TYPE_CHANGE_COLOR_SCHEME         2415    //  SET(int)
-
-#define ASC_MENU_EVENT_TYPE_AUTH_PARTICIPANTS_CHANGED   2416
-#define ASC_MENU_EVENT_TYPE_LOST_CONNECTION             2420
-#define ASC_MENU_EVENT_TYPE_DROP_CONNECTION             2421
+#define ASC_COAUTH_EVENT_TYPE_PARTICIPANTS_CHANGED  20101
+#define ASC_COAUTH_EVENT_TYPE_LOST_CONNECTION       20102
+#define ASC_COAUTH_EVENT_TYPE_DROP_CONNECTION       20103
 
 #endif //_BUILD_EDITOR_DEFINES_CROSSPLATFORM_H_

HtmlRenderer/test/main.cpp

@@ -46,7 +46,7 @@
 //#define ONLINE_WORD_TO_PDF
 //#define TO_PDF
 #define TO_HTML_RENDERER
-#define ONLY_TEXT
+//#define ONLY_TEXT
 
 int main(int argc, char *argv[])
 {
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
     //std::wstring sFile = L"D:\\bankomats.xps";
     //std::wstring sFile = L"\\\\kirillov8\\_Office\\DJVU\\Основы разработки приложений на платформе Microsoft .NET Framework. Учебный курс Microsoft экзамен 70-536.djvu";
     //std::wstring sFile = L"D:\\TESTFILES\\Алгоритмы - построение и анализ.djvu";
-    std::wstring sFile = L"D:\\TESTFILES\\PDF 1-7 (756p).pdf";
+    std::wstring sFile = L"D:\\knopk5_0.pdf";
     std::wstring sDst = L"D:\\test\\Document";
 
     //std::wstring sFile = L"/home/oleg/activex/Android intro(2p).pdf";
@@ -170,5 +170,7 @@ int main(int argc, char *argv[])
     oRenderer.SaveToFile(L"/home/oleg/activex/1/1.pdf");
 #endif
 
+    RELEASEOBJECT(pReader);
+
     return 0;
 }

X2tConverter/build/Qt/X2tConverter.pro

@@ -32,5 +32,5 @@ core_linux_32 {
     DESTDIR = $$DESTDIR/linux_32
 }
 core_mac {
-    DESTDIR = $$DESTDIR/mac
-}
+    DESTDIR = $$DESTDIR/mac_64
+}