Merge pull request ONLYOFFICE#881 from ONLYOFFICE/fix/v7.1.0-fix-bugs3

fix bug #56300

Author: ElenaSubbotina

Common/DocxFormat/Source/DocxFormat/Logic/Paragraph.cpp

@@ -172,20 +172,27 @@ namespace OOX
 			}
 		}
 
-
 		void CParagraph::fromXML(XmlUtils::CXmlLiteReader& oReader)
 		{
 			m_oParagraphProperty = NULL;
-			
-			ReadAttributes( oReader );
 
+			ReadAttributes(oReader);
+
+			if (oReader.IsEmptyNode())
+				return;
+
+			int nParentDepth = oReader.GetDepth();
+
+			fromXML(nParentDepth, oReader);
+		}
+		void CParagraph::fromXML(int nDepth, XmlUtils::CXmlLiteReader& oReader)
+		{
 			if ( oReader.IsEmptyNode() )
 				return;
 
 			OOX::Document* document = WritingElement::m_pMainDocument;
 
-			int nParentDepth = oReader.GetDepth();
-			while( oReader.ReadNextSiblingNode( nParentDepth ) )
+			while( oReader.ReadNextSiblingNode(nDepth) )
 			{
 				std::wstring sName = oReader.GetName();
 				WritingElement *pItem = NULL;
@@ -307,6 +314,11 @@ namespace OOX
 					pItem = new CSmartTag( document );
 				//else if ( _T("w:subDoc") == sName )
 				//	pItem = new CSubDoc( document );
+				else if (_T("w:sdtContent") == sName)
+				{
+					int nDepthChild = oReader.GetDepth();
+					fromXML(nDepthChild, oReader);
+				}
 
 				if ( pItem )
 				{

Common/DocxFormat/Source/DocxFormat/Logic/Paragraph.h

@@ -119,7 +119,7 @@ namespace OOX
 			}
 
 		private:
-
+			void fromXML(int nDepth, XmlUtils::CXmlLiteReader& oReader);
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader);
 
 		public: