Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop

* 'develop' of https://github.com/ONLYOFFICE/core:
  x2t version up
  for bug 34597
  fix bug 34603
  for bug 34498

ASCOfficeDocxFile2/BinReader/ReaderClasses.h

@@ -2062,7 +2062,7 @@ distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\"><wp:extent cx=\"" + std::to_wstr
                 int nSimplePos = 0;
                 if(bBSimplePos && BSimplePos)
                     nSimplePos = 1;
-                int nRelativeHeight = 0;
+                unsigned long nRelativeHeight = 0;
                 if(bRelativeHeight)
                     nRelativeHeight = RelativeHeight;
                 int nBehindDoc = 0;

ASCOfficePPTXFile/PPTXFormat/Logic/RunProperties.h

@@ -217,18 +217,25 @@ namespace PPTX
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 			{
 				WritingElement_ReadAttributes_Start	( oReader )
-					WritingElement_ReadAttributes_Read_if	  ( oReader, _T("b"),			b)
+					WritingElement_ReadAttributes_Read_if	  ( oReader, _T("altLang"),		altLang)
+					WritingElement_ReadAttributes_Read_else_if( oReader, _T("b"),			b)
+					WritingElement_ReadAttributes_Read_else_if( oReader, _T("bmk"),			bmk)
+					WritingElement_ReadAttributes_Read_else_if( oReader, _T("cap"),			cap)
+					WritingElement_ReadAttributes_Read_else_if( oReader, _T("dirty"),		dirty)
+					WritingElement_ReadAttributes_Read_else_if( oReader, _T("err"),			err)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("i"),			i)
+					WritingElement_ReadAttributes_Read_else_if( oReader, _T("kern"),		kern)
+					WritingElement_ReadAttributes_Read_else_if( oReader, _T("kumimoji"),	kumimoji)
+					WritingElement_ReadAttributes_Read_else_if( oReader, _T("lang"),		lang)
+					WritingElement_ReadAttributes_Read_else_if( oReader, _T("noProof"),		noProof)
+					WritingElement_ReadAttributes_Read_else_if( oReader, _T("normalizeH"),	normalizeH)
+					WritingElement_ReadAttributes_Read_else_if( oReader, _T("smtClean"),	smtClean)
+					WritingElement_ReadAttributes_Read_else_if( oReader, _T("smtId"),		smtId)
+					WritingElement_ReadAttributes_Read_else_if( oReader, _T("strike"),		strike)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("sz"),			sz)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("u"),			u)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("baseline"),	baseline)
 					WritingElement_ReadAttributes_Read_else_if( oReader, _T("spc"),			spc)
-					WritingElement_ReadAttributes_Read_else_if( oReader, _T("lang"),		lang)
-					WritingElement_ReadAttributes_Read_else_if( oReader, _T("kumimoji"),	kumimoji)
-					WritingElement_ReadAttributes_Read_else_if( oReader, _T("dirty"),		dirty)
-					WritingElement_ReadAttributes_Read_else_if( oReader, _T("normalizeH"),	normalizeH)
-					WritingElement_ReadAttributes_Read_else_if( oReader, _T("noProof"),		noProof)
-					WritingElement_ReadAttributes_Read_else_if( oReader, _T("smtClean"),	smtClean)
 				WritingElement_ReadAttributes_End	( oReader )		
 				
 				Normalize();
@@ -673,4 +680,4 @@ namespace PPTX
 	} // namespace Logic
 } // namespace PPTX
 
-#endif // PPTX_LOGIC_RUNPROPERTIES_INCLUDE_H
\ No newline at end of file
+#endif // PPTX_LOGIC_RUNPROPERTIES_INCLUDE_H

Common/DocxFormat/Source/XlsxFormat/Chart/ChartSerialize.cpp

@@ -1066,12 +1066,7 @@ namespace OOX{
 				}
 				else if(_T("clrMapOvr") == sName)
 				{
-					int nParentDepth1 = oReader.GetDepth();
-					while( oReader.ReadNextSiblingNode( nParentDepth1 ) )
-					{
-						std::wstring sName1 = XmlUtils::GetNameNoNS(oReader.GetName());
-						m_oClrMapOvr = oReader;
-					}
+                    m_oClrMapOvr = oReader;
 				}
 				else if(_T("pivotSource") == sName)
 				{

X2tConverter/build/Qt/X2tConverter.pri

@@ -7,7 +7,7 @@
 QT       -= core
 QT       -= gui
 
-VERSION = 2.0.3.447
+VERSION = 2.0.3.448
 DEFINES += INTVER=$$VERSION
 
 TARGET = x2t