RtfFormatReader - review

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -1285,9 +1285,9 @@ void docx_conversion_context::start_text_changes (std::wstring id)
 		if (state.type	== 1) output_stream() << L"<w:ins";
 		if (state.type	== 2) output_stream() << L"<w:del";
 
-		output_stream() << L" w:date=\""	<< state.date	<< "\"";
-		output_stream() << L" w:author=\""	<< state.author << "\"";
-		output_stream() << L" w:id=\""		<< std::to_wstring(current_id_changes++) << "\"";
+		output_stream() << L" w:date=\""	<< state.date	<< L"\"";
+		output_stream() << L" w:author=\""	<< state.author << L"\"";
+		output_stream() << L" w:id=\""		<< std::to_wstring(current_id_changes++) << L"\"";
 		output_stream() << L">";
 		
 		if (state.type	== 2) 

ASCOfficeRtfFile/RtfFormatLib/source/RtfDocument.h

@@ -54,6 +54,7 @@ public:
 	RtfFontTable			m_oFontTable;
 	RtfColorTable			m_oColorTable;
 	RtfStyleTable			m_oStyleTable;
+	RtfRevisionTable		m_oRevisionTable;
 	RtfInformation			m_oInformation;
 
 	RtfListTable			m_oListTabel;

ASCOfficeRtfFile/RtfFormatLib/source/RtfGlobalTables.h

@@ -431,3 +431,58 @@ public:
 		}
 		CString RenderToOOX(RenderParameter oRenderParameter);
 };
+
+class RtfRevisionTable : public IDocumentElement, public ItemContainer<CString>
+{
+public:
+	ItemContainer<CString> m_aAuthorsList;
+
+	CString RenderToRtf(RenderParameter oRenderParameter)
+	{
+		CString sResult;
+		if( m_aArray.size() > 0 )
+		{
+			sResult += _T("{\\*\\revtbl ");
+
+			for( int i = 0; i < (int)m_aArray.size(); i++)
+            {
+				sResult += _T("{");
+				sResult += m_aAuthorsList[i];
+ 				sResult += _T("}");
+           }
+			sResult += _T("}");
+		}
+		return sResult;
+	}
+	CString RenderToOOX(RenderParameter oRenderParameter)
+	{
+		return L"";
+	}
+};
+
+//class RtfRSIDTable : public IDocumentElement, public ItemContainer<rsidString>
+//{
+//public:
+//	ItemContainer<CString> m_aAuthorsList;
+//
+//	CString RenderToRtf(RenderParameter oRenderParameter)
+//	{
+//		CString sResult;
+//		if( m_aArray.size() > 0 )
+//		{
+//			sResult += _T("{\\*\\rsidtbl ");
+//
+//			for( int i = 0; i < (int)m_aArray.size(); i++)
+//            {
+//				sResult += _T("{");
+//				sResult += m_aAuthorsList[i];
+// 				sResult += _T("}");
+//           }
+//			sResult += _T("}");
+//		}
+//		return sResult;
+//	}
+//	CString RenderToOOX(RenderParameter oRenderParameter)
+//	{
+//	}
+//};
\ No newline at end of file

ASCOfficeRtfFile/RtfFormatLib/source/RtfReader.h

@@ -228,7 +228,7 @@ public:
 	virtual void ExecuteText( RtfDocument& oDocument, RtfReader& oReader, CString oText )
 	{
 	}
-	virtual void ExitReader( RtfDocument& oDocument, RtfReader& oReade )
+	virtual void ExitReader( RtfDocument& oDocument, RtfReader& oReader )
 	{
 	}
 	virtual void ExitReader2( RtfDocument& oDocument, RtfReader& oReader )
@@ -269,8 +269,8 @@ public:
 			if(sResult.GetLength() > 0)
 			{
                 std::string str;
-                ExecuteTextInternalSkipChars(sResult, oReader, str, nSkipChars);
-				ExecuteText( oDocument, oReader, sResult);
+                ExecuteTextInternalSkipChars (sResult, oReader, str, nSkipChars);
+				ExecuteText					 ( oDocument, oReader, sResult);
 			}
 		}
 	}

ASCOfficeRtfFile/RtfFormatTest/win32/RtfFormatTest.vcproj

@@ -374,6 +374,14 @@
 			<File
 				RelativePath="..\..\..\ASCOfficeDocxFile2\DocWrapper\DocxSerializer.cpp"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalOptions="/bigobj"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\Common\FileDownloader\FileDownloader_win.cpp"