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

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;

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -6589,6 +6589,9 @@ public:
 				OOX::CPath pathChartsWorksheetDir = m_oFileWriter.m_oChartWriter.m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR +_T("embeddings");
 				OOX::CSystemUtility::CreateDirectories(pathChartsWorksheetDir.GetPath());
 
+                bool oldValueType = m_oFileWriter.m_pDrawingConverter->m_pImageManager->m_bIsWord;
+
+                m_oFileWriter.m_pDrawingConverter->m_pImageManager->m_bIsWord = false;
 				m_oFileWriter.m_pDrawingConverter->SetDstContentRels();
 
                 std::wstring sThemeDir;
@@ -6640,6 +6643,8 @@ public:
                 m_oFileWriter.m_pDrawingConverter->WriteRels(bstrChartRelType, sRelsName, std::wstring(), &rIdChart);
 
                 pDrawingProperty->sChartRels = L"rId" + std::to_wstring( rIdChart);
+
+                m_oFileWriter.m_pDrawingConverter->m_pImageManager->m_bIsWord = oldValueType;
 			}
 			else
 				res = c_oSerConstants::ReadUnknown;

ASCOfficePPTXFile/PPTXFormat/Logic/CNvPr.h

@@ -111,7 +111,13 @@ namespace PPTX
 				XmlUtils::CAttribute oAttr;
 									oAttr.Write(_T("id"),		id);
 									oAttr.Write(_T("name"),		XmlUtils::EncodeXmlString(name));
-				if (descr.IsInit())	oAttr.Write(_T("descr"),	XmlUtils::EncodeXmlString(descr.get()));
+                if (descr.IsInit())
+                {
+                    std::wstring d = XmlUtils::EncodeXmlString(descr.get());
+                    XmlUtils::replace_all(d, L"\n", L"
");
+
+                    oAttr.Write(_T("descr"), d);
+                }
 									oAttr.Write(_T("hidden"),	hidden);
 				if (title.IsInit())	oAttr.Write(_T("title"),	XmlUtils::EncodeXmlString(title.get()));
 
@@ -157,7 +163,12 @@ namespace PPTX
 				pWriter->StartAttributes();
 									pWriter->WriteAttribute (_T("id"),      _id);
 									pWriter->WriteAttribute (_T("name"),    XmlUtils::EncodeXmlString(name));
-				if (descr.IsInit())	pWriter->WriteAttribute	(_T("descr"),   XmlUtils::EncodeXmlString(descr.get()));
+                if (descr.IsInit())
+                {
+                    std::wstring d = XmlUtils::EncodeXmlString(descr.get());
+                    XmlUtils::replace_all(d, L"\n", L"
");
+                    pWriter->WriteAttribute	(_T("descr"),   d);
+                }
 									pWriter->WriteAttribute (_T("hidden"),  hidden);
 				if (title.IsInit())	pWriter->WriteAttribute (_T("title"),   XmlUtils::EncodeXmlString(title.get()));
 

Common/DocxFormat/Source/DocxFormat/Drawing/DrawingCoreInfo.cpp

@@ -176,7 +176,9 @@ namespace OOX
 			if ( m_sDescr.IsInit()  )
 			{
 				sResult += _T("descr=\"");
-                sResult += m_sDescr.get2();
+                std::wstring d = XmlUtils::EncodeXmlString(m_sDescr.get());
+                XmlUtils::replace_all(d, L"\n", L"
");
+                sResult += d;
 				sResult += _T("\" ");
 			}
 			if ( m_oHidden.IsInit() ) sResult += _T("hidden=\"") + m_oHidden->ToString() + _T("\" ");

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)
 				{