Changed architecture detection for linux and macos

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

Common/DocxFormat/Source/XlsxFormat/Styles/TableStyles.h

@@ -116,7 +116,7 @@ namespace OOX
 			}
 			virtual void toXML(NSStringUtils::CStringBuilder& writer) const
 			{
-				if(m_oName.IsInit() && m_arrItems.size() > 0)
+				if(m_oName.IsInit())
 				{
 					writer.WriteString(_T("<tableStyle"));
 					WritingStringNullableAttrEncodeXmlString(L"name", m_oName, m_oName.get());
@@ -249,4 +249,4 @@ namespace OOX
 	} //Spreadsheet
 } // namespace OOX
 
-#endif // OOX_TABLESTYLES_FILE_INCLUDE_H_
+#endif // OOX_TABLESTYLES_FILE_INCLUDE_H_

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;
 }

Makefile

@@ -13,19 +13,28 @@ ifeq ($(OS),Windows_NT)
 	endif
 else
 	UNAME_S := $(shell uname -s)
+	UNAME_P := $(shell uname -p)
 	ifeq ($(UNAME_S),Linux)
 		PLATFORM := linux
 		SHARED_EXT := .so*
 		SHELL_EXT := .sh
 		LIB_EXT := .a
 		MAKE := make -j $(shell grep -c ^processor /proc/cpuinfo)
+		
+		ifeq ($(UNAME_P),x86_64)
+			ARCHITECTURE := 64
+		endif
+		ifneq ($(filter %86,$(UNAME_P)),)
+			ARCHITECTURE := 32
+		endif
 	endif
-	UNAME_P := $(shell uname -p)
-	ifeq ($(UNAME_P),x86_64)
+	ifeq ($(UNAME_S),Darwin)
+		PLATFORM := mac
 		ARCHITECTURE := 64
-	endif
-	ifneq ($(filter %86,$(UNAME_P)),)
-		ARCHITECTURE := 32
+		SHARED_EXT := .dylib*
+		SHELL_EXT := .sh
+		LIB_EXT := .a
+		MAKE := make -j $(shell sysctl -n hw.ncpu)
 	endif
 endif