'txbx' может также прописано как 'textbox' (1 (45).docx)

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63418 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp

@@ -52,7 +52,7 @@ namespace PPTX
 						style = oNode;
 					else if (_T("txBody") == strName)
 						txBody = oNode;
-					else if (_T("txbx") == strName)
+					else if (_T("txbx") == strName || _T("textbox") == strNam)
 					{
 						XmlUtils::CXmlNode _node = oNode.ReadNode(_T("w:txbxContent"));
 						if (_node.IsValid())

Common/DocxFormat/Source/DocxFormat/Logic/Shape.h

@@ -398,7 +398,7 @@ namespace OOX
 						m_oSpPr = oReader;
 					else if ( _T("wps:style") == sName )
 						m_oShapeStyle = oReader;	
-					else if (_T("wps:txbx") == sName)
+					else if ((_T("wps:txbx") == sName) || (_T("wps:textbox") == sName))
 						m_oTxBody = oReader; 		
 					else if (_T("wps:bodyPr") == sName)
 						m_oTxBodyProperties = oReader;