x2t - fix linux build

Common/3dParty/icu/fetch.sh

@@ -16,11 +16,13 @@ case "$os" in
     platform="linux"
     BUILD_PLATFORM=Linux
     SHARED_LIB_EXT=.so.$SHARED_LIB_VER
+    SHARED_LIB_SHORT_EXT=.so.$ICU_MAJOR_VER
     ;;
   Darwin*)
     platform="mac"
     BUILD_PLATFORM=MacOSX
     SHARED_LIB_EXT=.$SHARED_LIB_VER.dylib
+    SHARED_LIB_SHORT_EXT=.$ICU_MAJOR_VER.dylib
     ;;
   *)        exit ;;
 esac
@@ -73,5 +75,5 @@ fi
 
 cd ../../
 
-cp "./icu/source/lib/libicudata$SHARED_LIB_EXT" "build/libicudata$SHARED_LIB_EXT"
-cp "./icu/source/lib/libicuuc$SHARED_LIB_EXT" "build/libicuuc$SHARED_LIB_EXT"
+cp "./icu/source/lib/libicudata$SHARED_LIB_EXT" "build/libicudata$SHARED_LIB_SHORT_EXT"
+cp "./icu/source/lib/libicuuc$SHARED_LIB_EXT" "build/libicuuc$SHARED_LIB_SHORT_EXT"

Common/3dParty/icu/icu.pri

@@ -14,13 +14,13 @@ core_win_32 {
 core_linux {
     INCLUDEPATH += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/usr/local/include
 
-    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.so.60.2
-    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.so.60.2
+    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.so.60
+    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.so.60
 }
 
 core_mac {
     INCLUDEPATH += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/usr/local/include
 
-    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.60.2.dylib
-    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.60.2.dylib
+    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicuuc.60.dylib
+    LIBS        += $$PWD/$$CORE_BUILDS_PLATFORM_PREFIX/build/libicudata.60.dylib
 }

Common/DocxFormat/Source/XlsxFormat/Workbook/CalcPr.h

@@ -40,14 +40,14 @@ namespace OOX
 {
 	namespace Spreadsheet
 	{
-		class CСalcPr : public WritingElement
-		{
-		public:
-			WritingElement_AdditionConstructors(CСalcPr)
-			CСalcPr()
+    class CCalcPr : public WritingElement
+    {
+    public:
+        WritingElement_AdditionConstructors(CCalcPr)
+            CCalcPr()
 			{
 			}
-			virtual ~CСalcPr()
+            virtual ~CCalcPr()
 			{
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)

Common/DocxFormat/Source/XlsxFormat/Workbook/Workbook.h

@@ -239,7 +239,7 @@ namespace OOX
 			nullable<OOX::Spreadsheet::CWorkbookPr>			m_oWorkbookPr;
 			nullable<OOX::Spreadsheet::CExternalReferences>	m_oExternalReferences;
 			nullable<std::wstring>							m_oPivotCachesXml;
-			nullable<OOX::Spreadsheet::CСalcPr>				m_oCalcPr;
+            nullable<OOX::Spreadsheet::CCalcPr>				m_oCalcPr;
 			
 			bool											m_bMacroEnabled;
 		};

XlsxSerializerCom/Reader/BinaryWriter.h

@@ -1632,7 +1632,7 @@ namespace BinXlsxRW
 				m_oBcw.WriteItemWithLengthEnd(nCurPos);
 			}
         }
-		void WriteCalcPr(const OOX::Spreadsheet::CСalcPr& CCalcPr)
+        void WriteCalcPr(const OOX::Spreadsheet::CCalcPr& CCalcPr)
 		{
 			int nCurPos = 0;
 			if(CCalcPr.m_oCalcId.IsInit())

XlsxSerializerCom/Writer/BinaryReader.h

@@ -1786,7 +1786,7 @@ namespace BinXlsxRW
 		int ReadCalcPr(BYTE type, long length, void* poResult)
 		{
 			int res = c_oSerConstants::ReadOk;
-			OOX::Spreadsheet::CСalcPr* calcPr = static_cast<OOX::Spreadsheet::CСalcPr*>(poResult);
+            OOX::Spreadsheet::CCalcPr* calcPr = static_cast<OOX::Spreadsheet::CCalcPr*>(poResult);
 			if(c_oSerCalcPrTypes::CalcId == type)
 			{
 				calcPr->m_oCalcId.Init();