git-svn-id:...

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

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -3373,7 +3373,7 @@ public:
 				case 4: sBaseJc = _T("outside");break;
 				case 5: sBaseJc = _T("top");break;
 			}			
-			CString sVal; sVal.Format(_T("<m:pos m:val=\"%s\" />"), sBaseJc);
+			CString sVal; sVal.Format(_T("<m:baseJc m:val=\"%s\" />"), sBaseJc);
 			GetRunStringWriter().WriteString(sVal);
 		}
 		else

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -3865,8 +3865,22 @@ namespace BinDocxRW
 		{
 			int nCurPos = m_oBcw.WriteItemStart(c_oSer_OMathBottomNodesType::Mcs);
 
-			if ( pMcs.m_oMc.IsInit() )
-				WriteMathMc(pMcs.m_oMc.get());
+			for(int i = 0; i< pMcs.m_arrItems.GetSize(); ++i)
+			{			
+				OOX::WritingElement* item = pMcs.m_arrItems[i];
+				OOX::EElementType eType = item->getType();
+				int nCurPos1 = 0;
+				if (eType == OOX::et_m_mc)
+				{					
+					OOX::Logic::CMc* pMc = static_cast<OOX::Logic::CMc*>(item);
+					nCurPos1 = m_oBcw.WriteItemStart(c_oSer_OMathContentType::Mc);
+
+					if ( pMc->m_oMcPr.IsInit() )
+						WriteMathMcPr(pMc->m_oMcPr.get());
+
+					m_oBcw.WriteItemEnd(nCurPos1);
+				}
+			}
 								
 			m_oBcw.WriteItemEnd(nCurPos);
 		}

Common/DocxFormat/Source/DocxFormat/Math/oMathContent.h

@@ -1678,6 +1678,7 @@ namespace OOX
 			}
 			virtual ~CMcs()
 			{
+				Clear();
 			}
 
 		public:
@@ -1688,33 +1689,59 @@ namespace OOX
 			{
 				if ( oReader.IsEmptyNode() )
 					return;
-				int nParentDepth = oReader.GetDepth();
-				while( oReader.ReadNextSiblingNode( nParentDepth ) )
+
+				int nCurDepth = oReader.GetDepth();
+				while( oReader.ReadNextSiblingNode( nCurDepth ) )
 				{
-					CWCharWrapper sName = oReader.GetName();
+					CWCharWrapper sName = oReader.GetName();				
+					WritingElement *pItem = NULL;
+
 					if ( _T("m:mc") == sName )
-						m_oMc = oReader;
+						pItem = new Logic::CMc( oReader );
+
+					if ( pItem )
+						m_arrItems.Add( pItem );
+					
 				}
 			}
+
 			virtual CString      toXML() const
 			{
 				CString sResult = _T("<m:mcs>");
 
-				if ( m_oMc.IsInit() )
-					sResult += m_oMc->toXML();
+				for ( int nIndex = 0; nIndex < m_arrItems.GetSize(); nIndex++ )
+				{
+					if ( m_arrItems[nIndex])
+					{
+						sResult += m_arrItems[nIndex]->toXML();
+					}
+				}
 				
 				sResult += _T("</m:mcs>");
 
 				return sResult;
 			}
 
+			void Clear()
+			{
+				for ( int nIndex = 0; nIndex < m_arrItems.GetSize(); nIndex++ )
+				{
+					if ( m_arrItems[nIndex] )
+						delete m_arrItems[nIndex];
+
+					m_arrItems[nIndex] = NULL;
+				}
+
+				m_arrItems.RemoveAll();
+			}
+
 			virtual EElementType getType() const
 			{
 				return et_m_mcs;
 			}
 		public:				
 			//Childs
-			nullable<OOX::Logic::CMc>		m_oMc;
+			CSimpleArray<WritingElement *> m_arrItems;
 		};
 		//--------------------------------------------------------------------------------
 		// CMPr 22.1.2.68   (Matrix Properties)