RtfFormatReader - конвертация embedd объектов - Test_Объекты.rtf

ASCOfficeRtfFile/RtfFormatLib/source/DestinationCommand.cpp

@@ -228,6 +228,7 @@ bool OleReader::ExecuteCommand(RtfDocument& oDocument, RtfReader& oReader,CStrin
 {
 	if( _T("object") == sCommand )
 		return true;
+	
 	COMMAND_RTF_INT( _T("objw"), m_oOle.m_nWidth, sCommand, hasParameter, parameter )
 	COMMAND_RTF_INT( _T("objh"), m_oOle.m_nHeight, sCommand, hasParameter, parameter )
 	COMMAND_RTF_INT( _T("objemb"), m_oOle.m_eOleType, sCommand, true, RtfOle::ot_emb )
@@ -260,14 +261,19 @@ bool OleReader::ExecuteCommand(RtfDocument& oDocument, RtfReader& oReader,CStrin
 			//oStream.nCurPos = 0;
 
 			CString sOleStorageName = Utils::CreateTempFile( oReader.m_sTempFolder );
+
+			NSFile::CFileBinary file;
+			file.CreateFileW(sOleStorageName.GetBuffer());
+			file.WriteFile(pData, nSize);
+			file.CloseFile();
 			
 			POLE::Storage * piRootStorage = new POLE::Storage(string2std_string(sOleStorageName).c_str());			
 			if( piRootStorage)
 			{
 				//hRes = OleConvertOLESTREAMToIStorage( &oStream, piRootStorage, NULL );
-				//m_oOle.SetFilename( sOleStorageName );
-				//m_oOle.SetOle( piRootStorage );
-				RELEASEOBJECT( piRootStorage );
+				m_oOle.SetFilename( sOleStorageName );
+				m_oOle.SetOle( piRootStorage );
+				//RELEASEOBJECT( piRootStorage );
 				hRes = S_OK;
 			}
 

ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp

@@ -351,7 +351,9 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
 				{
 					CString sValue;
 					if ((ooxText->m_oSpace.IsInit()) && (ooxText->m_oSpace->GetValue() == SimpleTypes::xmlspacePreserve))
+					{
 						sValue = RtfUtility::Preserve(ooxText->m_sText);
+					}
 					else
 						sValue = ooxText->m_sText;
 				

ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXPictureInlineReader.h

@@ -57,7 +57,7 @@ public:
 		//изменяем scale в соответсявии с выходным размером
 		if( PROP_DEF != nWidth && PROP_DEF != oOutput.m_oPicture->m_nWidthGoal )
 		{
-			double dNewScale = 100 * ( 1.0 * nWidth / oOutput.m_oPicture->m_nWidthGoal );
+			double dNewScale = 100 * ( 1.0 * nWidth / oOutput.m_oPicture->m_nWidthGoal ) ;
 			oOutput.m_oPicture->m_dScaleX = dNewScale;
 		}
 		if( PROP_DEF != nHeight && PROP_DEF != oOutput.m_oPicture->m_nHeightGoal )