for bug 34597

Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop
fix bug 34603
2026-02-13 11:25:56 +08:00 · 2017-03-30 16:51:08 +03:00 · 2017-03-30 16:04:22 +03:00 · 2017-03-30 16:02:23 +03:00 · 2017-03-29 20:12:04 +03:00
3 changed files with 17 additions and 15 deletions
--- a/ASCOfficeDocxFile2/BinReader/ReaderClasses.h
+++ b/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;
--- a/ASCOfficePPTXFile/PPTXFormat/Logic/RunProperties.h
+++ b/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
+#endif // PPTX_LOGIC_RUNPROPERTIES_INCLUDE_H
--- a/Common/DocxFormat/Source/XlsxFormat/Chart/ChartSerialize.cpp
+++ b/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)
 				{
Author	SHA1	Message	Date
konovalovsergey	f7f2629e9d	for bug 34597	2017-03-30 16:51:08 +03:00
ElenaSubbotina	048c2fd034	Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop	2017-03-30 16:04:22 +03:00
ElenaSubbotina	8977e2c792	fix bug 34603	2017-03-30 16:02:23 +03:00
konovalovsergey	bd5863a02d	for bug 34498	2017-03-29 20:12:04 +03:00