add column break;

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

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -5011,6 +5011,10 @@ public:
 		{
 			GetRunStringWriter().WriteString(CString(_T("<w:br />")));
 		}
+		else if (c_oSer_OMathContentType::columnbreak == type)
+		{
+			GetRunStringWriter().WriteString(CString(_T("<w:br w:type=\"column\"/>")));
+		}
 		else if (c_oSer_OMathContentType::Del == type)
 		{
 			TrackRevision oTrackRevision;
@@ -5697,6 +5701,10 @@ public:
 		{
 			GetRunStringWriter().WriteString(CString(_T("<w:br />")));
 		}
+		else if (c_oSerRunType::columnbreak == type)
+		{
+			GetRunStringWriter().WriteString(CString(_T("<w:br w:type=\"column\"/>")));
+		}
 		else if(c_oSerRunType::image == type)
 		{
 			docImg odocImg(m_oFileWriter.getNextDocPr());

ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h

@@ -447,7 +447,8 @@ extern int g_nCurFormatVersion;
         object = 14,
 		delText = 15,
 		del = 16,
-		ins = 17
+		ins = 17,
+		columnbreak = 18
 	};}
 	namespace c_oSerImageType{enum c_oSerImageType
 	{
@@ -795,7 +796,8 @@ extern int g_nCurFormatVersion;
 		linebreak = 60,
 		Run = 61,
 		Ins = 62,
-		Del = 63
+		Del = 63,
+		columnbreak = 64
 	};}
 	namespace c_oSer_FramePrType{ enum c_oSer_FramePrType
 	{		

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -3470,7 +3470,7 @@ namespace BinDocxRW
 				int nBreakType = -1;
 				switch(pMRun->m_oBr->m_oType.GetValue())
 				{
-				case SimpleTypes::brtypeColumn:
+				case SimpleTypes::brtypeColumn: nBreakType = c_oSer_OMathContentType::columnbreak;break;
 				case SimpleTypes::brtypePage: nBreakType = c_oSer_OMathContentType::pagebreak;break;
 				case SimpleTypes::brtypeTextWrapping: nBreakType = c_oSer_OMathContentType::linebreak;break;
 				}
@@ -4814,7 +4814,7 @@ namespace BinDocxRW
 						int nBreakType = -1;
 						switch(pBr->m_oType.GetValue())
 						{
-						case SimpleTypes::brtypeColumn:
+						case SimpleTypes::brtypeColumn: nBreakType = c_oSerRunType::columnbreak;break;
 						case SimpleTypes::brtypePage: nBreakType = c_oSerRunType::pagebreak;break;
 						case SimpleTypes::brtypeTextWrapping: nBreakType = c_oSerRunType::linebreak;break;
 						}